Fix glib-2.32 compilation, bug #412055 by Paul Volkov.

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

4 files changed, 73 insertions, 24 deletions

diff --git a/net-im/psimedia/ChangeLog b/net-im/psimedia/ChangeLog
index f5f609c1432f..7e49f9bbdbf7 100644
--- a/net-im/psimedia/ChangeLog
+++ b/net-im/psimedia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/psimedia
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/ChangeLog,v 1.26 2012/03/28 16:20:06 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/ChangeLog,v 1.27 2012/04/19 09:45:24 pacho Exp $
+
+  19 Apr 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/psimedia-1.0.3-glib2.32.patch, psimedia-1.0.3-r3.ebuild:
+  Fix glib-2.32 compilation, bug #412055 by Paul Volkov.
 
   28 Mar 2012; Davide Pesavento <pesa@gentoo.org> -psimedia-1.0.3-r1.ebuild,
   -psimedia-1.0.3-r2.ebuild, -psimedia-1.0.3.ebuild:
diff --git a/net-im/psimedia/Manifest b/net-im/psimedia/Manifest
index e9c95441b237..5517e7fcf564 100644
--- a/net-im/psimedia/Manifest
+++ b/net-im/psimedia/Manifest
@@ -1,26 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch 1414 RMD160 e7827852dd3dcff264091fbea4b0d8dd0352b437 SHA1 1fa6cf9bcdd246b359c9f9fa218e78895f96f664 SHA256 550c8b91393b8f3a33f7fe1dc250a84db9b2550bf2e786e32a91dedda83f8664
+AUX psimedia-1.0.3-glib2.32.patch 1629 RMD160 506a455fd7f1c927a5329601111d47be729d53b0 SHA1 daf9ca0db45f6ef518ae8eaef26299524474d087 SHA256 001745f468fd061c3d5fd6ab30a448fbf5aef6346324ff244f5239d0d009f83b
 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-r3.ebuild 2055 RMD160 232cec42e71996b36736ec504e381c8851d8eee2 SHA1 59c08fc4893717e65d2512be5565ddfac34db9b3 SHA256 02c01245aff40303eb59827c4a52c2645a39a4a30eaa81a3d4e0b6bfebdabfe7
-MISC ChangeLog 3848 RMD160 c98b9c80f875cbe00b4cd0c5594ff492725517bb SHA1 9127ef775f905ae380e6c40b0e910eda63450811 SHA256 85a48f7306956eb778a5094a0e639f22e1f145eec579b694f4adcc6541027939
+EBUILD psimedia-1.0.3-r3.ebuild 2073 RMD160 62da66c381d5f84e67d76bd6fd88bb6dbdf2dab5 SHA1 8267771f11085bcd44a771cb1f73de7f1b68cb2a SHA256 590b9640a345f4573f90ce3596c25066e5974507e6fee7017b48612b5353b909
+MISC ChangeLog 4019 RMD160 554d72ef6eddcb6d10da03c7a3147395386e2207 SHA1 eddb8dcf90c2dee816455f65171bdee01440bb4d SHA256 6b843508b234870bd064cf9a5043c2f3e24b3107a96da0fcc0d0058bd2f2847d
 MISC metadata.xml 396 RMD160 9eb1165592bbcc58bae1d5679427bc820c9792e2 SHA1 5ee7920f2fbd2d748ca0864b48e6fd6416c3135e SHA256 cbd143bdce40949837ccb6d7e405f8e9ae3cd0370fc4afde0e6f3e08b39a9966
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPczpHAAoJENXLsxwXqFxy/iAP/14vKiPox5YRL9sE/rASWwsV
-w27jVw4d+TYeUz8v6zsmjtve140zYo9hDyn4t1aWXyFEzxBc2jv3rWVE35UwI2NW
-3mvMbBCqTcRODcyVgEORhcBTWXxsxC8BPZ7QnEQF/VMy/2/1966ldwVDo+AHTKHp
-gF4rhVcbhiICNK6qdyDaoWacJqncOqFs0v6vnkjRt7d8ruyT81Z/Kj7cAg8B3dSd
-4hFYQLB9B3/nmMfnpbLZuAR06wKbJ84Bj4NmFx+Pa6bf41QiaPA8ciu0U7udvKfP
-j+6gzSjjDKPwSmdNNtuuu/eeCNFALGs5KiLTy5Ox5lGLA4gVXiOVVvIiV/zZ1SLH
-Ig18D/Zuf4UIpCJO4mi2sshUBNptmdnTLnvME+W7U562te5heiW6WmHyPcRi+6mL
-nk3oMVT165anyGpfei9VirA+gSKHNies7bJwvqW4tOUAm/EL4nz8O81G+hqcQ3GV
-FzIM0gGkAlIyLXCzROWj3GBHhf9+wEmvtGoMwHp8ehXbaC/2z/hrM220TN4ET9pz
-h5mxdkfCNPLTcVUpn4H+jX8atgl5hYy6oi18tMyaF0eC7bPGb9zhyniEJ5guN40R
-/gkxgMp3llzHtn0p690GB+K+muNnht+NbXgPU8KoNBMzvpOjzeuljNm9PYxzVmMU
-hHNahaXzTrXuV0Zaio4r
-=ytVf
+iEYEARECAAYFAk+P3roACgkQCaWpQKGI+9QGIQCfdTdAQ95tfaCYDBbh2B0tedxA
+VFUAnjVJkFnowK0dz9KO+FeiKnqtSsmM
+=muL8
 -----END PGP SIGNATURE-----
diff --git a/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch b/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch
new file mode 100644
index 000000000000..01a42cac12f5
--- /dev/null
+++ b/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch
@@ -0,0 +1,52 @@
+Index: psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h
+===================================================================
+--- psimedia-1.0.3.orig/gstprovider/gstcustomelements/gstcustomelements.h
++++ psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h
+@@ -21,7 +21,7 @@
+ #ifndef GSTCUSTOMELEMENTS_H
+ #define GSTCUSTOMELEMENTS_H
+ 
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gst/gst.h>
+ #include <gst/base/gstpushsrc.h>
+ #include <gst/video/video.h>
+Index: psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h
+===================================================================
+--- psimedia-1.0.3.orig/gstprovider/gstelements/static/gstelements.h
++++ psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h
+@@ -21,7 +21,7 @@
+ #ifndef PSI_GSTELEMENTS_H
+ #define PSI_GSTELEMENTS_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: psimedia-1.0.3/gstprovider/gstthread.h
+===================================================================
+--- psimedia-1.0.3.orig/gstprovider/gstthread.h
++++ psimedia-1.0.3/gstprovider/gstthread.h
+@@ -22,7 +22,7 @@
+ #define PSI_GSTTHREAD_H
+ 
+ #include <QThread>
+-#include <glib/gmain.h>
++#include <glib.h>
+ 
+ namespace PsiMedia {
+ 
+Index: psimedia-1.0.3/gstprovider/rwcontrol.h
+===================================================================
+--- psimedia-1.0.3.orig/gstprovider/rwcontrol.h
++++ psimedia-1.0.3/gstprovider/rwcontrol.h
+@@ -28,7 +28,7 @@
+ #include <QMutex>
+ #include <QWaitCondition>
+ #include <QTimer>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include "psimediaprovider.h"
+ #include "rtpworker.h"
+ 
diff --git a/net-im/psimedia/psimedia-1.0.3-r3.ebuild b/net-im/psimedia/psimedia-1.0.3-r3.ebuild
index 45359ef8f7e4..0d4e6b601ef3 100644
--- a/net-im/psimedia/psimedia-1.0.3-r3.ebuild
+++ b/net-im/psimedia/psimedia-1.0.3-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.6 2011/07/12 23:24:34 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3-r3.ebuild,v 1.7 2012/04/19 09:45:24 pacho Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils qt4-r2 multilib
 
@@ -45,6 +45,8 @@ src_prepare() {
 	# 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
+
+	epatch "${FILESDIR}"/${P}-glib2.32.patch
 }
 
 src_configure() {
@@ -56,11 +58,11 @@ src_configure() {
 
 src_install() {
 	insinto /usr/$(get_libdir)/psi/plugins
-	doins gstprovider/libgstprovider.so || die
+	doins gstprovider/libgstprovider.so
 
 	if use demo; then
 		exeinto /usr/$(get_libdir)/${PN}
-		newexe demo/demo ${PN} || die
+		newexe demo/demo ${PN}
 
 		# Create /usr/bin/psimedia
 		cat <<-EOF > "demo/${PN}"
@@ -70,6 +72,6 @@ src_install() {
 		/usr/$(get_libdir)/${PN}/${PN}
 		EOF
 
-		dobin demo/${PN} || die
+		dobin demo/${PN}
 	fi
 }