added patch to fix 64bit arch defines, which broke mikmod output

4 files changed, 70 insertions, 1 deletions

diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog
index 9fb79f845734..716b42561fcf 100644
--- a/media-libs/libmikmod/ChangeLog
+++ b/media-libs/libmikmod/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-libs/libmikmod
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.23 2004/05/14 04:09:51 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.24 2004/05/21 18:48:52 jhuebel Exp $
+
+*libmikmod-3.1.11-r1 (21 May 2004)
+
+  21 May 2004; Jason Eric Huebel <jhuebel@gentoo.org>
+  +files/libmikmod-3.1.11-amd64-archdef.patch, +libmikmod-3.1.11-r1.ebuild:
+  added amd64 patch to fix 64bit arch defines
+
+*libmikmod-3.1.11-r1 21 May 2004
+
+  21 May 2004;  <> 
+  # INSERT ENTRY HERE
 
   14 May 2004; Stephen P. Becker <geoman@gentoo.org> libmikmod-3.1.11.ebuild:
   Stable on mips.
diff --git a/media-libs/libmikmod/files/digest-libmikmod-3.1.11-r1 b/media-libs/libmikmod/files/digest-libmikmod-3.1.11-r1
new file mode 100644
index 000000000000..27b99f8e1867
--- /dev/null
+++ b/media-libs/libmikmod/files/digest-libmikmod-3.1.11-r1
@@ -0,0 +1 @@
+MD5 705106da305e8de191549f1e7393185c libmikmod-3.1.11.tar.gz 611590
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-archdef.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-archdef.patch
new file mode 100644
index 000000000000..b66af05b0ae0
--- /dev/null
+++ b/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-archdef.patch
@@ -0,0 +1,12 @@
+diff -ru libmikmod-3.1.11-old/include/mikmod.h.in libmikmod-3.1.11/include/mikmod.h.in
+--- libmikmod-3.1.11-old/include/mikmod.h.in	2004-05-21 13:26:08.824106896 -0500
++++ libmikmod-3.1.11/include/mikmod.h.in	2004-05-21 13:26:39.024515736 -0500
+@@ -85,7 +85,7 @@
+ 
+ @DOES_NOT_HAVE_SIGNED@
+ 
+-#if defined(__arch64__) || defined(__alpha)
++#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
+ /* 64 bit architectures */
+ 
+ typedef signed char     SBYTE;      /* 1 byte, signed */
diff --git a/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild b/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild
new file mode 100644
index 000000000000..e20dc0a64bd8
--- /dev/null
+++ b/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild,v 1.1 2004/05/21 18:48:52 jhuebel Exp $
+
+inherit gnuconfig flag-o-matic
+
+DESCRIPTION="A library to play a wide range of module formats"
+HOMEPAGE="http://mikmod.raphnet.net/"
+SRC_URI="http://mikmod.raphnet.net/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 | LGPL-2"
+SLOT="0"
+KEYWORDS="x86 ~amd64 hppa sparc mips ~alpha ia64"
+IUSE="oss esd alsa"
+
+DEPEND=">=media-libs/audiofile-0.2.3
+	alsa? ( >=media-libs/alsa-lib-0.5.9 )
+	esd? ( >=media-sound/esound-0.2.19 )"
+
+src_compile() {
+	filter-flags -Os
+
+	local myconf
+	myconf="--enable-af" # include AudioFile driver
+
+	use esd && myconf="${myconf} --enable-esd"
+	use alsa && myconf="${myconf} --enable-alsa"
+	use oss && myconf="${myconf} --enable-oss"
+
+	# alpha, amd64 and ia64 (at least) need gnuconfig_update
+	gnuconfig_update
+
+	# patch for 64bit arch defs for amd64/x86_64
+	use amd64 && epatch ${FILESDIR}/${P}-amd64-archdef.patch
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS NEWS README TODO
+	dohtml docs/*.html
+}