From 66b6b1c62d3ab13085474dfd2e851a38b797a4e3 Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Oct 05 2008 13:56:17 +0000
Subject: - Fix gst-plugins-good-0.10.9-libv4l.patch to also patch config.in and

    Makefile.in so that the libv4l code actually gets enabled for real this
    time and remove plenty of egg from face for not fixing this properly in
    0.10.10-2 (rh465599)
- Explicitly disable pulse plugin so the spec builds even if you have the
    pulse devel packages installed.

---

diff --git a/gst-plugins-good-0.10.9-libv4l.patch b/gst-plugins-good-0.10.9-libv4l.patch
index 86864f4..a26c90e 100644
--- a/gst-plugins-good-0.10.9-libv4l.patch
+++ b/gst-plugins-good-0.10.9-libv4l.patch
@@ -610,3 +610,47 @@ diff -u -p -u -p -r1.84 v4l2src_calls.c
  
  { echo "$as_me:$LINENO: checking for X" >&5
  echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+diff -up gst-plugins-good-0.10.10/sys/v4l2/Makefile.in~ gst-plugins-good-0.10.10/sys/v4l2/Makefile.in
+--- sys/v4l2/Makefile.in~	2008-10-05 12:02:41.000000000 +0200
++++ sys/v4l2/Makefile.in	2008-10-05 12:03:13.000000000 +0200
+@@ -319,6 +319,8 @@ LIBOIL_CFLAGS = @LIBOIL_CFLAGS@
+ LIBOIL_LIBS = @LIBOIL_LIBS@
+ LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
+ LIBPNG_LIBS = @LIBPNG_LIBS@
++LIBV4L2_CFLAGS =
++LIBV4L2_LIBS = -lv4l2 -lv4lconvert
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+@@ -615,14 +615,16 @@ libgstvideo4linux2_la_SOURCES = gstv4l2.
+ libgstvideo4linux2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+ 				 $(GST_BASE_CFLAGS) \
+ 				 $(GST_CFLAGS) \
+-				 $(X_CFLAGS)
++				 $(X_CFLAGS) \
++				 $(LIBV4L2_CFLAGS)
+ 
+ libgstvideo4linux2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+ libgstvideo4linux2_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
+ 				 $(GST_BASE_LIBS) \
+ 				 -lgstinterfaces-$(GST_MAJORMINOR) \
+ 				 $(GST_LIBS) \
+-				 $(xv_libs)
++				 $(xv_libs) \
++				 $(LIBV4L2_LIBS)
+ 
+ noinst_HEADERS = gstv4l2object.h v4l2_calls.h \
+ 		 gstv4l2src.h v4l2src_calls.h \
+diff -up gst-plugins-good-0.10.10/config.h.in~ gst-plugins-good-0.10.10/config.h.in
+--- config.h.in~	2008-10-05 12:29:29.000000000 +0200
++++ config.h.in	2008-10-05 12:29:29.000000000 +0200
+@@ -173,6 +173,9 @@
+ /* Define to enable Portable Network Graphics library (used by png). */
+ #undef HAVE_LIBPNG
+ 
++/* Whether libv4l2 is available for video buffer conversion */
++#undef HAVE_LIBV4L2
++
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+ 
diff --git a/gstreamer-plugins-good.spec b/gstreamer-plugins-good.spec
index d537673..0bb2d27 100644
--- a/gstreamer-plugins-good.spec
+++ b/gstreamer-plugins-good.spec
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.10
-Release:  	4%{?dist}
+Release:  	5%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -105,7 +105,7 @@ This package contains documentation for the GStreamer Good Plug-ins.
   --enable-gtk-doc \
   --enable-experimental \
   --enable-ladspa \
-  --disable-esd --disable-libcaca --disable-aalib \
+  --disable-esd --disable-libcaca --disable-aalib --disable-pulse \
   --with-default-visualizer=autoaudiosink
 
 make %{?_smp_mflags}
@@ -239,6 +239,14 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Sun Oct  5 2008 Hans de Goede <hdegoede@redhat.com> 0.10.10-5
+- Fix gst-plugins-good-0.10.9-libv4l.patch to also patch config.in and
+  Makefile.in so that the libv4l code actually gets enabled for real this time
+  and remove plenty of egg from face for not fixing this properly in 0.10.10-2
+  (rh465599)
+- Explicitly disable pulse plugin so the spec builds even if you
+  have the pulse devel packages installed.
+
 * Fri Sep 12 2008 - Bastien Nocera <bnocera@redhat.com> 0.10.10-4
 - Another rebuild