filters mfpmath=sse and mfpmath=sse,387, which slow encoding

4 files changed, 85 insertions, 5 deletions

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index f83f2816f031..128bef6e9de5 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/musepack-tools
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.6 2004/07/07 09:49:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.7 2004/09/06 00:27:30 pkdawson Exp $
+
+*musepack-tools-1.15r-r2 05 Sep 2004
+
+  05 Sep 2004; Patrick Dawson <pkdawson@gentoo.org>
+  +musepack-tools-1.15r-r2.ebuild:
+  Added filters for some mfpmath flags. Thanks to <numlock@freesurf.ch>
+  Closes bug #62224.
 
 *musepack-tools-1.15r-r1 (07 Jul 2004)
 
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index d34b6b7e3340..443349b83088 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,8 +1,20 @@
-MD5 f6e9541a21cef246d8526e08b2a4804c ChangeLog 1211
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 8ff513c65abeefc91560c1721dc9c066 musepack-tools-1.15r-r1.ebuild 1698
 MD5 9198f99a0d177ef29405ec279ebde1c6 musepack-tools-1.15r.ebuild 1626
-MD5 da322e6de9051b732f4d858efb9656e5 files/digest-musepack-tools-1.15r 68
+MD5 665a99e9582143227fee0219ba293249 ChangeLog 1428
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 bf43c1ab1667a88c9ebfaf7dc8bd7157 musepack-tools-1.15r-r2.ebuild 1746
+MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
 MD5 1455d6a964f7627af39de693f68a6069 files/musepack-tools-1.15r-Makefile.patch 3459
 MD5 da322e6de9051b732f4d858efb9656e5 files/digest-musepack-tools-1.15r-r1 68
-MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
+MD5 da322e6de9051b732f4d858efb9656e5 files/digest-musepack-tools-1.15r-r2 68
+MD5 da322e6de9051b732f4d858efb9656e5 files/digest-musepack-tools-1.15r 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBO673E67gNkjlZFIRArZPAJ0eR0bDxsgmKev2tkmYAA29E/58kgCfUI4k
+3xPT/u6RBw4R7gqnXEt+X64=
+=rbUN
+-----END PGP SIGNATURE-----
diff --git a/media-sound/musepack-tools/files/digest-musepack-tools-1.15r-r2 b/media-sound/musepack-tools/files/digest-musepack-tools-1.15r-r2
new file mode 100644
index 000000000000..653a8cae944e
--- /dev/null
+++ b/media-sound/musepack-tools/files/digest-musepack-tools-1.15r-r2
@@ -0,0 +1 @@
+MD5 4ebf8573baf5ab176810052c16323b3a mpcsv7-src-1.15r.tar.gz 538420
diff --git a/media-sound/musepack-tools/musepack-tools-1.15r-r2.ebuild b/media-sound/musepack-tools/musepack-tools-1.15r-r2.ebuild
new file mode 100644
index 000000000000..66e60c421c65
--- /dev/null
+++ b/media-sound/musepack-tools/musepack-tools-1.15r-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15r-r2.ebuild,v 1.1 2004/09/06 00:27:30 pkdawson Exp $
+
+inherit eutils flag-o-matic
+
+S="${WORKDIR}/sv7"
+
+DESCRIPTION="Musepack audio compression tools"
+HOMEPAGE="http://www.uni-jena.de/~pfk/mpp/ http://corecodec.org/projects/mpc/"
+
+#-*: nasm is x86/amd64 only
+KEYWORDS="-* ~x86 ~amd64"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+IUSE="static esd oss"
+SRC_URI="http://xmixahlx.dyndns.org/audio/files/linux/musepack/mpcsv7-src-${PV}.tar.gz"
+
+RDEPEND="media-sound/esound
+	 media-libs/id3lib"
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	amd64? ( dev-lang/nasm )"
+
+src_unpack() {
+	if (! use esd && ! use oss); then
+		die "You muse have either oss or esd active in your USE flags for xmms-musepack to work properly."
+	fi
+
+	unpack ${A}
+	cd ${S}
+
+	# Cosmetic changes mainly to allow using of custom CFLAGS
+	epatch ${FILESDIR}/${P}-r1-Makefile.patch
+
+	# Get rid of -mpreferred-stack-boundary=2 as it breaks amd64
+	sed -i 's:-mpreferred-stack-boundary=2::' Makefile
+
+	use oss || sed -i 's/#define USE_OSS_AUDIO/#undef USE_OSS_AUDIO/' mpp.h
+
+	if ! use esd ; then
+		sed -i 's/#define USE_ESD_AUDIO/#undef USE_ESD_AUDIO/' mpp.h
+		sed -i 's/LDADD   += -lesd/#LDADD   += -lesd/' Makefile
+	fi
+
+	use x86 || sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h
+}
+
+src_compile() {
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-mfpmath=sse" "-mfpmath=sse,387"
+	use static && export BLDSTATIC=1
+	emake mppenc mppdec replaygain tagger || die
+}
+
+src_install() {
+	dobin mppenc mppdec replaygain tagger
+	dodoc COPYING* README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
+}