Fixed crash due to dropped gst-plugins-v4l, bug 361419 thank Thomas Petersen for report and fix.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 133 insertions, 1 deletions

diff --git a/net-im/psimedia/ChangeLog b/net-im/psimedia/ChangeLog
index 04678c81c1d2..c4a82cc58d7e 100644
--- a/net-im/psimedia/ChangeLog
+++ b/net-im/psimedia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/psimedia
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/ChangeLog,v 1.19 2011/04/04 23:21:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/ChangeLog,v 1.20 2011/04/08 09:00:19 pva Exp $
+
+*psimedia-1.0.3-r3 (08 Apr 2011)
+
+  08 Apr 2011; Peter Volkov <pva@gentoo.org> +psimedia-1.0.3-r3.ebuild,
+  +files/psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch:
+  Fixed crash due to dropped gst-plugins-v4l, bug 361419 thank Thomas Petersen
+  for report and fix.
 
   04 Apr 2011; Jeroen Roovers <jer@gentoo.org> psimedia-1.0.3-r2.ebuild:
   Stable for HPPA (bug #361419).
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
diff --git a/net-im/psimedia/psimedia-1.0.3-r3.ebuild b/net-im/psimedia/psimedia-1.0.3-r3.ebuild
new file mode 100644
index 000000000000..481df913f2cb
--- /dev/null
+++ b/net-im/psimedia/psimedia-1.0.3-r3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3-r3.ebuild,v 1.1 2011/04/08 09:00:19 pva Exp $
+
+EAPI="2"
+
+inherit eutils qt4-r2 multilib
+
+DESCRIPTION="Psi plugin for voice/video calls"
+HOMEPAGE="http://delta.affinix.com/psimedia/"
+SRC_URI="http://delta.affinix.com/download/psimedia/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="demo"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18
+	>=media-libs/gstreamer-0.10.22
+	>=media-libs/gst-plugins-base-0.10.22
+	media-libs/gst-plugins-good
+	>=dev-libs/liboil-0.3
+	>=x11-libs/qt-gui-4.4:4
+	>=media-libs/speex-1.2_rc1
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-speex
+	>=media-plugins/gst-plugins-vorbis-0.10.22
+	>=media-plugins/gst-plugins-theora-0.10.22
+	>=media-plugins/gst-plugins-alsa-0.10.22
+	>=media-plugins/gst-plugins-ogg-0.10.22
+	media-plugins/gst-plugins-v4l2
+	media-plugins/gst-plugins-jpeg
+	!<net-im/psi-0.13_rc1
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+"
+
+src_prepare() {
+	sed -e '/^TEMPLATE/a CONFIG += ordered' -i psimedia.pro || die
+	# Don't build demo if we don't need that.
+	use demo || { sed -e '/^SUBDIRS[[:space:]]*+=[[:space:]]*demo[[:space:]]*$/d;' -i psimedia.pro || die; }
+	# Remove support for V4L v1 because linux-headers-2.6.38 stopped shipping linux/videodev.h.
+	epatch "${FILESDIR}"/${P}-linux-headers-2.6.38.patch
+	epatch "${FILESDIR}"/${P}-drop-v4lsrc-gst-plugin.patch
+}
+
+src_configure() {
+	# qconf generated configure script...
+	./configure --no-separate-debug-info || die
+
+	eqmake4
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/psi/plugins
+	doins gstprovider/libgstprovider.so || die
+
+	if use demo; then
+		exeinto /usr/$(get_libdir)/${PN}
+		newexe demo/demo ${PN} || die
+
+		# Create /usr/bin/psimedia
+		cat <<-EOF > "demo/${PN}"
+		#!/bin/bash
+
+		export PSI_MEDIA_PLUGIN=/usr/$(get_libdir)/psi/plugins/libgstprovider.so
+		/usr/$(get_libdir)/${PN}/${PN}
+		EOF
+
+		dobin demo/${PN} || die
+	fi
+}