X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgstreamer-plugins-good.git;a=blobdiff_plain;f=gstreamer-plugins-good.spec;h=ae684fe2164c82308318f2ed75c5dcdb6f20a8e8;hp=12e47ea7424a1282325d3277e566f2c3fcb33396;hb=cd23ae8bbb368f7f891b6efdc655977b28b7e254;hpb=133ea66327d6e5845f59fa4e60198b81b9c0f395

diff --git a/gstreamer-plugins-good.spec b/gstreamer-plugins-good.spec
index 12e47ea..ae684fe 100644
--- a/gstreamer-plugins-good.spec
+++ b/gstreamer-plugins-good.spec
@@ -5,7 +5,7 @@
 %bcond_without	cairo		# don't build cairo plugin
 %bcond_without	cdio		# don't build cdio plugin
 %bcond_without	gconf		# don't build GConf plugin
-%bcond_without	ladspa		# don't build ladspa plugin
+%bcond_with	ladspa		# build ladspa plugin [currently built in plugins-bad]
 %bcond_without	speex		# don't build speex plugin
 #
 %define		gstname		gst-plugins-good
@@ -78,6 +78,8 @@ Obsoletes:	gstreamer-mixer
 Obsoletes:	gstreamer-navigation
 Obsoletes:	gstreamer-rtp
 Obsoletes:	gstreamer-udp
+Obsoletes:	gstreamer-v4l2
+Conflicts:	gstreamer-plugins-bad < 0.10.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		gstlibdir 	%{_libdir}/gstreamer-%{gst_major_ver}
@@ -416,6 +418,7 @@ Xlib.
 	%{!?with_caca:--disable-libcaca} \
 	%{!?with_cairo:--disable-cairo} \
 	%{!?with_cdio:--disable-cdio} \
+	--enable-experimental \
 	%{?with_ladspa:--enable-ladspa} \
 	%{!?with_speex:--disable-speex} \
 	--disable-static \
@@ -465,6 +468,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{gstlibdir}/libgstrtp.so
 %attr(755,root,root) %{gstlibdir}/libgstrtsp.so
 %attr(755,root,root) %{gstlibdir}/libgstudp.so
+%attr(755,root,root) %{gstlibdir}/libgstvideo4linux2.so
 %attr(755,root,root) %{gstlibdir}/libgstvideobalance.so
 %attr(755,root,root) %{gstlibdir}/libgstvideobox.so
 %attr(755,root,root) %{gstlibdir}/libgstvideomixer.so
@@ -532,7 +536,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{gstlibdir}/libgsthalelements.so
 
-# disabled in ext/Makefile.am
+# disabled in ext/Makefile.am, currently built in plugins-bad
 #%if %{with ladspa}
 #%files -n gstreamer-ladspa
 #%defattr(644,root,root,755)