| 1 |
commit: 1a9735ddd22e0658540b17f7f6b87b1e85857765 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 27 23:15:13 2015 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 27 23:15:45 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9735dd |
| 7 |
|
| 8 |
media-sound/xmms2: fix build failure against stable libmodplug, bug #536046 |
| 9 |
|
| 10 |
Reported-by: Anthony Parsons |
| 11 |
Bug: https://bugs.gentoo.org/536046 |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.25 |
| 14 |
|
| 15 |
media-sound/xmms2/files/xmms2-0.8-cpython.patch | 9 +++++++++ |
| 16 |
media-sound/xmms2/files/xmms2-0.8-modpug.patch | 11 +++++++++++ |
| 17 |
media-sound/xmms2/xmms2-0.8-r2.ebuild | 2 ++ |
| 18 |
3 files changed, 22 insertions(+) |
| 19 |
|
| 20 |
diff --git a/media-sound/xmms2/files/xmms2-0.8-cpython.patch b/media-sound/xmms2/files/xmms2-0.8-cpython.patch |
| 21 |
new file mode 100644 |
| 22 |
index 0000000..58227ba |
| 23 |
--- /dev/null |
| 24 |
+++ b/media-sound/xmms2/files/xmms2-0.8-cpython.patch |
| 25 |
@@ -0,0 +1,9 @@ |
| 26 |
+diff --git a/src/clients/lib/python/cython_include/cxmmsclient.pxd b/src/clients/lib/python/cython_include/cxmmsclient.pxd |
| 27 |
+index 66390a7..629bc7f 100644 |
| 28 |
+--- a/src/clients/lib/python/cython_include/cxmmsclient.pxd |
| 29 |
++++ b/src/clients/lib/python/cython_include/cxmmsclient.pxd |
| 30 |
+@@ -30,3 +30,3 @@ cdef extern from "xmmsc/xmmsc_idnumbers.h": |
| 31 |
+ |
| 32 |
+- ctypedef enum xmmsc_collection_changed_actions_t: |
| 33 |
++ ctypedef enum xmms_collection_changed_actions_t: |
| 34 |
+ XMMS_COLLECTION_CHANGED_ADD |
| 35 |
|
| 36 |
diff --git a/media-sound/xmms2/files/xmms2-0.8-modpug.patch b/media-sound/xmms2/files/xmms2-0.8-modpug.patch |
| 37 |
new file mode 100644 |
| 38 |
index 0000000..ce40127 |
| 39 |
--- /dev/null |
| 40 |
+++ b/media-sound/xmms2/files/xmms2-0.8-modpug.patch |
| 41 |
@@ -0,0 +1,11 @@ |
| 42 |
+--- a/src/plugins/modplug/modplug.c 2011-10-20 20:26:08.000000000 +0000 |
| 43 |
++++ b/src/plugins/modplug/modplug.c 2015-01-08 19:52:43.889787624 +0000 |
| 44 |
+@@ -9,7 +9,7 @@ |
| 45 |
+ #include "xmms/xmms_sample.h" |
| 46 |
+ #include "xmms/xmms_medialib.h" |
| 47 |
+ #include "xmms/xmms_log.h" |
| 48 |
+-#include <modplug.h> |
| 49 |
++#include <libmodplug/modplug.h> |
| 50 |
+ |
| 51 |
+ #include <glib.h> |
| 52 |
+ #include <string.h> |
| 53 |
|
| 54 |
diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild |
| 55 |
index 18e8dec..f424d49 100644 |
| 56 |
--- a/media-sound/xmms2/xmms2-0.8-r2.ebuild |
| 57 |
+++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild |
| 58 |
@@ -113,6 +113,8 @@ src_prepare() { |
| 59 |
epatch "${FILESDIR}/${P}"-cython-0.19.1.patch |
| 60 |
epatch "${FILESDIR}/${P}"-memset.patch |
| 61 |
epatch "${FILESDIR}/${P}"-ffmpeg2.patch #536232 |
| 62 |
+ epatch "${FILESDIR}/${P}"-cpython.patch |
| 63 |
+ epatch "${FILESDIR}/${P}"-modpug.patch #536046 |
| 64 |
|
| 65 |
if has_version dev-libs/libcdio-paranoia; then |
| 66 |
sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die |
Archives