summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-04-13 05:52:25 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-04-13 05:52:25 +0000
commit3546a4c7b1e833fe527a379e5d3773ceddf68421 (patch)
tree27a4accc58181249abb3bcf70a7beff128cae862 /media-sound/mpg123
parentStable on x86 and sparc. Fixes bug #47665. (diff)
downloadhistorical-3546a4c7b1e833fe527a379e5d3773ceddf68421.tar.gz
historical-3546a4c7b1e833fe527a379e5d3773ceddf68421.tar.bz2
historical-3546a4c7b1e833fe527a379e5d3773ceddf68421.zip
sparc + esd build fix.
Diffstat (limited to 'media-sound/mpg123')
-rw-r--r--media-sound/mpg123/ChangeLog3
-rw-r--r--media-sound/mpg123/Manifest5
-rw-r--r--media-sound/mpg123/files/mpg123-0.59s-Makefile.patch20
-rw-r--r--media-sound/mpg123/mpg123-0.59s-r3.ebuild7
4 files changed, 30 insertions, 5 deletions
diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index d407a40536da..98935711d23c 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,10 +1,11 @@
# ChangeLog for media-sound/mpg123
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.38 2004/04/13 04:56:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.39 2004/04/13 05:52:25 eradicator Exp $
12 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
mpg123-0.59s-r3.ebuild:
Added missing oss to IUSE.
+ sparc + esd build fix.
*mpg123-0.59s-r3 (12 Apr 2004)
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 2c810189d8b6..4d43bd8d7fc5 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,8 +1,9 @@
-MD5 f4a3f3b4db746e64b364d9dbc7cb6b2e mpg123-0.59s-r3.ebuild 3608
+MD5 48016950033b60084449d1c25e76389d mpg123-0.59s-r3.ebuild 3672
MD5 0d35fdd81de50c39850acde35b127e93 mpg123-0.59s-r2.ebuild 1865
-MD5 7d0fb041f8f5b6d1672f48c2060e908c ChangeLog 7183
+MD5 797de0edd33ddaf3417fdea097fd016b ChangeLog 7208
MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
MD5 7d563752464873b664d7d242e9d06bbd files/mpg123-0.59s-amd64.patch 2680
+MD5 e13b4b63db19012d93d4830423f5076b files/mpg123-0.59s-Makefile.patch 677
MD5 7c93b2634ad65c23562f86f6e0b051e2 files/0.59s-generic.patch 532
MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r2 67
MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r3 67
diff --git a/media-sound/mpg123/files/mpg123-0.59s-Makefile.patch b/media-sound/mpg123/files/mpg123-0.59s-Makefile.patch
new file mode 100644
index 000000000000..0dc6fd57a0d6
--- /dev/null
+++ b/media-sound/mpg123/files/mpg123-0.59s-Makefile.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig 2004-04-12 22:41:30.819936000 -0700
++++ Makefile 2004-04-12 22:41:51.649936000 -0700
+@@ -402,7 +402,7 @@
+ OBJECTS='decode.o dct64.o audio_esd.o' \
+ CFLAGS='-DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DUSE_ESD -DSPARCLINUX -Wall \
+ -fomit-frame-pointer -funroll-all-loops \
+- -finline-functions -ffast-math \
++ -finline-functions -ffast-math' \
+ mpg123-make
+
+
+@@ -410,7 +410,7 @@
+ $(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
+ CFLAGS='-DLINUX -DOSS -Wall \
+ -fomit-frame-pointer -funroll-all-loops \
+- -finline-functions -ffast-math \
++ -finline-functions -ffast-math' \
+ -Wall -O6 -DUSE_MMAP \
+ mpg123-make
+
diff --git a/media-sound/mpg123/mpg123-0.59s-r3.ebuild b/media-sound/mpg123/mpg123-0.59s-r3.ebuild
index 294d3f5a5a81..4d4bb79ee226 100644
--- a/media-sound/mpg123/mpg123-0.59s-r3.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r3.ebuild,v 1.2 2004/04/13 04:56:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r3.ebuild,v 1.3 2004/04/13 05:52:25 eradicator Exp $
inherit eutils
@@ -42,7 +42,10 @@ 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}/mpg123-0.59s-amd64.patch
+ epatch ${FILESDIR}/${P}-amd64.patch
+
+ # Fix Makefile missing quotes
+ epatch ${FILESDIR}/${P}-Makefile.patch
# Don't force gcc since icc/ccc might be possible
sed -i -e "s|CC=gcc||" Makefile