diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2014-08-08 11:57:02 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2014-08-08 11:57:02 +0000 |
| commit | 9dad53cdf208eb0776930afb99f9cc6ed6b77ded (patch) | |
| tree | 9328e959b0011681a58ffe24a84e288724393b9c /media-libs/sdl-mixer | |
| parent | Remove older config files (diff) | |
| download | gentoo-2-9dad53cdf208eb0776930afb99f9cc6ed6b77ded.tar.gz gentoo-2-9dad53cdf208eb0776930afb99f9cc6ed6b77ded.tar.bz2 gentoo-2-9dad53cdf208eb0776930afb99f9cc6ed6b77ded.zip | |
Fix compiling against libmodplug-0.8.8.5 wrt #519372
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'media-libs/sdl-mixer')
4 files changed, 34 insertions, 3 deletions
diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog index 854195952c5f..4c9e3bc1de59 100644 --- a/media-libs/sdl-mixer/ChangeLog +++ b/media-libs/sdl-mixer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/sdl-mixer # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.129 2014/06/30 16:35:23 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.130 2014/08/08 11:57:02 hasufell Exp $ + + 08 Aug 2014; Julian Ospald <hasufell@gentoo.org> sdl-mixer-1.2.12-r3.ebuild, + sdl-mixer-1.2.12-r4.ebuild, + +files/sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch: + Fix compiling against libmodplug-0.8.8.5 wrt #519372 30 Jun 2014; Michael Sterrett <mr_bones_@gentoo.org> -sdl-mixer-1.2.12-r1.ebuild: diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch new file mode 100644 index 000000000000..369fe49558f0 --- /dev/null +++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch @@ -0,0 +1,24 @@ +From: hasufell <hasufell@gentoo.org> +Date: Fri, 8 Aug 2014 13:49:49 +0200 +Subject: [PATCH] Fix compiling against libmodplug-0.8.8.5 + +pkg-config --cflags libmodplug no longer +reports a subdir and thus we need to use +#include "libmodplug/modplug.h" syntax. +--- + music_modplug.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/music_modplug.h ++++ b/music_modplug.h +@@ -1,6 +1,6 @@ + #ifdef MODPLUG_MUSIC + +-#include "modplug.h" ++#include "libmodplug/modplug.h" + #include "SDL_rwops.h" + #include "SDL_audio.h" + #include "SDL_mixer.h" +-- +2.0.4 + diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild index cb0055ba6f2d..0cde56d439b8 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.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/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild,v 1.12 2014/05/05 03:39:56 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild,v 1.13 2014/08/08 11:57:01 hasufell Exp $ EAPI=4 inherit eutils @@ -50,6 +50,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-wav.patch \ "${FILESDIR}"/${P}-clang.patch \ + "${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch \ "${FILESDIR}"/${P}-mikmod-r58{7,8}.patch #445980 sed -i \ -e '/link.*play/s/-o/$(LDFLAGS) -o/' \ diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild index 0b917c9ec140..9a71061a9446 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.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/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild,v 1.3 2014/06/18 19:56:13 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild,v 1.4 2014/08/08 11:57:01 hasufell Exp $ EAPI=5 inherit eutils multilib-minimal @@ -55,6 +55,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-wav.patch \ "${FILESDIR}"/${P}-clang.patch \ + "${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch \ "${FILESDIR}"/${P}-mikmod-r58{7,8}.patch #445980 sed -i \ -e '/link.*play/s/-o/$(LDFLAGS) -o/' \ |