add support for dvb capture on netbsd

4 files changed, 84 insertions, 3 deletions

diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 06cf3488143..d8c54fd5ef5 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.70 2011/01/14 10:44:27 wiz Exp $
+$NetBSD: distinfo,v 1.71 2011/07/09 15:51:51 jmcneill Exp $
 
 SHA1 (mplayer/mplayer-20100913.tar.bz2) = 6fd3acb29fa8455636bcd86f9f333da4763daa6d
 RMD160 (mplayer/mplayer-20100913.tar.bz2) = 79085d4ebdb824fc34f7bc128070ef11e874897d
 Size (mplayer/mplayer-20100913.tar.bz2) = 9073690 bytes
-SHA1 (patch-aa) = 9eae4563081e370d14560bb407a9b986b0128d7f
+SHA1 (patch-aa) = a1d82fd9999c656bd9ecf703cd9f2c0245330874
 SHA1 (patch-ab) = 1a927d956155a7b9a2daa1a4f522e47d830c5af6
 SHA1 (patch-ac) = 3d037c96537233cdbda582afdb878dcf3f43e923
 SHA1 (patch-ad) = 84ce5a0f5cd8f59831c56b14dd2bc762793427ac
@@ -12,5 +12,7 @@ SHA1 (patch-ag) = bef25568c913dcb8535afa51976ce7c94a6af5a2
 SHA1 (patch-ah) = 8cbd14c61e74023055770baf27201687aa34fede
 SHA1 (patch-an) = 3e72fb86abe7ab572f12a4fef002edb623ab6fae
 SHA1 (patch-ar) = df7e7cdc6fb8187bbcf0b285afc14d275a51e17a
+SHA1 (patch-stream_dvb_tune.c) = b663830ff64ab31488684b1a324da50ab52d68cc
+SHA1 (patch-stream_dvbin.h) = 56f6e71fcdf6bf3afccbdbc8682834c806114677
 SHA1 (patch-vb) = ce584c31e0e32865e87aa1f537a1f9e4817c7442
 SHA1 (patch-ve_x264) = 1946a2b2a7643bbc1d3f6a8963e21c4f6cbd2c89
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index 1e815e8781c..fef378a1c9e 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.26 2010/12/05 16:42:16 tsutsui Exp $
+$NetBSD: patch-aa,v 1.27 2011/07/09 15:51:52 jmcneill Exp $
 
 --- configure.orig	2010-09-13 03:12:07.000000000 +0000
 +++ configure
@@ -86,6 +86,50 @@ $NetBSD: patch-aa,v 1.26 2010/12/05 16:42:16 tsutsui Exp $
      else
        _ld_tmp="$I -lXext -lX11 $_ld_pthread"
      fi
+@@ -5016,7 +5016,6 @@ EOF
+       extra_cflags="$extra_cflags $_inc_tmp" && break
+   done
+ fi
+-echores "$_dvb"
+ if test "$_dvb" = yes ; then
+   _dvbin=yes
+   inputmodules="dvb $inputmodules"
+@@ -5025,14 +5024,28 @@ if test "$_dvb" = yes ; then
+   aomodules="mpegpes(dvb) $aomodules"
+   vomodules="mpegpes(dvb) $vomodules"
+ else
+-  _dvbin=no
+-  noinputmodules="dvb $noinputmodules"
+-  def_dvb='#undef CONFIG_DVB'
+-  def_dvbin='#undef CONFIG_DVBIN '
+-  aomodules="mpegpes(file) $aomodules"
+-  vomodules="mpegpes(file) $vomodules"
++  cat >$TMPC <<EOF
++#include <dev/dtv/dtvio.h>
++int main(void) {return 0;}
++EOF
++  cc_check && _dvb=yes
++  if test "$_dvb" = yes ; then
++    _dvbin=yes
++    inputmodules="dvb $inputmodules"
++    def_dvb='#undef CONFIG_DVB'
++    def_dvbin='#define CONFIG_DVBIN 1'
++    aomodules="mpegpes(file) $aomodules"
++    vomodules="mpegpes(file) $vomodules"
++  else
++    _dvbin=no
++    noinputmodules="dvb $noinputmodules"
++    def_dvb='#undef CONFIG_DVB'
++    def_dvbin='#undef CONFIG_DVBIN '
++    aomodules="mpegpes(file) $aomodules"
++    vomodules="mpegpes(file) $vomodules"
++  fi
+ fi
+-
++echores "$_dvb"
+ 
+ if darwin; then
+ 
 @@ -5623,8 +5637,13 @@ if test "$_ivtv" = auto ; then
    cat > $TMPC << EOF
  #include <stdlib.h>
diff --git a/multimedia/mplayer-share/patches/patch-stream_dvb_tune.c b/multimedia/mplayer-share/patches/patch-stream_dvb_tune.c
new file mode 100644
index 00000000000..42acddf8692
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-stream_dvb_tune.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-stream_dvb_tune.c,v 1.1 2011/07/09 15:51:52 jmcneill Exp $
+
+--- stream/dvb_tune.c.orig	2010-03-02 19:57:17.000000000 +0000
++++ stream/dvb_tune.c
+@@ -32,8 +32,12 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <errno.h>
++#ifdef __NetBSD__
++#include <dev/dtv/dtvio.h>
++#else
+ #include <linux/dvb/dmx.h>
+ #include <linux/dvb/frontend.h>
++#endif
+ #include "config.h"
+ #include "dvbin.h"
+ #include "dvb_tune.h"
diff --git a/multimedia/mplayer-share/patches/patch-stream_dvbin.h b/multimedia/mplayer-share/patches/patch-stream_dvbin.h
new file mode 100644
index 00000000000..606e204b881
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-stream_dvbin.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-stream_dvbin.h,v 1.1 2011/07/09 15:51:52 jmcneill Exp $
+
+--- stream/dvbin.h.orig	2010-06-21 14:39:24.000000000 +0000
++++ stream/dvbin.h
+@@ -16,9 +16,13 @@
+ #define LOF2 (10600*1000UL)
+ 
+ #include <inttypes.h>
++#ifdef __NetBSD__
++#include <dev/dtv/dtvio.h>
++#else
+ #include <linux/dvb/dmx.h>
+ #include <linux/dvb/frontend.h>
+ #include <linux/dvb/version.h>
++#endif
+ 
+ #undef DVB_ATSC
+ #if defined(DVB_API_VERSION_MINOR)