summaryrefslogtreecommitdiff
path: root/multimedia/xawtv
diff options
context:
space:
mode:
authorOliver Lehmann <oliver@FreeBSD.org>2004-02-11 22:56:32 +0000
committerOliver Lehmann <oliver@FreeBSD.org>2004-02-11 22:56:32 +0000
commit1628aa3dc785f67f6fa4e71c0668b8cf28ccf1b9 (patch)
treee4772c6f57c8251167a983c72fcc2d6ac7e462c2 /multimedia/xawtv
parentUpdate to 0.10.2 release. (diff)
Scantv is now able to detect stations. Actually You still won't get the
station-names Bump PORTREVISION
Notes
Notes: svn path=/head/; revision=100722
Diffstat (limited to 'multimedia/xawtv')
-rw-r--r--multimedia/xawtv/Makefile4
-rw-r--r--multimedia/xawtv/files/patch-console::scantv.c14
-rw-r--r--multimedia/xawtv/files/patch-libng::plugins::drv0-bsd.c19
3 files changed, 35 insertions, 2 deletions
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 2d49f250a474..a4eea5b144df 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xawtv
PORTVERSION= 3.91
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= http://bytesex.org/xawtv/
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -94,7 +94,7 @@ pre-everything::
@${ECHO} " WITH_LIBDV=yes Enable reading/writing raw dv files"
@${ECHO} " WITH_LIBQTIME=yes Enable quicktime support"
@${ECHO} " WITH_LIBZVBI=yes Enable libzvbi support"
- @${ECHO} " (scantv compiles, but doesn't work for me)"
+ @${ECHO} " (You wont get station names)"
@${ECHO} " WITH_MMX=yes Enable mmx support"
@${ECHO} ""
diff --git a/multimedia/xawtv/files/patch-console::scantv.c b/multimedia/xawtv/files/patch-console::scantv.c
new file mode 100644
index 000000000000..968457a392a1
--- /dev/null
+++ b/multimedia/xawtv/files/patch-console::scantv.c
@@ -0,0 +1,14 @@
+--- console/scantv.c.orig Wed Feb 11 23:14:16 2004
++++ console/scantv.c Wed Feb 11 23:15:04 2004
+@@ -245,7 +245,11 @@
+ fprintf(stderr,"no station\n");
+ continue;
+ }
++#ifdef __FreeBSD__ /* Actually it won't work for FreeBSD... */
++ name = NULL;
++#else
+ name = get_vbi_name(vbi);
++#endif
+ fprintf(stderr, "%s\n", name ? name : "???");
+ if (NULL == name) {
+ sprintf(dummy,"unknown (%s)",chanlist[i].name);
diff --git a/multimedia/xawtv/files/patch-libng::plugins::drv0-bsd.c b/multimedia/xawtv/files/patch-libng::plugins::drv0-bsd.c
new file mode 100644
index 000000000000..9402e0e1c842
--- /dev/null
+++ b/multimedia/xawtv/files/patch-libng::plugins::drv0-bsd.c
@@ -0,0 +1,19 @@
+--- 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
+@@ -599,7 +599,15 @@
+
+ static int bsd_tuned(void *handle)
+ {
+- return 0;
++ struct bsd_handle *h = handle;
++ int signal;
++
++ usleep(10000);
++
++ if (-1 == xioctl(h->tfd, TVTUNER_GETSTATUS, &signal))
++ return 0;
++
++ return signal == 106 ? 1 : 0;
+ }
+
+ /* ---------------------------------------------------------------------- */