kdemultimedia: fixed FTBFS on xine_artsplugin, removed useless stuff, changed maintainer

2 files changed, 38 insertions, 13 deletions

diff --git a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
index 4c94c9af9..12e75db87 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
 
 pkgname=trinity-kdemultimedia
 pkgver=3513
@@ -10,16 +11,10 @@ groups=('trinity-extras')
 pkgdesc="Trinity multimedia applications and tools"
 depends=('trinity-kdelibs' 'xine-lib' 'libvorbis' 'trinity-arts' 'alsa-lib' 'cdparanoia' 'lame' 'audiofile' 'libtheora' 'flac')
 makedepends=('pkgconfig' 'autoconf' 'automake')
-optdepends=()
-provides=($pkgname)
-conflicts=()
-replaces=()
 options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdemultimedia-3.5.13.tar.gz)
-source=(http://anduin.linuxfromscratch.org/sources/trinity/kdemultimedia-3.5.13.tar.gz)
-md5sums=('6d906b8a8fd0928e01ecd600175381c0')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdemultimedia-3.5.13.tar.gz' 'xine_artsplugin.patch')
+md5sums=('6d906b8a8fd0928e01ecd600175381c0' 'bb045d94e8dca80d73af4add43b7fc15')
 
-_builddir=kdemultimedia
 _prefix=/opt/trinity
 
 build() {
@@ -28,11 +23,11 @@ build() {
   export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
   export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
 
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < kdemultimedia.patch
+  msg "Patching..."
+  patch -p0 -i ${srcdir}/xine_artsplugin.patch
   
   msg "Starting automake..."
-  cd "$srcdir/${_builddir}"
+  cd "$srcdir/kdemultimedia"
   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
   make -f admin/Makefile.common
@@ -61,6 +56,6 @@ build() {
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/${_builddir}
+  cd ${srcdir}/kdemultimedia
   make DESTDIR="${pkgdir}" install
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/xine_artsplugin.patch b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/xine_artsplugin.patch
new file mode 100644
index 000000000..36f89bcfd
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/xine_artsplugin.patch
@@ -0,0 +1,30 @@
+diff -u -r src/kdemultimedia/xine_artsplugin/xinePlayObject_impl.cpp kdemultimedia/xine_artsplugin/xinePlayObject_impl.cpp
+--- src/kdemultimedia/xine_artsplugin/xinePlayObject_impl.cpp	2012-01-24 00:34:05.000000000 +0100
++++ kdemultimedia/xine_artsplugin/xinePlayObject_impl.cpp	2011-08-13 08:18:23.000000000 +0200
+@@ -698,7 +698,7 @@
+ 
+ 	    if (stream != 0)
+ 	    {
+-		xine_gui_send_vo_data( stream,
++		xine_port_send_gui_data( vo_port,
+ 				       XINE_GUI_SEND_EXPOSE_EVENT,
+ 				       &event );
+ 	    }
+@@ -714,7 +714,7 @@
+ 
+ 	    if (stream != 0)
+ 	    {
+-		xine_gui_send_vo_data( stream,
++		xine_port_send_gui_data( vo_port,
+ 				       XINE_GUI_SEND_COMPLETION_EVENT,
+ 				       &event );
+ 	    }
+@@ -748,7 +748,7 @@
+ 	{
+ 	    resizeNotify();
+ 
+-	    xine_gui_send_vo_data( stream,
++	    xine_port_send_gui_data( vo_port,
+ 				   XINE_GUI_SEND_DRAWABLE_CHANGED,
+ 				   (void *)window );
+ 	}