Closing #42074.

4 files changed, 91 insertions, 11 deletions

diff --git a/media-plugins/modplugxmms/ChangeLog b/media-plugins/modplugxmms/ChangeLog
index 61c80f05c31b..bc7168402065 100644
--- a/media-plugins/modplugxmms/ChangeLog
+++ b/media-plugins/modplugxmms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/modplugxmms
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/modplugxmms/ChangeLog,v 1.5 2003/06/03 12:50:17 robh Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/modplugxmms/ChangeLog,v 1.6 2004/02/25 17:41:18 aliz Exp $
+
+  25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> modplugxmms-2.04.ebuild,
+  files/modplugxmms-2.04-amd64.patch:
+  Adding amd64 keyword. Closing #42074.
 
 *modplugxmms-2.04 (03 Jun 2003)
 
diff --git a/media-plugins/modplugxmms/Manifest b/media-plugins/modplugxmms/Manifest
index 2b3cc7dd34a2..4a51f66ecc02 100644
--- a/media-plugins/modplugxmms/Manifest
+++ b/media-plugins/modplugxmms/Manifest
@@ -1,6 +1,7 @@
+MD5 30bfad04add4f4079563af5143c9ed49 modplugxmms-2.03.ebuild 895
+MD5 9f8a2698ef106a370d51703a00409737 modplugxmms-2.04.ebuild 1151
+MD5 4974e305284b60ef852962a63bd336ce ChangeLog 1130
+MD5 347455313bf5f53d8e4266e15aa5e626 files/modplugxmms-2.04.patch 1493
 MD5 f6708258d3e7af56cfb32b7cc55d695a files/digest-modplugxmms-2.03 68
 MD5 d7165423584038258ba8ea95f016b073 files/digest-modplugxmms-2.04 68
-MD5 347455313bf5f53d8e4266e15aa5e626 files/modplugxmms-2.04.patch 1493
-MD5 30bfad04add4f4079563af5143c9ed49 modplugxmms-2.03.ebuild 895
-MD5 be95142d367124deb412acbb2aaa63b4 ChangeLog 978
-MD5 16eb9a58d5e3b542a226a6e580e2323d modplugxmms-2.04.ebuild 1085
+MD5 b10f6248932b7fd4ce0df1a025df6e8a files/modplugxmms-2.04-amd64.patch 1550
diff --git a/media-plugins/modplugxmms/files/modplugxmms-2.04-amd64.patch b/media-plugins/modplugxmms/files/modplugxmms-2.04-amd64.patch
new file mode 100644
index 000000000000..9584268c3b3b
--- /dev/null
+++ b/media-plugins/modplugxmms/files/modplugxmms-2.04-amd64.patch
@@ -0,0 +1,73 @@
+--- stdafx.h
++++ stdafx.h
+23a24,91
+> #elif defined(__x86_64__)
+> 
+> #include <stdlib.h>
+> #include <stdio.h>
+> #include <string.h>
+> 
+> typedef signed char CHAR;
+> typedef unsigned char UCHAR;
+> typedef unsigned char* PUCHAR;
+> typedef unsigned short USHORT;
+> typedef unsigned int ULONG;
+> typedef unsigned int UINT;
+> typedef unsigned int DWORD;
+> typedef int LONG;
+> typedef unsigned short WORD;
+> typedef unsigned char BYTE;
+> typedef unsigned char * LPBYTE;
+> typedef bool BOOL;
+> typedef char * LPSTR;
+> typedef void *  LPVOID;
+> typedef int * LPLONG;
+> typedef unsigned int * LPDWORD;
+> typedef unsigned short * LPWORD;
+> typedef const char * LPCSTR;
+> typedef long LONGLONG;
+> typedef void * PVOID;
+> typedef void VOID;
+> 
+> inline LONG MulDiv (int a, int b, int c)
+> {
+>   // if (!c) return 0;
+>   return ((unsigned long)a * (unsigned long) b ) / c;
+> }
+> 
+> #define MODPLUG_NO_FILESAVE
+> #define NO_AGC
+> #define LPCTSTR LPCSTR
+> #define lstrcpyn strncpy
+> #define lstrcpy strcpy
+> #define lstrcmp strcmp
+> #define WAVE_FORMAT_PCM 1
+> //#define ENABLE_EQ
+> 
+> #define  GHND   0
+> 
+> inline signed char * GlobalAllocPtr(unsigned int, size_t size)
+> {
+>   signed char * p = (signed char *) malloc(size);
+> 
+>   if (p != NULL) memset(p, 0, size);
+>   return p;
+> }
+> 
+> inline void ProcessPlugins(int n) {}
+> 
+> #define GlobalFreePtr(p) free((void *)(p))
+> 
+> #define strnicmp(a,b,c)		strncasecmp(a,b,c)
+> #define wsprintf			sprintf
+> 
+> #ifndef FALSE
+> #define FALSE	false
+> #endif
+> 
+> #ifndef TRUE
+> #define TRUE	true
+> #endif
+> 
+52d119
+< 
diff --git a/media-plugins/modplugxmms/modplugxmms-2.04.ebuild b/media-plugins/modplugxmms/modplugxmms-2.04.ebuild
index d45270e103d4..0fc056e071f4 100644
--- a/media-plugins/modplugxmms/modplugxmms-2.04.ebuild
+++ b/media-plugins/modplugxmms/modplugxmms-2.04.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/modplugxmms/modplugxmms-2.04.ebuild,v 1.2 2003/07/12 18:40:40 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/modplugxmms/modplugxmms-2.04.ebuild,v 1.3 2004/02/25 17:41:18 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="XMMS plugin for MOD-like music files"
@@ -9,14 +9,16 @@ HOMEPAGE="http://modplug-xmms.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 
 DEPEND=">=media-sound/xmms-1.2.5-r1"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	unpack ${A} ; cd ${S}
 	epatch ${FILESDIR}/${P}.patch
+
+	cd ${S}/libmodplug
+	epatch ${FILESDIR}/${P}-amd64.patch
 }
 
 src_compile() {