Fix sdl-mixer as proposed in #99590 by TGL and like upstream has done in cvs already.

Package-Manager: portage-2.0.53_rc4

5 files changed, 82 insertions, 12 deletions

diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index e8b4b04dcc86..dbbd34796592 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/sdl-mixer
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.28 2005/06/12 17:42:19 kloeri Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.29 2005/10/10 15:01:39 vapier Exp $
+
+*sdl-mixer-1.2.6-r1 (10 Oct 2005)
+
+  10 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/sdl-mixer-1.2.6-mikmod-music-init.patch,
+  +sdl-mixer-1.2.6-r1.ebuild:
+  Fix sdl-mixer as proposed in #99590 by TGL and like upstream has done in cvs
+  already.
 
   12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> sdl-mixer-1.2.6.ebuild:
   Stable on alpha.
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index c91ddf3ed792..7da067b07b95 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 23705937b9797ba254ff614c89c1b306 sdl-mixer-1.2.6.ebuild 1225
-MD5 98d99e954e2ccebd613b5396df79e07d ChangeLog 4005
-MD5 375360d31ec4aa8f404bb421dc7bc39b sdl-mixer-1.2.5-r1.ebuild 1421
-MD5 53b2015dae19981548f34d124a734f8e files/digest-sdl-mixer-1.2.5-r1 67
-MD5 b20854212133319dd5b400f71a372bcb files/sdl-mixer-1.2.5-amd64-mikmod.patch 929
+MD5 5945a1bed5e1f840d0f5532d23b852b4 ChangeLog 4261
 MD5 f026901e029ec31037b0bca6dc7f07d8 files/1.2.5-gcc3.patch 1235
+MD5 53b2015dae19981548f34d124a734f8e files/digest-sdl-mixer-1.2.5-r1 67
 MD5 1ca1975170b01d4da4056cc84635b608 files/digest-sdl-mixer-1.2.6 68
+MD5 1ca1975170b01d4da4056cc84635b608 files/digest-sdl-mixer-1.2.6-r1 68
+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 375360d31ec4aa8f404bb421dc7bc39b sdl-mixer-1.2.5-r1.ebuild 1421
+MD5 613dfb3b587e2d71931f69374c2f1c88 sdl-mixer-1.2.6-r1.ebuild 1304
+MD5 23705937b9797ba254ff614c89c1b306 sdl-mixer-1.2.6.ebuild 1225
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC0FbEgIKl8Uu19MoRAheMAJ9bU52/9VS4GhazAdKckfl/2j4JvgCdEYFV
-gmNFAQ95uWyVfmbUN09oygA=
-=r3j7
+iD8DBQFDSoLOgIKl8Uu19MoRAnyBAKCAFiMe4TnhkIF/Co4JFR9FzXnQZQCfU0KX
+omiInhpP772JqwXUQa6ENhc=
+=zL8B
 -----END PGP SIGNATURE-----
diff --git a/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.6-r1 b/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.6-r1
new file mode 100644
index 000000000000..ebd95ac1820a
--- /dev/null
+++ b/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.6-r1
@@ -0,0 +1 @@
+MD5 2b8beffad9179d80e598c22c80efb135 SDL_mixer-1.2.6.tar.gz 1147838
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.6-mikmod-music-init.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.6-mikmod-music-init.patch
new file mode 100644
index 000000000000..f4810a10e5e4
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.6-mikmod-music-init.patch
@@ -0,0 +1,11 @@
+--- SDL_mixer-1.2.6/music.c
++++ SDL_mixer-1.2.6/music.c
+@@ -392,7 +392,7 @@
+ #ifdef LIBMIKMOD_MUSIC
+ 	if(!MikMod_InfoDriver())
+ #endif
+-	MikMod_RegisterAllDrivers();
++	MikMod_RegisterDriver(&drv_nos);
+ #ifdef LIBMIKMOD_MUSIC
+ 	if(!MikMod_InfoLoader())
+ #endif
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
new file mode 100644
index 000000000000..1ab36e204b24
--- /dev/null
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.6-r1.ebuild
@@ -0,0 +1,47 @@
+# 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.1 2005/10/10 15:01:39 vapier Exp $
+
+inherit eutils
+
+MY_P=${P/sdl-/SDL_}
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/index.html"
+SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="mp3 mikmod vorbis"
+
+DEPEND=">=media-libs/libsdl-1.2.5
+	>=media-libs/smpeg-0.4.4-r1
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )
+	mikmod? ( >=media-libs/libmikmod-3.1.10 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/sdl-mixer-1.2.6-mikmod-music-init.patch
+	sed -i \
+		-e 's:/usr/local/lib/timidity:/usr/share/timidity:' \
+		timidity/config.h \
+		|| die "sed timidity/config.h failed"
+}
+
+src_compile() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable mikmod music-libmikmod) \
+		$(use_enable mp3 music-mp3) \
+		$(use_enable vorbis music-ogg) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc CHANGES README
+}