[packages/psi-plugin-psimedia] - fix build with glib2 2.28+ - rel 5

[baggins]

commit f1ce355847aed01ffacef0890c3c0175835c0345
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Dec 6 21:46:25 2013 +0100

    - fix build with glib2 2.28+
    - rel 5

 glib2.patch              | 44 ++++++++++++++++++++++++++++++++++++++++++++
 psi-plugin-psimedia.spec |  4 +++-
 2 files changed, 47 insertions(+), 1 deletion(-)
---
diff --git a/psi-plugin-psimedia.spec b/psi-plugin-psimedia.spec
index 2bdc87e..d8b8cc7 100644
--- a/psi-plugin-psimedia.spec
+++ b/psi-plugin-psimedia.spec
@@ -2,13 +2,14 @@
 Summary:	Audio and Video plugin for PSI
 Name:		psi-plugin-psimedia
 Version:	1.0.3
-Release:	4
+Release:	5
 License:	LGPL v2.1+
 Group:		Applications/Communications
 Source0:	http://delta.affinix.com/download/psimedia/psimedia-%{version}.tar.bz2
 # Source0-md5:	1be71c37d71c655ffc2c53cf86c77a7a
 Patch0:		%{orgname}-2.6.38.patch
 Patch1:		%{orgname}-drop-v4l.patch
+Patch2:		glib2.patch
 URL:		http://delta.affinix.com/psimedia/
 BuildRequires:	QtCore-devel >= 4.5.0
 BuildRequires:	QtGui-devel
@@ -41,6 +42,7 @@ RTP services to Psi-like IM clients.
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 ./configure
diff --git a/glib2.patch b/glib2.patch
new file mode 100644
index 0000000..42240ac
--- /dev/null
+++ b/glib2.patch
@@ -0,0 +1,44 @@
+--- psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h~	2009-01-16 22:59:25.000000000 +0100
++++ psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h	2013-12-06 21:42:54.505988972 +0100
+@@ -21,7 +21,7 @@
+ #ifndef PSI_GSTELEMENTS_H
+ #define PSI_GSTELEMENTS_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h~	2009-01-16 19:09:25.000000000 +0100
++++ psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h	2013-12-06 21:44:19.319321691 +0100
+@@ -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>
+--- psimedia-1.0.3/gstprovider/rwcontrol.h~	2009-02-17 01:20:50.000000000 +0100
++++ psimedia-1.0.3/gstprovider/rwcontrol.h	2013-12-06 21:44:59.352654735 +0100
+@@ -28,7 +28,7 @@
+ #include <QMutex>
+ #include <QWaitCondition>
+ #include <QTimer>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include "psimediaprovider.h"
+ #include "rtpworker.h"
+ 
+--- psimedia-1.0.3/gstprovider/gstthread.h~	2008-11-25 04:56:15.000000000 +0100
++++ psimedia-1.0.3/gstprovider/gstthread.h	2013-12-06 21:45:12.959321303 +0100
+@@ -22,7 +22,7 @@
+ #define PSI_GSTTHREAD_H
+ 
+ #include <QThread>
+-#include <glib/gmain.h>
++#include <glib.h>
+ 
+ namespace PsiMedia {
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/psi-plugin-psimedia.git/commitdiff/f1ce355847aed01ffacef0890c3c0175835c0345