rpms/gstreamer-plugins-good/devel gst-plugins-good-0.10.9-libv4l.patch, 1.2, 1.3 gstreamer-plugins-good.spec, 1.74, 1.75

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/gstreamer-plugins-good/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26798

Modified Files:
	gst-plugins-good-0.10.9-libv4l.patch 
	gstreamer-plugins-good.spec 
Log Message:
* Sun Oct  5 2008 Hans de Goede <hdegoede at 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.


gst-plugins-good-0.10.9-libv4l.patch:

Index: gst-plugins-good-0.10.9-libv4l.patch
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-plugins-good/devel/gst-plugins-good-0.10.9-libv4l.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gst-plugins-good-0.10.9-libv4l.patch	31 Aug 2008 21:21:04 -0000	1.2
+++ gst-plugins-good-0.10.9-libv4l.patch	5 Oct 2008 13:56:17 -0000	1.3
@@ -610,3 +610,47 @@
  
  { 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
+ 


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gstreamer-plugins-good.spec	11 Sep 2008 23:53:50 -0000	1.74
+++ gstreamer-plugins-good.spec	5 Oct 2008 13:56:17 -0000	1.75
@@ -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 @@
   --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 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Sun Oct  5 2008 Hans de Goede <hdegoede at 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 at redhat.com> 0.10.10-4
 - Another rebuild