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

4 files changed, 136 insertions, 12 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/Manifest b/net-im/psimedia/Manifest
index 9d2b0a2de7eb..d030bd4a360e 100644
--- a/net-im/psimedia/Manifest
+++ b/net-im/psimedia/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch 1414 RMD160 e7827852dd3dcff264091fbea4b0d8dd0352b437 SHA1 1fa6cf9bcdd246b359c9f9fa218e78895f96f664 SHA256 550c8b91393b8f3a33f7fe1dc250a84db9b2550bf2e786e32a91dedda83f8664
 AUX psimedia-1.0.3-linux-headers-2.6.38.patch 2121 RMD160 3d4bc8d04866545f653d1e046b8aaffb231c4395 SHA1 858676241058e3c050315f92afef26fbc6430bf2 SHA256 1c07814003bf749dcd01b580546077d87573c4b947ae2b6f2176318790546036
 DIST psimedia-1.0.3.tar.bz2 236134 RMD160 c5c13cdd1606e38f75852ea134478ee3d2d449a2 SHA1 75428d427227ffa87ca40d7e29567a2d410fb9ff SHA256 019d18034fa94299d896448841d129fd1bad5f58daeb2aba7be540a7d06fb23b
 EBUILD psimedia-1.0.3-r1.ebuild 1969 RMD160 087d0b2ce455cf25f1ef7c126eea7ef739bbe6f9 SHA1 ebaee1fb3caef9a5a7cf0e19193fb33c05170d89 SHA256 69376fbdd1c2462865a48d5dada518cc6ab44b41775adca001355f46e0873c29
 EBUILD psimedia-1.0.3-r2.ebuild 1986 RMD160 c670f9f9bc725f9642cd9d29fb87d2cf893a4e6b SHA1 56771fe72b4d2a44c97a27c7ed270d79b5f8c59a SHA256 5a153a036d7c61ca5b66ff3ffad5bb602acb03838172bf5efe1979e061a33f78
+EBUILD psimedia-1.0.3-r3.ebuild 2044 RMD160 8cdb7fea23411c82ed53757b08445452a6154ebc SHA1 2c862ecebf483b88c6bada3feae74bcb25599571 SHA256 8efb667d9facae63c5b907194d0ed3e197d81e59652b375e8d853a2a70a2af5d
 EBUILD psimedia-1.0.3.ebuild 1751 RMD160 b6ddebd01c8ac6572111d550d0f3797653adc07b SHA1 a548120dee82186f92ddba54055ac4c26ad2f1de SHA256 596c280f4684ed867296e8cd374679df226e28dfc4e3ad972c4a80c057f4d13f
-MISC ChangeLog 2789 RMD160 c0e7e71f884afe355a7657e0d8f9ffa511f3901b SHA1 5b4d564841a77087100c8a5376a7d77da846b1c8 SHA256 83c18bca995b63f8ee30c4ffc01a51486c7daefd46c86349b07118682de587b9
+MISC ChangeLog 3051 RMD160 0484481eccb705f8723b683d092a7df5a093b0e4 SHA1 f5d4c3c7632812b7d773a32fdad9c448e67ca527 SHA256 b84c73bff377269623fcbb6408fda81d6bb24aca557c7190fa7cfdb7bc7029c5
 MISC metadata.xml 396 RMD160 9eb1165592bbcc58bae1d5679427bc820c9792e2 SHA1 5ee7920f2fbd2d748ca0864b48e6fd6416c3135e SHA256 cbd143bdce40949837ccb6d7e405f8e9ae3cd0370fc4afde0e6f3e08b39a9966
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2aUpQACgkQVWmRsqeSphMTOQCcDdurwxcQaaOy69VXEMpKxox8
-Ex4AnjN0rDObsFx/alBhiwdeA9yuiQJS
-=2UBt
------END PGP SIGNATURE-----
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
+}