From 0615a909b089a81d068ae10517ceff31dabfece1 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 10 Jul 2012 00:01:37 +0000
Subject: Tue Jul 10 00:01:37 UTC 2012

---
 community/xmms2/PKGBUILD         | 15 +++++++++++----
 community/xmms2/ffmpeg-0.11.diff | 10 ++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 community/xmms2/ffmpeg-0.11.diff

(limited to 'community/xmms2')

diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index 3ef7e4962..fcbf5aa33 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 69440 2012-04-16 10:52:32Z spupykin $
+# $Id: PKGBUILD 73487 2012-07-08 09:31:59Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xmms2
 pkgver=0.8DrO_o
-pkgrel=6
+pkgrel=7
 pkgdesc="complete rewrite of the popular music player"
 arch=('i686' 'x86_64')
 url="http://xmms2.org/"
@@ -49,12 +49,19 @@ conflicts=('xmms2-devel')
 install=xmms2.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 	xmms2d.conf
-	xmms2d.rc)
+	xmms2d.rc
+    'ffmpeg-0.11.diff')
 md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3'
          'af13c937bf3c86b77ae6820107aab9b8'
-         '9d8e3e1a434f271423bdd228a1e9bd7c')
+         '9d8e3e1a434f271423bdd228a1e9bd7c'
+         'e176971ef96807f72fa8fc17d260c20a')
 
 build() {
+  cd xmms2-${pkgver}/src/plugins/avcodec/
+  # remove call to avcodec_init
+  # http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=3211932c513338566b31d990d06957e15a644d13
+  patch -Np0 -i ${srcdir}/ffmpeg-0.11.diff
+
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # python2 fix
diff --git a/community/xmms2/ffmpeg-0.11.diff b/community/xmms2/ffmpeg-0.11.diff
new file mode 100644
index 000000000..91d3a3106
--- /dev/null
+++ b/community/xmms2/ffmpeg-0.11.diff
@@ -0,0 +1,10 @@
+--- avcodec.c.orig	2012-06-07 15:08:23.796225671 -0500
++++ avcodec.c	2012-06-07 15:08:36.649489373 -0500
+@@ -134,7 +134,6 @@
+ 
+ 	xmms_xform_private_data_set (xform, data);
+ 
+-	avcodec_init ();
+ 	avcodec_register_all ();
+ 
+ 	mimetype = xmms_xform_indata_get_str (xform,
-- 
cgit v1.2.3-54-g00ecf