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 | 32920a876f0df1ca37eec1a5412bcf2be2972838 (patch) | |
| tree | 032fea7ac52564ba3fa2161a6d5c4778b485f2f6 /media-libs | |
| parent | Bump to 1.0.2. (diff) | |
| download | historical-32920a876f0df1ca37eec1a5412bcf2be2972838.tar.gz historical-32920a876f0df1ca37eec1a5412bcf2be2972838.tar.bz2 historical-32920a876f0df1ca37eec1a5412bcf2be2972838.zip | |
don't use the internal mikmod library, use the system one if USE=mikmod (bug #112116)
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/sdl-mixer/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/sdl-mixer/Manifest | 26 | ||||
| -rw-r--r-- | media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild | 6 |
3 files changed, 18 insertions, 21 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/Manifest b/media-libs/sdl-mixer/Manifest index 6a5d8fa665ce..82dcbacba079 100644 --- a/media-libs/sdl-mixer/Manifest +++ b/media-libs/sdl-mixer/Manifest @@ -1,21 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 7c716e9117528d5569b6a234c91a149b ChangeLog 4472 -MD5 f026901e029ec31037b0bca6dc7f07d8 files/1.2.5-gcc3.patch 1235 -MD5 53b2015dae19981548f34d124a734f8e files/digest-sdl-mixer-1.2.5-r1 67 +MD5 f84eb8e4df8c2d8e6cc02b8f50990127 sdl-mixer-1.2.6.ebuild 1236 +MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 +MD5 39b686f066984e4b0942a03eb596250f sdl-mixer-1.2.5-r1.ebuild 1430 +MD5 95de497397d024bbfbaea4ff7cc7605c ChangeLog 4648 +MD5 03ee82f05b402a4fdef14e0faef8ff5c sdl-mixer-1.2.6-r1.ebuild 1512 MD5 1ca1975170b01d4da4056cc84635b608 files/digest-sdl-mixer-1.2.6 68 -MD5 1ca1975170b01d4da4056cc84635b608 files/digest-sdl-mixer-1.2.6-r1 68 +MD5 53b2015dae19981548f34d124a734f8e files/digest-sdl-mixer-1.2.5-r1 67 MD5 b20854212133319dd5b400f71a372bcb files/sdl-mixer-1.2.5-amd64-mikmod.patch 929 MD5 85c429a982fe437337599502a8fa6c1d files/sdl-mixer-1.2.6-mikmod-music-init.patch 260 -MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 -MD5 39b686f066984e4b0942a03eb596250f sdl-mixer-1.2.5-r1.ebuild 1430 -MD5 d6686251612298eb01cd14b8ec7395a3 sdl-mixer-1.2.6-r1.ebuild 1411 -MD5 f84eb8e4df8c2d8e6cc02b8f50990127 sdl-mixer-1.2.6.ebuild 1236 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDa/OdgIKl8Uu19MoRAqIFAJ4gk6+M78Mhp2BlzUUwNcnogNM/TQCfdt1v -UYNLrXzo9LJyqgqlo0sefrA= -=AZbQ ------END PGP SIGNATURE----- +MD5 f026901e029ec31037b0bca6dc7f07d8 files/1.2.5-gcc3.patch 1235 +MD5 1ca1975170b01d4da4056cc84635b608 files/digest-sdl-mixer-1.2.6-r1 68 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 |