Enable v4l2 if sys/videoio.h is present.

5 files changed, 69 insertions, 11 deletions

diff --git a/multimedia/gst-plugins0.10-good/Makefile b/multimedia/gst-plugins0.10-good/Makefile
index bfa3b02ae6b..de1f918854b 100644
--- a/multimedia/gst-plugins0.10-good/Makefile
+++ b/multimedia/gst-plugins0.10-good/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/08/06 18:17:24 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2008/09/07 17:28:22 jmcneill Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -19,6 +19,12 @@ CONFIGURE_ARGS+=	--enable-zlib
 CONFIGURE_ARGS+=	--enable-annodex
 .include "../../textproc/libxml2/buildlink3.mk"
 
+PLIST_VARS+=		v4l2
+.if exists(/usr/include/sys/videoio.h)
+CONFIGURE_ARGS+=	--enable-gst_v4l2
+PLIST.v4l2=		yes
+.endif
+
 GCONF_SCHEMAS=		gstreamer-0.10.schemas
 
 # only useful if gstreamer was built with the "gstcheck" option
diff --git a/multimedia/gst-plugins0.10-good/PLIST b/multimedia/gst-plugins0.10-good/PLIST
index d76a05a6442..c52a8fc60f5 100644
--- a/multimedia/gst-plugins0.10-good/PLIST
+++ b/multimedia/gst-plugins0.10-good/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2008/08/06 18:17:24 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/09/07 17:28:22 jmcneill Exp $
 lib/gstreamer-0.10/libgstalaw.la
 lib/gstreamer-0.10/libgstalpha.la
 lib/gstreamer-0.10/libgstalphacolor.la
@@ -31,6 +31,7 @@ lib/gstreamer-0.10/libgstrtsp.la
 lib/gstreamer-0.10/libgstsmpte.la
 lib/gstreamer-0.10/libgstspectrum.la
 lib/gstreamer-0.10/libgstudp.la
+${PLIST.v4l2}lib/gstreamer-0.10/libgstvideo4linux2.la
 lib/gstreamer-0.10/libgstvideobalance.la
 lib/gstreamer-0.10/libgstvideobox.la
 lib/gstreamer-0.10/libgstvideocrop.la
diff --git a/multimedia/gst-plugins0.10-good/distinfo b/multimedia/gst-plugins0.10-good/distinfo
index 4bf145bebab..e87d2ca73e7 100644
--- a/multimedia/gst-plugins0.10-good/distinfo
+++ b/multimedia/gst-plugins0.10-good/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.12 2008/08/06 18:17:24 drochner Exp $
+$NetBSD: distinfo,v 1.13 2008/09/07 17:28:22 jmcneill Exp $
 
 SHA1 (gst-plugins-good-0.10.9.tar.bz2) = c563bdc2d26752fd4d42bb969df4024f9eb76e56
 RMD160 (gst-plugins-good-0.10.9.tar.bz2) = 661aa12ddf92f3584de7f1305b64f2f9a4130432
 Size (gst-plugins-good-0.10.9.tar.bz2) = 2038878 bytes
-SHA1 (patch-ab) = be0a74e6ee7d471cfbaf05ccc4d45998c9da03d7
+SHA1 (patch-ab) = 6d28b8f39475556df84e46edd148e52022f6b4f7
 SHA1 (patch-ac) = 1304121ff668decfa21fd0551b3eb9994970033f
+SHA1 (patch-ba) = e296bbcfc606967b71765988ae1c3ffe96b9359a
diff --git a/multimedia/gst-plugins0.10-good/patches/patch-ab b/multimedia/gst-plugins0.10-good/patches/patch-ab
index 614b5d2b0b1..a6bf828bc5e 100644
--- a/multimedia/gst-plugins0.10-good/patches/patch-ab
+++ b/multimedia/gst-plugins0.10-good/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2008/05/14 18:28:36 drochner Exp $
+$NetBSD: patch-ab,v 1.9 2008/09/07 17:28:23 jmcneill Exp $
 
---- configure.orig	2008-04-23 04:05:02.000000000 +0200
-+++ configure
-@@ -30644,7 +30644,7 @@ rm -f conftest.mmap
+--- configure.orig	2008-04-22 22:05:02.000000000 -0400
++++ configure	2008-09-07 12:02:20.000000000 -0400
+@@ -30644,7 +30644,7 @@
  
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.8 2008/05/14 18:28:36 drochner Exp $
    GST_HAVE_MMAP_TRUE=
    GST_HAVE_MMAP_FALSE='#'
  else
-@@ -31937,7 +31937,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -31937,7 +31937,7 @@
  echo "${ECHO_T}$flag_ok" >&6; }
  
  
@@ -20,7 +20,25 @@ $NetBSD: patch-ab,v 1.8 2008/05/14 18:28:36 drochner Exp $
      then
  
    { echo "$as_me:$LINENO: checking to see if compiler understands -errwarn=%all" >&5
-@@ -40419,9 +40419,9 @@ if test x$USE_FLAC = xyes; then
+@@ -36126,6 +36126,8 @@
+ #ifdef __sun /* Solaris */
+ #include <sys/types.h>
+ #include <sys/videodev2.h>
++#elif defined(__NetBSD__)
++#include <sys/videoio.h>
+ #else /* Linux */
+ #include <linux/types.h>
+ #define _LINUX_TIME_H
+@@ -36481,6 +36483,8 @@
+ #ifdef __sun /* Solaris */
+ #include <sys/types.h>
+ #include <sys/videodev2.h>
++#elif defined(__NetBSD__)
++#include <sys/videoio.h>
+ #else /* Linux */
+ #include <linux/types.h>
+ #define _LINUX_TIME_H
+@@ -40419,9 +40423,9 @@
    HAVE_FLAC=no
  
  
@@ -33,7 +51,7 @@ $NetBSD: patch-ab,v 1.8 2008/05/14 18:28:36 drochner Exp $
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -40439,11 +40439,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -40439,11 +40443,11 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -47,3 +65,12 @@ $NetBSD: patch-ab,v 1.8 2008/05/14 18:28:36 drochner Exp $
    ;
    return 0;
  }
+@@ -47603,6 +47607,8 @@
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     echo "$ac_cs_version"; exit ;;
diff --git a/multimedia/gst-plugins0.10-good/patches/patch-ba b/multimedia/gst-plugins0.10-good/patches/patch-ba
new file mode 100644
index 00000000000..0f046530369
--- /dev/null
+++ b/multimedia/gst-plugins0.10-good/patches/patch-ba
@@ -0,0 +1,23 @@
+$NetBSD: patch-ba,v 1.1 2008/09/07 17:28:23 jmcneill Exp $
+
+--- sys/v4l2/gstv4l2object.h.orig	2008-09-07 12:07:01.000000000 -0400
++++ sys/v4l2/gstv4l2object.h	2008-09-07 12:08:10.000000000 -0400
+@@ -37,13 +37,17 @@
+  * errors here, check your linux/time.h && sys/time.h header setup.
+  */
+ #include <sys/types.h>
+-#ifndef __sun
++#if !defined(__sun) && !defined(__NetBSD__)
+ #include <linux/types.h>
+ #define _LINUX_TIME_H
+ #define __user
+ #include <linux/videodev2.h>
+ #else
++#ifdef __sun
+ #include <sys/videodev2.h>
++#else
++#include <sys/videoio.h>
++#endif
+ #endif
+ 
+ #include <gst/gst.h>