use netbsd dtvio.h header when available

5 files changed, 43 insertions, 12 deletions

diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 65f3bf8691a..5dc5de0c353 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.85 2011/04/22 13:44:19 obache Exp $
+# $NetBSD: Makefile,v 1.86 2011/07/10 16:52:24 jmcneill Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
-PKGREVISION=		5
+PKGREVISION=		6
 
 COMMENT=		Multimedia player library
 
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 1d368953319..6ed1fad54ec 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.66 2011/02/20 14:29:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.67 2011/07/10 16:52:24 jmcneill Exp $
 #
 
 # used by audio/xine-arts/Makefile
@@ -63,6 +63,7 @@ BUILDLINK_TRANSFORM+=	"rm:-Wl,--no-undefined"
 .endif
 
 pre-configure:
+	cd ${WRKSRC} && autoheader
 	cd ${WRKSRC} && autoconf
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 06e37d1729f..0df719ee24f 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.68 2010/07/28 09:24:14 drochner Exp $
+$NetBSD: distinfo,v 1.69 2011/07/10 16:52:24 jmcneill Exp $
 
 SHA1 (xine-lib-1.1.19.tar.bz2) = 5afcc28c5cf2bdaab99d951960f6587797e1e5a0
 RMD160 (xine-lib-1.1.19.tar.bz2) = 84999c43d3cc115c3bda4b2e06089dc827c646cc
 Size (xine-lib-1.1.19.tar.bz2) = 7531642 bytes
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
-SHA1 (patch-ag) = 26e0937a6018342660180bc6b7076004b68bd545
+SHA1 (patch-ag) = 201533ec8c94721147bdf572f3dd753c6b69c6bc
 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
 SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508
 SHA1 (patch-ao) = 2682548a181803bc2d79f79d76828b6b3ba0e4fa
@@ -19,3 +19,4 @@ SHA1 (patch-db) = 3ad4ca6f43a379b251211477972cd6d34b1f821a
 SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
 SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c
 SHA1 (patch-ga) = c4770b6be12bbc4dd72f8299f3b0bbf92546cc68
+SHA1 (patch-input_dvb.c) = 37aa191dca0df058dc09477624ff76dbc3a2f9b9
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 99a93ac26ee..e8869f1b68e 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.21 2010/07/28 09:24:14 drochner Exp $
+$NetBSD: patch-ag,v 1.22 2011/07/10 16:52:25 jmcneill Exp $
 
---- configure.ac.orig	2010-07-26 10:02:15.000000000 +0000
+--- configure.ac.orig	2010-07-25 14:37:30.000000000 +0000
 +++ configure.ac
 @@ -581,6 +581,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
  AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
@@ -12,7 +12,18 @@ $NetBSD: patch-ag,v 1.21 2010/07/28 09:24:14 drochner Exp $
  
  dnl ---------------------------------------------
  dnl socklen_t
-@@ -968,7 +971,6 @@ if test "x$enable_xinerama" != "xno"; th
+@@ -710,6 +713,10 @@ if test "x$have_v4l2" = xyes && test "x$
+   fi
+ fi
+ 
++dnl ----------------------------------------------
++dnl Check for NetBSD DTV headers
++dnl ----------------------------------------------
++AC_CHECK_HEADERS([dev/dtv/dtvio.h])
+ 
+ dnl ----------------------------------------------
+ dnl Check for Xv and XvMC support
+@@ -968,7 +975,6 @@ if test "x$enable_xinerama" != "xno"; th
     ])
     if test "x$ac_have_xinerama" = "xyes"; then
        AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
@@ -20,7 +31,7 @@ $NetBSD: patch-ag,v 1.21 2010/07/28 09:24:14 drochner Exp $
     fi
  else
    ac_have_xinerama=no
-@@ -1480,8 +1482,21 @@ AC_ARG_ENABLE([oss],
+@@ -1480,8 +1486,21 @@ AC_ARG_ENABLE([oss],
  	AS_HELP_STRING([--disable-oss], [Do not build OSS audio output support]))
  
  if test "x$enable_oss" != "xno"; then
@@ -42,7 +53,7 @@ $NetBSD: patch-ag,v 1.21 2010/07/28 09:24:14 drochner Exp $
       #ifdef HAVE_SYS_SOUNDCARD_H
       # include <sys/soundcard.h>
       #endif
-@@ -1499,6 +1514,7 @@ if test "x$enable_oss" != "xno"; then
+@@ -1499,6 +1518,7 @@ if test "x$enable_oss" != "xno"; then
  fi
  
  AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes")
@@ -50,7 +61,7 @@ $NetBSD: patch-ag,v 1.21 2010/07/28 09:24:14 drochner Exp $
  
  
  dnl ---------------------------------------------
-@@ -1630,9 +1646,10 @@ AC_ARG_ENABLE([gnomevfs],
+@@ -1630,9 +1650,10 @@ AC_ARG_ENABLE([gnomevfs],
    [with_gnome_vfs=$enableval], [with_gnome_vfs=yes])
  
  if test "x$with_gnome_vfs" = "xyes"; then
@@ -64,7 +75,7 @@ $NetBSD: patch-ag,v 1.21 2010/07/28 09:24:14 drochner Exp $
    AC_SUBST(GNOME_VFS_CFLAGS)
    AC_SUBST(GNOME_VFS_LIBS)
    if test "x$no_gnome_vfs" != "xyes"; then
-@@ -1973,7 +1990,7 @@ int has_timeout=sizeof(test.timeout);]])
+@@ -1973,7 +1994,7 @@ int has_timeout=sizeof(test.timeout);]])
       	    AC_DEFINE([HAVE_WIN32_CDROM], [1], 
                        [Define 1 if you have MinGW CD-ROM support])
  	 ;;
diff --git a/multimedia/xine-lib/patches/patch-input_dvb.c b/multimedia/xine-lib/patches/patch-input_dvb.c
new file mode 100644
index 00000000000..fe870f71e27
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-input_dvb.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-input_dvb.c,v 1.1 2011/07/10 16:52:25 jmcneill Exp $
+
+--- src/input/input_dvb.c.orig	2010-07-24 22:09:09.000000000 +0000
++++ src/input/input_dvb.c
+@@ -97,9 +97,13 @@
+ #endif
+ #include <ctype.h>
+ 
++#ifdef HAVE_DEV_DTV_DTVIO_H
++#include <dev/dtv/dtvio.h>
++#else
+ /* These will eventually be #include <linux/dvb/...> */
+ #include "dvb/dmx.h"
+ #include "dvb/frontend.h"
++#endif
+ 
+ #define LOG_MODULE "input_dvb"
+ #define LOG_VERBOSE