summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-sound/xmms2/files/xmms2-0.8-cpython.patch9
-rw-r--r--media-sound/xmms2/files/xmms2-0.8-modpug.patch11
-rw-r--r--media-sound/xmms2/xmms2-0.8-r2.ebuild2
3 files changed, 22 insertions, 0 deletions
diff --git a/media-sound/xmms2/files/xmms2-0.8-cpython.patch b/media-sound/xmms2/files/xmms2-0.8-cpython.patch
new file mode 100644
index 00000000000..58227ba5db8
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-cpython.patch
@@ -0,0 +1,9 @@
+diff --git a/src/clients/lib/python/cython_include/cxmmsclient.pxd b/src/clients/lib/python/cython_include/cxmmsclient.pxd
+index 66390a7..629bc7f 100644
+--- a/src/clients/lib/python/cython_include/cxmmsclient.pxd
++++ b/src/clients/lib/python/cython_include/cxmmsclient.pxd
+@@ -30,3 +30,3 @@ cdef extern from "xmmsc/xmmsc_idnumbers.h":
+
+- ctypedef enum xmmsc_collection_changed_actions_t:
++ ctypedef enum xmms_collection_changed_actions_t:
+ XMMS_COLLECTION_CHANGED_ADD
diff --git a/media-sound/xmms2/files/xmms2-0.8-modpug.patch b/media-sound/xmms2/files/xmms2-0.8-modpug.patch
new file mode 100644
index 00000000000..ce401279c14
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-modpug.patch
@@ -0,0 +1,11 @@
+--- a/src/plugins/modplug/modplug.c 2011-10-20 20:26:08.000000000 +0000
++++ b/src/plugins/modplug/modplug.c 2015-01-08 19:52:43.889787624 +0000
+@@ -9,7 +9,7 @@
+ #include "xmms/xmms_sample.h"
+ #include "xmms/xmms_medialib.h"
+ #include "xmms/xmms_log.h"
+-#include <modplug.h>
++#include <libmodplug/modplug.h>
+
+ #include <glib.h>
+ #include <string.h>
diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild
index 18e8dec4963..f424d494144 100644
--- a/media-sound/xmms2/xmms2-0.8-r2.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild
@@ -113,6 +113,8 @@ src_prepare() {
epatch "${FILESDIR}/${P}"-cython-0.19.1.patch
epatch "${FILESDIR}/${P}"-memset.patch
epatch "${FILESDIR}/${P}"-ffmpeg2.patch #536232
+ epatch "${FILESDIR}/${P}"-cpython.patch
+ epatch "${FILESDIR}/${P}"-modpug.patch #536046
if has_version dev-libs/libcdio-paranoia; then
sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die