amd64 patch was removed and broke things from _stable_ package

3 files changed, 122 insertions, 5 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index 1bfa6bf5e2e9..800b4efd8ade 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.18 2003/09/30 07:42:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.19 2003/10/06 04:08:50 brad_mssw Exp $
+
+  06 Oct 2003; Brad House <brad_mssw@gentoo.org>
+  files/mpg123-0.59r-amd64.diff:
+  removal of amd64 patch broke mpg123 on amd64. apparently whatever was done to
+  put it in a package on the server, this patch wasn't part of that and should
+  not have been removed.
 
 *mpg123-0.59s-r1 (30 Sep 2003)
 
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 4c164f2b023f..964ebe04bd06 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,10 +1,11 @@
-MD5 cc8d7321715fb2e1e560aecb8de450bd ChangeLog 3519
+MD5 e6b06d9e9af2cbc34fb751612e0d558d ChangeLog 3788
 MD5 f7a5849c9d0381f667738a7ad2820c2b mpg123-0.59r-r2.ebuild 1667
-MD5 1d1cc84eaf4ddf4b149ccfd871dc2640 mpg123-0.59s.ebuild 1331
 MD5 5477014ccf0663352d7ce01f5dfd12a5 mpg123-0.59r-r3.ebuild 1535
 MD5 84e3bd19ae864b24b67692e4c4fe4b88 mpg123-0.59s-r1.ebuild 1423
-MD5 a80297615f6515bb5631c177511c989a files/mpg123-0.59s-security.diff 1075
+MD5 1d1cc84eaf4ddf4b149ccfd871dc2640 mpg123-0.59s.ebuild 1331
 MD5 8936a4142ebda9826bda6818a51e1524 files/digest-mpg123-0.59r-r2 64
-MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s 67
 MD5 1d1f7b49b09cb2394ef7a7dd893b1fea files/digest-mpg123-0.59r-r3 134
+MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s 67
 MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r1 67
+MD5 a80297615f6515bb5631c177511c989a files/mpg123-0.59s-security.diff 1075
+MD5 efa64a45cc5ceed3325967030d014e3b files/mpg123-0.59r-amd64.diff 3512
diff --git a/media-sound/mpg123/files/mpg123-0.59r-amd64.diff b/media-sound/mpg123/files/mpg123-0.59r-amd64.diff
new file mode 100644
index 000000000000..4f557c8036e4
--- /dev/null
+++ b/media-sound/mpg123/files/mpg123-0.59r-amd64.diff
@@ -0,0 +1,110 @@
+--- Makefile.orig	2003-07-15 00:17:35.000000000 -0400
++++ Makefile	2003-07-15 00:19:58.000000000 -0400
+@@ -192,6 +192,29 @@
+ 			$(RPM_OPT_FLAGS)' \
+ 		mpg123-make
+ 
++linux-x86_64:
++	$(MAKE) LDFLAGS= \
++		OBJECTS='decode.o dct64.o audio_oss.o' \
++		CFLAGS='-O2 -Wall -DLINUX -DOSS -DUSE_MMAP \
++			$(RPM_OPT_FLAGS)' \
++		mpg123-make
++
++linux-x86_64-esd:
++	$(MAKE) LDFLAGS= \
++		AUDIO_LIB='-lesd -laudiofile' \
++		OBJECTS='decode.o dct64.o audio_esd.o' \
++		CFLAGS='-O2 -Wall -DLINUX -DOSS -DUSE_MMAP \
++			$(RPM_OPT_FLAGS)' \
++		mpg123-make
++
++linux-x86_64-alsa:
++	$(MAKE) LDFLAGS= \
++		AUDIO_LIB='-lasound' \
++		OBJECTS='decode.o dct64.o audio_alsa.o' \
++		CFLAGS='-O2 -Wall -DLINUX -DOSS -DUSE_MMAP \
++			$(RPM_OPT_FLAGS)' \
++		mpg123-make
++
+ #linux-ppc:
+ #	$(MAKE)   LDFLAGS= \
+ #		OBJECTS='decode.o dct64.o audio_oss.o' \
+diff -urN mpg123-0.59r/getlopt.c mpg123-0.59r.alpha/getlopt.c
+--- getlopt.c	1998-12-08 04:41:11.000000000 -0500
++++ mpg123-0.59r.alpha/getlopt.c	2002-11-22 17:52:59.000000000 -0500
+@@ -48,7 +48,7 @@
+ 			if (opt->flags & 2) /* var is *char */
+ 				*((char *) opt->var) = (char) opt->value;
+ 			else
+-				*((long *) opt->var) = opt->value;
++				*((int *) opt->var) = opt->value;
+ 		}
+ 		else
+ 			result = opt->value ? opt->value : opt->sname;
+@@ -62,7 +62,7 @@
+ 			if (opt->flags & 2) /* var is *char */
+ 				*((char **) opt->var) = strdup(loptarg);
+ 			else
+-				*((long *) opt->var) = atoi(loptarg);
++				*((int *) opt->var) = atoi(loptarg);
+ 		}
+ 		else
+ 			result = opt->value ? opt->value : opt->sname;
+diff -urN mpg123-0.59r/layer3.c mpg123-0.59r.alpha/layer3.c
+--- layer3.c	1999-04-21 11:25:18.000000000 -0400
++++ mpg123-0.59r.alpha/layer3.c	2002-11-22 17:52:59.000000000 -0500
+@@ -608,7 +608,7 @@
+  * Dequantize samples (includes huffman decoding)
+  */
+ /* 24 is enough because tab13 has max. a 19 bit huffvector */
+-#define BITSHIFT ((sizeof(long)-1)*8)
++#define BITSHIFT ((sizeof(int)-1)*8)
+ #define REFRESH_MASK \
+   while(num < BITSHIFT) { \
+     mask |= getbyte()<<(BITSHIFT-num); \
+@@ -625,7 +625,7 @@
+   int *me;
+ 
+   int num=getbitoffset();
+-  long mask = (long) getbits(num)<<(BITSHIFT+8-num);
++  int mask = (int) getbits(num)<<(BITSHIFT+8-num);
+   part2remain -= num;
+ 
+   {
+@@ -709,7 +709,7 @@
+         if(x == 15 && h->linbits) {
+           max[lwin] = cb;
+           REFRESH_MASK;
+-          x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
++          x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
+           num -= h->linbits+1;
+           mask <<= h->linbits;
+           if(mask < 0)
+@@ -733,7 +733,7 @@
+         if(y == 15 && h->linbits) {
+           max[lwin] = cb;
+           REFRESH_MASK;
+-          y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
++          y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
+           num -= h->linbits+1;
+           mask <<= h->linbits;
+           if(mask < 0)
+@@ -883,7 +883,7 @@
+         if (x == 15 && h->linbits) {
+           max = cb;
+ 	  REFRESH_MASK;
+-          x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
++          x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
+           num -= h->linbits+1;
+           mask <<= h->linbits;
+           if(mask < 0)
+@@ -907,7 +907,7 @@
+         if (y == 15 && h->linbits) {
+           max = cb;
+ 	  REFRESH_MASK;
+-          y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
++          y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
+           num -= h->linbits+1;
+           mask <<= h->linbits;
+           if(mask < 0)