diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2014-11-29 08:36:16 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2014-11-29 08:36:16 +0000 |
| commit | 6c981efc1aa8a8b4a471b93dd4d42d22dc71d1fe (patch) | |
| tree | 2fec27fdacf5155bf53baeb6ab66a9f49e45bd84 /media-libs | |
| parent | remove unnecessary var confirmed by mgorny (diff) | |
| download | gentoo-2-6c981efc1aa8a8b4a471b93dd4d42d22dc71d1fe.tar.gz gentoo-2-6c981efc1aa8a8b4a471b93dd4d42d22dc71d1fe.tar.bz2 gentoo-2-6c981efc1aa8a8b4a471b93dd4d42d22dc71d1fe.zip | |
fix building against newer libmodplug (bug #531022)
(Portage version: 2.2.8-r2/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-libs')
3 files changed, 36 insertions, 2 deletions
diff --git a/media-libs/sdl2-mixer/ChangeLog b/media-libs/sdl2-mixer/ChangeLog index ba42dc8d4fa2..fdba64a0d856 100644 --- a/media-libs/sdl2-mixer/ChangeLog +++ b/media-libs/sdl2-mixer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/sdl2-mixer # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-mixer/ChangeLog,v 1.4 2014/10/15 19:58:15 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-mixer/ChangeLog,v 1.5 2014/11/29 08:36:16 mr_bones_ Exp $ + + 29 Nov 2014; Michael Sterrett <mr_bones_@gentoo.org> + +files/sdl2-mixer-2.0.0-Fix-compiling-against-libmodplug-0.8.8.5.patch, + sdl2-mixer-2.0.0-r1.ebuild: + fix building against newer libmodplug (bug #531022) 15 Oct 2014; Michał Górny <mgorny@gentoo.org> sdl2-mixer-2.0.0-r1.ebuild: Use ${CHOST}-libmikmod-config for proper multilib support, bug #511034. diff --git a/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.0-Fix-compiling-against-libmodplug-0.8.8.5.patch b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.0-Fix-compiling-against-libmodplug-0.8.8.5.patch new file mode 100644 index 000000000000..786931dc6363 --- /dev/null +++ b/media-libs/sdl2-mixer/files/sdl2-mixer-2.0.0-Fix-compiling-against-libmodplug-0.8.8.5.patch @@ -0,0 +1,25 @@ +diff -ru SDL2_mixer-2.0.0.orig/dynamic_modplug.h SDL2_mixer-2.0.0/dynamic_modplug.h +--- SDL2_mixer-2.0.0.orig/dynamic_modplug.h 2013-08-10 13:39:55.000000000 -0400 ++++ SDL2_mixer-2.0.0/dynamic_modplug.h 2014-11-29 03:00:38.288969276 -0500 +@@ -21,7 +21,7 @@ + + #ifdef MODPLUG_MUSIC + +-#include "modplug.h" ++#include "libmodplug/modplug.h" + + typedef struct { + int loaded; +diff -ru SDL2_mixer-2.0.0.orig/music_modplug.h SDL2_mixer-2.0.0/music_modplug.h +--- SDL2_mixer-2.0.0.orig/music_modplug.h 2013-08-10 13:39:58.000000000 -0400 ++++ SDL2_mixer-2.0.0/music_modplug.h 2014-11-29 03:00:05.346347058 -0500 +@@ -21,7 +21,7 @@ + + #ifdef MODPLUG_MUSIC + +-#include "modplug.h" ++#include "libmodplug/modplug.h" + #include "SDL_rwops.h" + #include "SDL_audio.h" + #include "SDL_mixer.h" +Only in SDL2_mixer-2.0.0: music_modplug.h.orig diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild index 12fffd11b8d3..f0be99ab32d1 100644 --- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild +++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild,v 1.3 2014/10/15 19:58:15 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-mixer/sdl2-mixer-2.0.0-r1.ebuild,v 1.4 2014/11/29 08:36:16 mr_bones_ Exp $ EAPI=5 inherit eutils multilib-minimal @@ -51,6 +51,10 @@ DEPEND=${RDEPEND} S=${WORKDIR}/${MY_P} +src_prepare() { + epatch "${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch +} + multilib_src_configure() { ECONF_SOURCE=${S} \ econf \ |