diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2006-07-24 08:30:56 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2006-07-24 08:30:56 +0000 |
| commit | ca29dbd3f0744e48a0581b6897f49293bb4a4ecf (patch) | |
| tree | 50fe367a91faf69ff0c91ef24eabb19cf257f1e4 /media-libs/sdl-mixer | |
| parent | fix patch tarballs, d'oh (diff) | |
| download | gentoo-2-ca29dbd3f0744e48a0581b6897f49293bb4a4ecf.tar.gz gentoo-2-ca29dbd3f0744e48a0581b6897f49293bb4a4ecf.tar.bz2 gentoo-2-ca29dbd3f0744e48a0581b6897f49293bb4a4ecf.zip | |
work around wonky logic for mikmod support in configure (bug #140152)
(Portage version: 2.1.1_pre3-r1)
Diffstat (limited to 'media-libs/sdl-mixer')
| -rw-r--r-- | media-libs/sdl-mixer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/sdl-mixer/files/sdl-mixer-1.2.7-libmikmod.patch | 20 | ||||
| -rw-r--r-- | media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild | 11 |
3 files changed, 33 insertions, 4 deletions
diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog index 068cacc2424f..2aa337cfeb26 100644 --- a/media-libs/sdl-mixer/ChangeLog +++ b/media-libs/sdl-mixer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/sdl-mixer # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.40 2006/05/19 18:07:00 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.41 2006/07/24 08:30:56 mr_bones_ Exp $ + + 24 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org> + +files/sdl-mixer-1.2.7-libmikmod.patch, sdl-mixer-1.2.7.ebuild: + work around wonky logic for mikmod support in configure (bug #140152) *sdl-mixer-1.2.7 (19 May 2006) diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.7-libmikmod.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.7-libmikmod.patch new file mode 100644 index 000000000000..7681bb2c33ac --- /dev/null +++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.7-libmikmod.patch @@ -0,0 +1,20 @@ +--- configure.in.orig 2006-07-24 04:18:18.000000000 -0400 ++++ configure.in 2006-07-24 04:21:23.000000000 -0400 +@@ -155,7 +155,7 @@ + printf("no\n*** libmikmod is older than %d.%d.%d, not using.\n",maj,min,rev); + return 1; + } +-],,CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED", ++],EXTRA_CFLAGS="$EXTRA_CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`";EXTRA_LDFLAGS="$EXTRA_LDFLAGS `$LIBMIKMOD_CONFIG --libs`",CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED", + [echo $ac_n "cross compiling; assumed OK... $ac_c"]) + fi + fi +@@ -163,7 +163,7 @@ + AC_ARG_ENABLE([music-mod], + AC_HELP_STRING([--enable-music-mod], [enable MOD music via mikmod [[default=yes]]]), + [], [enable_music_mod=$no_libmikmod]) +-if test x$enable_music_mod = xyes; then ++if test x$enable_music_mod = xyes -a x$enable_music_libmikmod = xno; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -DMOD_MUSIC -I\$(srcdir)/mikmod" + SOURCES="$SOURCES $srcdir/mikmod/*.c" + fi diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild index b574af1417b6..c582818261c0 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2006 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.7.ebuild,v 1.2 2006/07/20 02:05:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild,v 1.3 2006/07/24 08:30:56 mr_bones_ Exp $ + +inherit eutils MY_P=${P/sdl-/SDL_} DESCRIPTION="Simple Direct Media Layer Mixer Library" @@ -23,17 +25,20 @@ S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}/${P}-libmikmod.patch" sed -i \ -e 's:/usr/local/lib/timidity:/usr/share/timidity:' \ timidity/config.h \ || die "sed timidity/config.h failed" + aclocal && autoconf || die "autotools failed" } src_compile() { - # don't use the internal mikmod library, use the system one if USE=mikmod econf \ - --disable-music-mod \ + --disable-dependency-tracking \ + $(use_enable timidity music-midi) \ $(use_enable timidity timidity-midi) \ + $(use_enable mikmod music-mod) \ $(use_enable mikmod music-libmikmod) \ $(use_enable mp3 music-mp3) \ $(use_enable vorbis music-ogg) \ |