stable on ppc64, bug #64490

4 files changed, 66 insertions, 22 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index c1e4d9977b7d..e46808f98afb 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.53 2004/09/19 03:10:41 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.54 2004/10/19 03:06:39 tgall Exp $
+
+  18 Oct 2004; Tom Gall <tgall@gentoo.org> mpg123-0.59s-r4.ebuild,
+  +files/mpg123-0.59s-ppc64.patch:
+  stable on ppc64, bug 64490
 
   18 Sep 2004; Joshua Kinard <kumba@gentoo.org> mpg123-0.59s-r4.ebuild:
   Marked stable on mips.
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 4b23af75eca1..ad580e4c13af 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,24 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5124d7bf6706d9e63474c888e022dffe ChangeLog 8902
-MD5 829702e07fe83ab34f2508638631c884 mpg123-0.59s-r3.ebuild 3409
+MD5 9ed88107fc101a9e1d50da5d5ef6f952 ChangeLog 9034
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 7e799be8dd937ef75148664c21d96d75 mpg123-0.59s-r2.ebuild 1859
-MD5 e255ccd22cc647189d2f2de7649c6280 mpg123-0.59s-r4.ebuild 3483
+MD5 829702e07fe83ab34f2508638631c884 mpg123-0.59s-r3.ebuild 3409
+MD5 752aab82c466fe5ae4e5b897cf6f02de mpg123-0.59s-r4.ebuild 3570
 MD5 7c93b2634ad65c23562f86f6e0b051e2 files/0.59s-generic.patch 532
-MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r3 67
 MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r2 67
-MD5 7d563752464873b664d7d242e9d06bbd files/mpg123-0.59s-amd64.patch 2680
-MD5 a80297615f6515bb5631c177511c989a files/mpg123-0.59s-security.diff 1075
-MD5 7130077c0324ee5b3cfd58e291976a0e files/mpg123-0.59s-heapfix.diff 337
-MD5 1cb1d88ea5199e7b4ddca1a53f9db530 files/mpg123-0.59s-Makefile.patch 952
+MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r3 67
 MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r4 67
 MD5 fd09acbf52f3f87f5901e8d74a4227b0 files/mpg123-0.59s-CAN-2004-0805.patch 465
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBUlEbHTu7gpaalycRArXtAJ9BsIJnFZZ+C2p+Bn4KM55lnI3vzgCePNFR
-twkinOtGCbAMePp23l6W+ws=
-=/J1M
------END PGP SIGNATURE-----
+MD5 1cb1d88ea5199e7b4ddca1a53f9db530 files/mpg123-0.59s-Makefile.patch 952
+MD5 7d563752464873b664d7d242e9d06bbd files/mpg123-0.59s-amd64.patch 2680
+MD5 7130077c0324ee5b3cfd58e291976a0e files/mpg123-0.59s-heapfix.diff 337
+MD5 a80297615f6515bb5631c177511c989a files/mpg123-0.59s-security.diff 1075
+MD5 d403232cad9d481f51c07e34bcc9b4b6 files/mpg123-0.59s-ppc64.patch 1441
diff --git a/media-sound/mpg123/files/mpg123-0.59s-ppc64.patch b/media-sound/mpg123/files/mpg123-0.59s-ppc64.patch
new file mode 100644
index 000000000000..299e062e83a5
--- /dev/null
+++ b/media-sound/mpg123/files/mpg123-0.59s-ppc64.patch
@@ -0,0 +1,46 @@
+--- Makefile.orig	2004-10-18 21:58:56.743022904 -0500
++++ Makefile	2004-10-18 22:00:08.095092976 -0500
+@@ -327,25 +327,25 @@
+ 			$(RPM_OPT_FLAGS)' \
+ 		mpg123-make
+ 
+-#linux-ppc:
+-#	$(MAKE) CC=gcc  LDFLAGS= \
+-#		OBJECTS='decode.o dct64.o audio_oss.o' \
+-#		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
+-#			-DOSS -DPPC_ENDIAN \
+-#			-fomit-frame-pointer -funroll-all-loops \
+-#			-finline-functions -ffast-math' \
+-#		mpg123-make
+-
+-#linux-ppc-esd:
+-#	$(MAKE) CC=gcc  LDFLAGS= \
+-#		AUDIO_LIB='-lesd -laudiofile' \
+-#		OBJECTS='decode.o dct64.o audio_esd.o' \
+-#		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -O2 -mcpu=ppc \
+-#			-DOSS -DPPC_ENDIAN \
+-#			-fomit-frame-pointer -funroll-all-loops \
+-#			-finline-functions -ffast-math' \
+-#		mpg123-make
++linux-ppc64:
++	$(MAKE) CC=gcc  LDFLAGS= \
++		OBJECTS='decode.o dct64.o audio_oss.o' \
++		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -O2 \
++			-DOSS -DPPC_ENDIAN \
++			-fomit-frame-pointer -funroll-all-loops \
++			-finline-functions -ffast-math' \
++		mpg123-make
+ 
++linux-ppc64-esd:
++	$(MAKE) CC=gcc  LDFLAGS= \
++		AUDIO_LIB='-lesd -laudiofile' \
++		OBJECTS='decode.o dct64.o audio_esd.o' \
++		CFLAGS='$(CFLAGS) -DREAL_IS_FLOAT -DLINUX -Wall -O2 \
++			-DOSS -DPPC_ENDIAN \
++			-fomit-frame-pointer -funroll-all-loops \
++			-finline-functions -ffast-math' \
++		mpg123-make
++ 
+ linux-ppc:
+ 	$(MAKE) CC=gcc  LDFLAGS= \
+ 		OBJECTS='decode.o dct64.o audio_oss.o' \
diff --git a/media-sound/mpg123/mpg123-0.59s-r4.ebuild b/media-sound/mpg123/mpg123-0.59s-r4.ebuild
index 47e65ba2e13c..84047c240d71 100644
--- a/media-sound/mpg123/mpg123-0.59s-r4.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r4.ebuild,v 1.9 2004/09/23 04:29:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r4.ebuild,v 1.10 2004/10/19 03:06:39 tgall Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.mpg123.de/mpg123/${PN}-pre${PV}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ia64 amd64 ppc sparc alpha hppa mips"
+KEYWORDS="x86 ia64 amd64 ppc sparc alpha hppa mips ppc64"
 IUSE="mmx 3dnow esd nas oss"
 
 RDEPEND="virtual/libc
@@ -43,11 +43,14 @@ src_unpack() {
 	# amd64.  It's good to understand the distinction between int and
 	# long: ANSI says that int should be 32-bits, long should be the
 	# native size of the CPU (usually the same as a pointer).
-	epatch ${FILESDIR}/${P}-amd64.patch
+	use ppc64 || epatch ${FILESDIR}/${P}-amd64.patch
 
 	# Fix Makefile missing quotes
 	epatch ${FILESDIR}/${P}-Makefile.patch
 
+	# ppc64 support
+	use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch
+
 	# Don't force gcc since icc/ccc might be possible
 	sed -i -e "s|CC=gcc||" Makefile