[psimedia] add drop-v4lsrc-gst-plugin patch from Gentoo

nucleo nucleo at fedoraproject.org
Wed Apr 20 23:51:43 UTC 2011


commit 9c71d0b1d4df8c570b5da314d0c5054556d46e58
Author: nucleo <nucleo at fedoraproject.org>
Date:   Thu Apr 21 02:51:32 2011 +0300

    add drop-v4lsrc-gst-plugin patch from Gentoo

 psimedia-drop-v4lsrc-gst-plugin.patch |   51 +++++++++++++++++++++++++++++++++
 psimedia.spec                         |    8 ++++-
 2 files changed, 58 insertions(+), 1 deletions(-)
---
diff --git a/psimedia-drop-v4lsrc-gst-plugin.patch b/psimedia-drop-v4lsrc-gst-plugin.patch
new file mode 100644
index 0000000..e659519
--- /dev/null
+++ b/psimedia-drop-v4lsrc-gst-plugin.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/show_bug.cgi?id=361419#c5
+
+--- gstprovider/devices.cpp	2009-06-09 10:12:11.000000000 +0200
++++ gstprovider/devices.cpp	2011-04-02 11:47:21.898041830 +0200
+@@ -90,7 +90,6 @@ 
+ 		element_name == "alsasink" ||
+ 		element_name == "osssrc" ||
+ 		element_name == "osssink" ||
+-		element_name == "v4lsrc" ||
+ 		element_name == "v4l2src" ||
+ 		element_name == "osxaudiosrc" ||
+ 		element_name == "osxaudiosink" ||
+@@ -224,11 +223,6 @@ 
+ 		if(type == PDevice::VideoIn)
+ 			element_name = "osxvideosrc";
+ 	}
+-	else if(driver == "v4l")
+-	{
+-		if(type == PDevice::VideoIn)
+-			element_name = "v4lsrc";
+-	}
+ 	else if(driver == "v4l2")
+ 	{
+ 		if(type == PDevice::VideoIn)
+@@ -380,7 +374,7 @@ 
+ 			bool first = true;
+ 			foreach(const DeviceEnum::Item &i, list)
+ 			{
+-				if(type == PDevice::VideoIn && (element_name == "v4lsrc" || element_name == "v4l2src"))
++				if(type == PDevice::VideoIn && element_name == "v4l2src")
+ 				{
+ 					if(!test_video(element_name, i.id))
+ 						continue;
+@@ -444,7 +438,6 @@ 
+ 	else // PDevice::VideoIn
+ 	{
+ 		drivers
+-		<< "v4l"
+ 		<< "v4l2"
+ 		<< "osxvideo"
+ 		<< "winks";
+--- gstprovider/gstthread.cpp	2009-05-17 19:55:27.000000000 +0200
++++ gstprovider/gstthread.cpp	2011-04-02 11:48:28.581514484 +0200
+@@ -235,7 +235,6 @@ 
+ #elif defined(Q_OS_LINUX)
+ 			reqelem
+ 			<< "alsasrc" << "alsasink"
+-			<< "v4lsrc"
+ 			<< "v4l2src";
+ #elif defined(Q_OS_UNIX)
+ 			reqelem
diff --git a/psimedia.spec b/psimedia.spec
index db2a12a..035aed3 100644
--- a/psimedia.spec
+++ b/psimedia.spec
@@ -1,6 +1,6 @@
 Name:           psimedia
 Version:        1.0.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Audio and video RTP services for Psi-like IM clients
 
 Group:          Applications/Multimedia
@@ -12,6 +12,8 @@ Source1:        psimedia.desktop
 Patch0:         psimedia-demo.patch
 # http://code.google.com/p/psi-dev/source/browse/trunk/patches/psimedia/0040-psimedia-2.6.38-compilation-fix.diff
 Patch1:         psimedia-remove-v4l.patch
+# https://bugs.gentoo.org/show_bug.cgi?id=361419#c5
+Patch2:         psimedia-drop-v4lsrc-gst-plugin.patch
 Requires:       psi >= 0.13
 
 # psi crashes if gstreamer-plugins-good not installed
@@ -34,6 +36,7 @@ is based on GStreamer.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2
 
 %build
 # Generated by qconf 1.5 ( http://delta.affinix.com/qconf/ )
@@ -63,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/psi/plugins/libgstprovider.so
 
 %changelog
+* Thu Apr 21 2011 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.3-8
+- add drop-v4lsrc-gst-plugin patch from Gentoo
+
 * Thu Apr 21 2011 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.3-7
 - update v4l1 patch
 


More information about the scm-commits mailing list