Enable tv-v4l2 support on NetBSD.

5 files changed, 71 insertions, 7 deletions

diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index c557d6c62dd..0fd763d471c 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.50 2008/05/11 03:46:24 tonnerre Exp $
+$NetBSD: distinfo,v 1.51 2008/09/09 01:11:53 jmcneill Exp $
 
 SHA1 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d
 RMD160 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52
 Size (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 9338201 bytes
-SHA1 (patch-aa) = 44e185164de7dbeb26cf51892e62a32517b9b7c4
+SHA1 (patch-aa) = 6a060aa558afedbba25c9fbb4822eba3da9b171f
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
 SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
@@ -20,3 +20,5 @@ SHA1 (patch-bb) = 26d000bcbc94b9139e6dbc79237fdb3a109c6057
 SHA1 (patch-bc) = fd46ce3cd6d5f7525e210cf6d475b89573ca988d
 SHA1 (patch-bd) = 9132118a143758b6c9e9dffb713f7dadd29ce3c3
 SHA1 (patch-tc) = 89f802ff0ebfc14d6f2a4b17177915f66c9f9038
+SHA1 (patch-va) = 074681200756293a60a1362b84310ab6eec5e37b
+SHA1 (patch-vb) = 45c43a38f808fac193537732e2971bfa157971e7
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index 58645ef4d05..3c7ec2f9daa 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.32 2008/08/21 11:37:53 abs Exp $
+# $NetBSD: options.mk,v 1.33 2008/09/09 01:11:53 jmcneill Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -44,6 +44,11 @@ PKG_SUPPORTED_OPTIONS+=	mlib
 PKG_SUPPORTED_OPTIONS+=	vidix
 .endif
 
+.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
+PKG_SUPPORTED_OPTIONS+=	v4l2
+PKG_SUGGESTED_OPTIONS+=	v4l2
+.endif
+
 # Platform-specific options.
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
     ${MACHINE_ARCH} == "powerpc"
@@ -265,6 +270,12 @@ CONFIGURE_ARGS+=	--enable-theora
 CONFIGURE_ARGS+=	--disable-theora
 .endif
 
+.if !empty(PKG_OPTIONS:Mv4l2)
+CONFIGURE_ARGS+=	--enable-tv-v4l2
+.else
+CONFIGURE_ARGS+=	--disable-tv-v4l2
+.endif
+
 # disable vidix if not in options
 .if empty(PKG_OPTIONS:Mvidix)
 CONFIGURE_ARGS+=	--disable-vidix-internal
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index b5c1c8d1492..ca99f50d0ae 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,7 +1,5 @@
-$NetBSD: patch-aa,v 1.19 2007/12/21 16:07:48 tron Exp $
-
---- configure.orig	2007-10-07 20:49:33.000000000 +0100
-+++ configure	2007-12-21 15:21:48.000000000 +0000
+--- configure.orig	2007-10-07 15:49:33.000000000 -0400
++++ configure	2008-09-08 20:58:52.000000000 -0400
 @@ -718,7 +718,7 @@
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
@@ -64,3 +62,21 @@ $NetBSD: patch-aa,v 1.19 2007/12/21 16:07:48 tron Exp $
    fi
    _vosrc="$_vosrc vo_aa.c"
    _vomodules="aa $_vomodules"
+@@ -6837,11 +6840,16 @@
+ echocheck "Video 4 Linux 2 TV interface"
+ if test "$_tv_v4l2" = auto ; then
+   _tv_v4l2=no
+-  if test "$_tv" = yes && linux ; then
++  if test "$_tv" = yes && (linux || netbsd || openbsd) ; then
+     cat > $TMPC <<EOF
+ #include <stdlib.h>
++#ifdef __linux__
+ #include <linux/types.h>
+ #include <linux/videodev2.h>
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
++#include <sys/types.h>
++#include <sys/videoio.h>
++#endif
+ int main(void) { return 0; }
+ EOF
+     cc_check && _tv_v4l2=yes
diff --git a/multimedia/mplayer-share/patches/patch-va b/multimedia/mplayer-share/patches/patch-va
new file mode 100644
index 00000000000..07aef06a449
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-va
@@ -0,0 +1,18 @@
+$NetBSD: patch-va,v 1.1 2008/09/09 01:11:53 jmcneill Exp $
+
+--- libavformat/v4l2.c.orig	2008-09-08 20:54:25.000000000 -0400
++++ libavformat/v4l2.c	2008-09-08 20:54:53.000000000 -0400
+@@ -32,8 +32,13 @@
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <sys/time.h>
++#ifdef __linux__
+ #include <asm/types.h>
+ #include <linux/videodev2.h>
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
++#include <sys/types.h>
++#include <sys/videoio.h>
++#endif
+ #include <time.h>
+ 
+ static const int desired_video_buffers = 256;
diff --git a/multimedia/mplayer-share/patches/patch-vb b/multimedia/mplayer-share/patches/patch-vb
new file mode 100644
index 00000000000..975656d43e1
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-vb
@@ -0,0 +1,17 @@
+$NetBSD: patch-vb,v 1.1 2008/09/09 01:11:53 jmcneill Exp $
+
+--- stream/tvi_v4l2.c.orig	2008-09-08 20:55:19.000000000 -0400
++++ stream/tvi_v4l2.c	2008-09-08 20:55:55.000000000 -0400
+@@ -38,8 +38,13 @@
+ #ifdef HAVE_SYS_SYSINFO_H
+ #include <sys/sysinfo.h>
+ #endif
++#ifdef __linux__
+ #include <linux/types.h>
+ #include <linux/videodev2.h>
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
++#include <sys/videoio.h>
++#endif
+ #include "mp_msg.h"
+ #include "libmpcodecs/img_format.h"
+ #include "libaf/af_format.h"