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

(Portage version: 2.1.10.56/cvs/Linux x86_64)

3 files changed, 65 insertions, 7 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/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
 }