fix silly makefile and filter evil flags. fixes #20972

5 files changed, 71 insertions, 3 deletions

diff --git a/media-plugins/xmms-musepack/ChangeLog b/media-plugins/xmms-musepack/ChangeLog
index 649a45ac5f94..960a8b3a9643 100644
--- a/media-plugins/xmms-musepack/ChangeLog
+++ b/media-plugins/xmms-musepack/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/xmms-musepack
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/ChangeLog,v 1.1 2003/03/15 09:24:50 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/ChangeLog,v 1.2 2003/06/03 12:03:27 robh Exp $
+
+*xmms-musepack-0.94-r1 (03 Jun 2003)
+
+  03 Jun 2003; robh <robh@gentoo.org> xmms-musepack-0.94-r1.ebuild,
+  files/xmms-musepack-0.94-bad-makefile.patch:
+  fix silly makefile and filter flags which cause weird whining noises.
+  fixes #20972 submitted by Kerin Millar <kerin@recruit2recruit.net>
 
 *xmms-musepack-0.94 (15 Mar 2003)
 
diff --git a/media-plugins/xmms-musepack/Manifest b/media-plugins/xmms-musepack/Manifest
index 54438781cd7a..136908380cbd 100644
--- a/media-plugins/xmms-musepack/Manifest
+++ b/media-plugins/xmms-musepack/Manifest
@@ -1,6 +1,6 @@
 MD5 6497444c45707adc926fdc89246bea9c xmms-musepack-0.94.ebuild 778
-MD5 abbd57294f01dc37d47dfba133704c77 ChangeLog 679
-MD5 25ef24f4a0827dd56097fbf79212e874 xmms-musepack-0.94-r1.ebuild 1195
+MD5 4eb40475215aaf439b801c073a5d3b7a ChangeLog 680
+MD5 d8c447bcfa21155556ec090fe2048cde xmms-musepack-0.94-r1.ebuild 1199
 MD5 a9df10edf2898414b6f2958643b63477 files/digest-xmms-musepack-0.94 70
 MD5 a9df10edf2898414b6f2958643b63477 files/digest-xmms-musepack-0.94-r1 70
 MD5 ed030d04fa02f984be113732ad39b061 files/xmms-musepack-0.94-bad-makefile.patch 956
diff --git a/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.94-r1 b/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.94-r1
new file mode 100644
index 000000000000..2521f84584f8
--- /dev/null
+++ b/media-plugins/xmms-musepack/files/digest-xmms-musepack-0.94-r1
@@ -0,0 +1 @@
+MD5 32fe1e12fedb6590b3146222df836ffa xmms-musepack-0.94.tar.bz2 56999
diff --git a/media-plugins/xmms-musepack/files/xmms-musepack-0.94-bad-makefile.patch b/media-plugins/xmms-musepack/files/xmms-musepack-0.94-bad-makefile.patch
new file mode 100644
index 000000000000..443bbdfb7ec3
--- /dev/null
+++ b/media-plugins/xmms-musepack/files/xmms-musepack-0.94-bad-makefile.patch
@@ -0,0 +1,22 @@
+--- Makefile.old	2003-05-13 21:46:42.000000000 +0000
++++ Makefile	2003-05-13 21:53:40.000000000 +0000
+@@ -1,10 +1,5 @@
+ VERSION = 0.94
+ 
+-ifdef ARCH
+-else
+-ARCH=-march=athlon -mcpu=athlon
+-endif
+-
+ SOURCE = in_mpc.c bitstream.c huff_new.c huff_old.c requant.c synth_filter.c mpc_dec.c
+ 
+ all:    xmms-musepack-$(VERSION).so
+@@ -19,7 +14,7 @@
+ 	`xmms-config --input-plugin-dir`/xmms-musepack-`echo $(VERSION)`.so
+ 
+ xmms-musepack-$(VERSION).so: $(SOURCE) Makefile
+-	gcc -s -DVERSION=\"$(VERSION)\" $(ARCH) -Wall -pedantic -shared -O3 $(ARCH) --fast-math -DPOSIX -D_REENTRANT -DREENTRANT `xmms-config --cflags --libs` `gtk-config --cflags --libs` -o xmms-musepack-`echo $(VERSION)`.so $(SOURCE)
++	gcc -s -DVERSION=\"$(VERSION)\" $(ARCH) -Wall -pedantic -shared -DPOSIX -D_REENTRANT -DREENTRANT `xmms-config --cflags --libs` `gtk-config --cflags --libs` -o xmms-musepack-`echo $(VERSION)`.so $(SOURCE)
+ 
+ clean:
+ 	rm -f *.o xmms-musepack-`echo $(VERSION)`.so
diff --git a/media-plugins/xmms-musepack/xmms-musepack-0.94-r1.ebuild b/media-plugins/xmms-musepack/xmms-musepack-0.94-r1.ebuild
new file mode 100644
index 000000000000..e5039e0b7350
--- /dev/null
+++ b/media-plugins/xmms-musepack/xmms-musepack-0.94-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-0.94-r1.ebuild,v 1.1 2003/06/03 12:03:27 robh Exp $
+
+DESCRIPTION="This plugin for XMMS can play audio files which are encoded with Andree Buschmann's encoder Musepack. These files have the filename postfixes mpc, mp+ or mpp."
+HOMEPAGE="http://sourceforge.net/projects/mpegplus/"
+SRC_URI="mirror://sourceforge/mpegplus/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND=">=media-sound/xmms-1.2.7-r15"
+
+inherit flag-o-matic eutils
+
+# Enabling -mfpath=sse can cause high-pitched whine, at least on Pentiums.
+# This drops the entire flag for safety. Reports of success with any variations
+# would be welcomed, but mind those eardrums!
+filter-flags "-mfpmath=sse -mfpmath=387 -mfpmath=sse,387"
+
+src_unpack() {
+	unpack ${A}
+	# Fix up the atrocious Makefile.
+        cd ${S}; epatch ${FILESDIR}/${P}-bad-makefile.patch
+}
+
+src_compile() {
+	# Makefile will use ARCH when calling gcc.
+	ARCH="${CFLAGS}"
+	emake || die
+}
+
+src_install() {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe ${P}.so
+}