summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-sound/mpg123/ChangeLog6
-rw-r--r--media-sound/mpg123/files/mpg123-0.59s-r6-ppc64.patch12
-rw-r--r--media-sound/mpg123/mpg123-0.59s-r6.ebuild12
3 files changed, 27 insertions, 3 deletions
diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index 34e053eb8ade..f52f08584fb4 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.68 2004/10/30 23:31:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.69 2004/11/03 16:40:41 corsair Exp $
+
+ 03 Nov 2004; Markus Rothe <corsair@gentoo.org>
+ +files/mpg123-0.59s-r6-ppc64.patch, mpg123-0.59s-r6.ebuild:
+ Added ppc64 specific patch
30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
-files/0.59s-generic.patch, -files/mpg123-0.59s-CAN-2004-0805.patch,
diff --git a/media-sound/mpg123/files/mpg123-0.59s-r6-ppc64.patch b/media-sound/mpg123/files/mpg123-0.59s-r6-ppc64.patch
new file mode 100644
index 000000000000..8cf9b1e6954d
--- /dev/null
+++ b/media-sound/mpg123/files/mpg123-0.59s-r6-ppc64.patch
@@ -0,0 +1,12 @@
+diff -Nur mpg123.epatched/layer3.c mpg123/layer3.c
+--- mpg123.epatched/layer3.c 2004-11-03 16:18:15.016995488 +0900
++++ mpg123/layer3.c 2004-11-03 16:18:38.618003240 +0900
+@@ -626,7 +626,7 @@
+ int *me;
+
+ int num=getbitoffset(&bsi);
+- long mask;
++ int mask;
+ /* we must split this, because for num==0 the shift is undefined if you do it in one step */
+ mask = ((unsigned long) getbits(&bsi,num))<<BITSHIFT;
+ mask <<= 8-num;
diff --git a/media-sound/mpg123/mpg123-0.59s-r6.ebuild b/media-sound/mpg123/mpg123-0.59s-r6.ebuild
index 6a655c2f8db7..21de60e7cac9 100644
--- a/media-sound/mpg123/mpg123-0.59s-r6.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r6.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-r6.ebuild,v 1.9 2004/10/30 22:17:27 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r6.ebuild,v 1.10 2004/11/03 16:40:41 corsair Exp $
IUSE="mmx 3dnow esd nas oss"
@@ -40,6 +40,8 @@ src_unpack() {
epatch ${PATCHDIR}
sed -i "s:${PV}-mh4:${PVR}:" version.h
+ #fixes bug #69512
+ use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch
}
src_compile() {
@@ -52,7 +54,13 @@ src_compile() {
use oss && styles="${styles} -generic"
case $ARCH in
- ppc*)
+ ppc64)
+ use esd && styles="${styles} -ppc64-esd"
+ use oss && styles="${styles} -ppc64"
+
+ [ -z "${styles}" ] && styles="-ppc64"
+ ;;
+ ppc)
use esd && styles="${styles} -ppc-esd"
use oss && styles="${styles} -ppc"