diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2005-11-11 00:46:11 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2005-11-11 00:46:11 +0000 |
| commit | aa325ddad558a2efd2f00ddcb21b57567b69aa9f (patch) | |
| tree | 360465fdd726d33cb5fa4af91281c00cc1a28def /media-libs/sdl-mixer | |
| parent | Bump to 1.0.2. (diff) | |
| download | gentoo-2-aa325ddad558a2efd2f00ddcb21b57567b69aa9f.tar.gz gentoo-2-aa325ddad558a2efd2f00ddcb21b57567b69aa9f.tar.bz2 gentoo-2-aa325ddad558a2efd2f00ddcb21b57567b69aa9f.zip | |
don't use the internal mikmod library, use the system one if USE=mikmod (bug #112116)
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'media-libs/sdl-mixer')
| -rw-r--r-- | media-libs/sdl-mixer/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog index 000f5242feb4..6e1ae9760a32 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-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.30 2005/11/04 16:22:05 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.31 2005/11/11 00:46:11 mr_bones_ Exp $ + + 11 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org> + sdl-mixer-1.2.6-r1.ebuild: + don't use the internal mikmod library, use the system one if USE=mikmod (bug + #112116) 04 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> sdl-mixer-1.2.5-r1.ebuild, sdl-mixer-1.2.6.ebuild, diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild index 11f531718d0e..9a74f5d61bfe 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.6-r1.ebuild,v 1.4 2005/11/04 23:48:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild,v 1.5 2005/11/11 00:46:11 mr_bones_ Exp $ inherit eutils @@ -33,10 +33,12 @@ src_unpack() { } 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 timidity-midi) \ $(use_enable mikmod music-libmikmod) \ - $(use_enable mikmod music-mod) \ $(use_enable mp3 music-mp3) \ $(use_enable vorbis music-ogg) \ || die |