commit: 1a9735ddd22e0658540b17f7f6b87b1e85857765 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Fri Nov 27 23:15:13 2015 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri Nov 27 23:15:45 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9735dd
media-sound/xmms2: fix build failure against stable libmodplug, bug #536046 Reported-by: Anthony Parsons Bug: https://bugs.gentoo.org/536046 Package-Manager: portage-2.2.25 media-sound/xmms2/files/xmms2-0.8-cpython.patch | 9 +++++++++ media-sound/xmms2/files/xmms2-0.8-modpug.patch | 11 +++++++++++ media-sound/xmms2/xmms2-0.8-r2.ebuild | 2 ++ 3 files changed, 22 insertions(+) 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 0000000..58227ba --- /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 0000000..ce40127 --- /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 18e8dec..f424d49 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
