mikmod patches for amd64 to detect as a 64bit system, version bump

5 files changed, 92 insertions, 6 deletions

diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index dc7cc49aac07..887fb2b7ff9e 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/sdl-mixer
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.19 2004/05/23 22:53:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.20 2004/05/27 16:32:46 jhuebel Exp $
+
+*sdl-mixer-1.2.5-r3 (27 May 2004)
+
+  27 May 2004; Jason Eric Huebel <jhuebel@gentoo.org> 
+  amd64 patches for mikmod.h and mikmod_internals.h, provided by Tyler Montbriand <tsm@accesscomm.ca>
 
 *sdl-mixer-1.2.5-r2 (23 May 2004)
 
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 8d9a51ca96f2..477a6e75eee8 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,8 +1,11 @@
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 cccde7f249458f4bf521c4108dcd53bf sdl-mixer-1.2.5-r1.ebuild 1278
+MD5 e188d578f9dd7da8bf8c0f03a5b49f85 ChangeLog 3289
+MD5 73ae5ac5f43f63372b8720bc87cf29bc sdl-mixer-1.2.5-r2.ebuild 1329
+MD5 d5bfcfa26fac2272c159319c57345e4a sdl-mixer-1.2.5-r3.ebuild 1427
 MD5 f026901e029ec31037b0bca6dc7f07d8 files/1.2.5-gcc3.patch 1235
 MD5 53b2015dae19981548f34d124a734f8e files/digest-sdl-mixer-1.2.5-r1 67
-MD5 53b2015dae19981548f34d124a734f8e files/digest-sdl-mixer-1.2.5-r2 67
 MD5 7d7f6132f7f6957120c056b644ed4387 files/1.2.5-system-mikmod.patch 2019
-MD5 03f40e30d016339d201046fb06dfe864 ChangeLog 3095
-MD5 cccde7f249458f4bf521c4108dcd53bf sdl-mixer-1.2.5-r1.ebuild 1278
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 69a3e2a879b7dfacf916a423d1e22f86 sdl-mixer-1.2.5-r2.ebuild 1323
+MD5 53b2015dae19981548f34d124a734f8e files/digest-sdl-mixer-1.2.5-r2 67
+MD5 53b2015dae19981548f34d124a734f8e files/digest-sdl-mixer-1.2.5-r3 67
+MD5 b20854212133319dd5b400f71a372bcb files/sdl-mixer-1.2.5-amd64-mikmod.patch 929
diff --git a/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5-r3 b/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5-r3
new file mode 100644
index 000000000000..4363805f47b0
--- /dev/null
+++ b/media-libs/sdl-mixer/files/digest-sdl-mixer-1.2.5-r3
@@ -0,0 +1 @@
+MD5 f26d4e4625f00517203e32bd06fbc5d8 SDL_mixer-1.2.5.tar.gz 936765
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.5-amd64-mikmod.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.5-amd64-mikmod.patch
new file mode 100644
index 000000000000..a8c61db43a91
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.5-amd64-mikmod.patch
@@ -0,0 +1,24 @@
+diff -ur SDL_mixer-1.2.5-old/mikmod/mikmod.h SDL_mixer-1.2.5/mikmod/mikmod.h
+--- SDL_mixer-1.2.5-old/mikmod/mikmod.h	2004-05-27 11:16:29.571640904 -0500
++++ SDL_mixer-1.2.5/mikmod/mikmod.h	2004-05-27 11:17:07.233915368 -0500
+@@ -85,7 +85,7 @@
+ 
+ /*@DOES_NOT_HAVE_SIGNED@*/
+ 
+-#if defined(__alpha)
++#if defined(__alpha) || defined(__x86_64)
+ /* 64 bit architectures */
+ 
+ typedef signed char     SBYTE;      /* 1 byte, signed */
+diff -ur SDL_mixer-1.2.5-old/mikmod/mikmod_internals.h SDL_mixer-1.2.5/mikmod/mikmod_internals.h
+--- SDL_mixer-1.2.5-old/mikmod/mikmod_internals.h	2004-05-27 11:16:29.571640904 -0500
++++ SDL_mixer-1.2.5/mikmod/mikmod_internals.h	2004-05-27 11:17:31.622207784 -0500
+@@ -69,7 +69,7 @@
+ /*========== More type definitions */
+ 
+ /* SLONGLONG: 64bit, signed */
+-#if defined(__alpha)
++#if defined(__alpha) || defined(__x86_64)
+ typedef long		SLONGLONG;
+ #define NATIVE_64BIT_INT
+ #elif defined(__WATCOMC__)
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.5-r3.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.5-r3.ebuild
new file mode 100644
index 000000000000..9a8874715ce4
--- /dev/null
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.5-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.5-r3.ebuild,v 1.1 2004/05/27 16:32:46 jhuebel Exp $
+
+inherit eutils
+
+MY_P="${P/sdl-/SDL_}"
+S=${WORKDIR}/${MY_P}
+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="x86 ppc sparc ~mips alpha hppa amd64"
+IUSE="mpeg mikmod oggvorbis"
+
+RDEPEND=">=media-libs/libsdl-1.2.5
+	>=media-libs/smpeg-0.4.4-r1
+	mikmod? ( >=media-libs/libmikmod-3.1.10 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3.patch
+	epatch ${FILESDIR}/${PV}-system-mikmod.patch
+
+	# amd64 patch for mikmod.h and mikmod_internals.h
+	epatch ${FILESDIR}/${P}-amd64-mikmod.patch
+
+	autoreconf -i || die
+	sed -i \
+		-e 's:/usr/local/lib/timidity:/usr/share/timidity:' \
+		timidity/config.h \
+		|| die "sed timidity/config.h failed"
+}
+
+src_compile() {
+	econf \
+		`use_enable mikmod music-mod` \
+		`use_enable mpeg music-mp3` \
+		`use_enable oggvorbis music-ogg` \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc CHANGES README
+}