summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2011-04-08 09:00:19 +0000
committerPeter Volkov <pva@gentoo.org>2011-04-08 09:00:19 +0000
commit38d25e6d68db91b454226f92c11912afb9e25f03 (patch)
treec4bbc0f0e8227280f64a2deaf98e49ad59c946b4 /net-im/psimedia/files
parentremove old 0.7 series, version bump to 0.9.7: drops passenger support, adds h... (diff)
downloadhistorical-38d25e6d68db91b454226f92c11912afb9e25f03.tar.gz
historical-38d25e6d68db91b454226f92c11912afb9e25f03.tar.bz2
historical-38d25e6d68db91b454226f92c11912afb9e25f03.zip
Fixed crash due to dropped gst-plugins-v4l, bug 361419 thank Thomas Petersen for report and fix.
Package-Manager: portage-2.1.9.45/cvs/Linux x86_64
Diffstat (limited to 'net-im/psimedia/files')
-rw-r--r--net-im/psimedia/files/psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/net-im/psimedia/files/psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch b/net-im/psimedia/files/psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch
new file mode 100644
index 000000000000..e65951932946
--- /dev/null
+++ b/net-im/psimedia/files/psimedia-1.0.3-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