diff options
| author | Oliver Lehmann <oliver@FreeBSD.org> | 2005-05-23 15:08:49 +0000 |
|---|---|---|
| committer | Oliver Lehmann <oliver@FreeBSD.org> | 2005-05-23 15:08:49 +0000 |
| commit | bf76f2fafc1cf39b567afab62f72bac5fa45168b (patch) | |
| tree | 354f542adaf048609e3aeac47ba14aa571cdebeb /multimedia/xawtv | |
| parent | Update to 0.1.33. (diff) | |
- add amd64 to ONLY_FOR_ARCHS
- fix build for amd64
- fix a bug on amd64 which caused xawtv to segfault on startup
Notes
Notes:
svn path=/head/; revision=135967
Diffstat (limited to 'multimedia/xawtv')
| -rw-r--r-- | multimedia/xawtv/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/xawtv/files/patch-libng::plugins::drv0-bsd.c | 19 |
2 files changed, 18 insertions, 5 deletions
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 09f577ef444b..393d38801b76 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -28,7 +28,7 @@ USE_GMAKE= yes USE_XPM= yes USE_X_PREFIX= yes USE_REINPLACE= yes -CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV= LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" CFLAGS="${CFLAGS} -g" MAKE_ENV= verbose=yes INSTALLS_SHLIB= yes @@ -46,7 +46,7 @@ MAN8= v4l-conf.8 .if ${OSVERSION} < 500000 ONLY_FOR_ARCHS= i386 .else -ONLY_FOR_ARCHS= alpha i386 +ONLY_FOR_ARCHS= alpha amd64 i386 .endif .if defined(WITHOUT_AA) diff --git a/multimedia/xawtv/files/patch-libng::plugins::drv0-bsd.c b/multimedia/xawtv/files/patch-libng::plugins::drv0-bsd.c index ee24825397c5..283b76e6758c 100644 --- a/multimedia/xawtv/files/patch-libng::plugins::drv0-bsd.c +++ b/multimedia/xawtv/files/patch-libng::plugins::drv0-bsd.c @@ -1,5 +1,5 @@ ---- libng/plugins/drv0-bsd.c.orig Wed Feb 11 23:13:04 2004 -+++ libng/plugins/drv0-bsd.c Wed Feb 11 23:13:10 2004 +--- libng/plugins/drv0-bsd.c.orig Wed Mar 12 17:45:56 2003 ++++ libng/plugins/drv0-bsd.c Mon May 23 17:01:27 2005 @@ -23,10 +23,12 @@ #ifdef HAVE_DEV_IC_BT8XX_H @@ -15,7 +15,20 @@ #endif #include "grab-ng.h" -@@ -599,7 +599,15 @@ +@@ -502,10 +504,11 @@ + static int bsd_read_attr(struct ng_attribute *attr) + { + struct bsd_handle *h = attr->handle; +- int arg, get, set, i; ++ int get, set, i; ++ long arg; + int value = -1; + + switch (attr->id) { + case ATTR_ID_NORM: + if (-1 != xioctl(h->fd,BT848GFMT,&arg)) + for (i = 0; i < sizeof(norms_map)/sizeof(int); i++) +@@ -599,7 +605,15 @@ static int bsd_tuned(void *handle) { |