cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* no more anonymous unions in video(4)

Browse Source 
* no need to exclude GCC2_ARCHS
* bump REVISION
* minor nits
This commit is contained in:
jakemsr 2010-09-12 22:41:45 +00:00
parent d957ca2d31
commit d0608e2bc2
2 changed files with 69 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/video/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.3 2010/08/08 20:00:16 espie Exp $
# $OpenBSD: Makefile,v 1.4 2010/09/12 22:41:45 jakemsr Exp $
MASTER_SITES = http://www.bsdfrog.org/OpenBSD/distfiles/ \
ftp://quatramaran.ens.fr/pub/espie/
DISTNAME = video-0
REVISION = 0
REVISION = 1
WRKSRC = ${WRKDIR}/video
COMMENT = record and display with video(4)
CATEGORIES = x11 sysutils
NOT_FOR_ARCHS = ${GCC2_ARCHS}
NO_REGRESS = Yes
WANTLIB = X11 Xv c
@ -19,15 +18,15 @@ PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
WRKDIST = ${WRKDIR}/video
do-build:
do-build:
cd ${WRKBUILD} && ${CC} -I${X11BASE}/include ${CFLAGS} \
-o video video.c -L${X11BASE}/lib -lX11 -lXv
cd ${WRKBUILD} && mandoc video.1 >video.cat1
cd ${WRKBUILD} && mandoc video.1 > video.cat1
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/video ${PREFIX}/bin
${INSTALL_MAN} ${WRKBUILD}/video.cat1 ${PREFIX}/man/cat1/video.0
.include <bsd.port.mk>

64
x11/video/patches/patch-video_c Normal file
View File

@ -0,0 +1,64 @@
$OpenBSD: patch-video_c,v 1.1 2010/09/12 22:41:45 jakemsr Exp $
--- video.c.orig Tue Aug 31 06:32:00 2010
+++ video.c Tue Aug 31 06:31:39 2010
@@ -710,19 +710,19 @@ dev_get_sizes(struct video *vid)
while (ioctl(d->fd, VIDIOC_ENUM_FRAMESIZES, &fsize) == 0) {
switch (fsize.type) {
case V4L2_FRMSIZE_TYPE_DISCRETE:
- sizes[nsizes].w = fsize.discrete.width;
- sizes[nsizes].h = fsize.discrete.height;
+ sizes[nsizes].w = fsize.un.discrete.width;
+ sizes[nsizes].h = fsize.un.discrete.height;
nsizes++;
break;
case V4L2_FRMSIZE_TYPE_CONTINUOUS:
- step_w = (((fsize.stepwise.max_width -
- fsize.stepwise.min_width) / MAX_DSZS) + 15) & ~15;
- step_h = (((fsize.stepwise.max_height -
- fsize.stepwise.min_height) / MAX_DSZS) + 15) & ~15;
- for (tmp_w = fsize.stepwise.min_width,
- tmp_h = fsize.stepwise.min_height;
- tmp_w <= fsize.stepwise.max_width &&
- tmp_h <= fsize.stepwise.max_height;
+ step_w = (((fsize.un.stepwise.max_width -
+ fsize.un.stepwise.min_width) / MAX_DSZS) + 15) & ~15;
+ step_h = (((fsize.un.stepwise.max_height -
+ fsize.un.stepwise.min_height) / MAX_DSZS) + 15) & ~15;
+ for (tmp_w = fsize.un.stepwise.min_width,
+ tmp_h = fsize.un.stepwise.min_height;
+ tmp_w <= fsize.un.stepwise.max_width &&
+ tmp_h <= fsize.un.stepwise.max_height;
tmp_w += step_w, tmp_h += step_h) {
sizes[nsizes].w = tmp_w;
sizes[nsizes].h = tmp_h;
@@ -731,18 +731,18 @@ dev_get_sizes(struct video *vid)
}
break;
case V4L2_FRMSIZE_TYPE_STEPWISE:
- step_w = (((fsize.stepwise.max_width -
- fsize.stepwise.min_width) / MAX_DSZS) +
- fsize.stepwise.step_width - 1) &
- ~(fsize.stepwise.step_width - 1);
- step_h = (((fsize.stepwise.max_height -
- fsize.stepwise.min_height) / MAX_DSZS) +
- fsize.stepwise.step_height - 1) &
- ~(fsize.stepwise.step_height - 1);
- for (tmp_w = fsize.stepwise.min_width,
- tmp_h = fsize.stepwise.min_height;
- tmp_w <= fsize.stepwise.max_width &&
- tmp_h <= fsize.stepwise.max_height;
+ step_w = (((fsize.un.stepwise.max_width -
+ fsize.un.stepwise.min_width) / MAX_DSZS) +
+ fsize.un.stepwise.step_width - 1) &
+ ~(fsize.un.stepwise.step_width - 1);
+ step_h = (((fsize.un.stepwise.max_height -
+ fsize.un.stepwise.min_height) / MAX_DSZS) +
+ fsize.un.stepwise.step_height - 1) &
+ ~(fsize.un.stepwise.step_height - 1);
+ for (tmp_w = fsize.un.stepwise.min_width,
+ tmp_h = fsize.un.stepwise.min_height;
+ tmp_w <= fsize.un.stepwise.max_width &&
+ tmp_h <= fsize.un.stepwise.max_height;
tmp_w += step_w, tmp_h += step_h) {
sizes[nsizes].w = tmp_w;
sizes[nsizes].h = tmp_h;