diff options
| author |   Tom Gall <tgall@gentoo.org> | 2004-10-19 03:06:39 +0000 |
|---|---|---|
| committer | Tom Gall <tgall@gentoo.org> | 2004-10-19 03:06:39 +0000 |
| commit | 03549da41e49750689f025ff7a439d3f85ba4bc5 (patch) | |
| tree | 3982608a350bc8e3931f8f9a373d9a86ea103c12 /media-sound/mpg123 | |
| parent | stable on ppc64 (Manifest recommit) (diff) | |
| download | gentoo-2-03549da41e49750689f025ff7a439d3f85ba4bc5.tar.gz gentoo-2-03549da41e49750689f025ff7a439d3f85ba4bc5.tar.bz2 gentoo-2-03549da41e49750689f025ff7a439d3f85ba4bc5.zip | |
stable on ppc64, bug #64490
Diffstat (limited to 'media-sound/mpg123')
| -rw-r--r-- | media-sound/mpg123/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/mpg123/files/mpg123-0.59s-ppc64.patch | 46 | ||||
| -rw-r--r-- | media-sound/mpg123/mpg123-0.59s-r4.ebuild | 9 |
3 files changed, 57 insertions, 4 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/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 |