Version bump closes bug #72486.

5 files changed, 107 insertions, 43 deletions

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index e6d14d351a72..88bf90285785 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.9 2004/09/14 07:58:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.10 2004/11/26 23:03:24 eradicator Exp $
+
+*musepack-tools-1.15s (26 Nov 2004)
+
+  26 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/musepack-tools-1.15r-Makefile.patch,
+  +files/musepack-tools-1.15s-Makefile.patch, +musepack-tools-1.15s.ebuild:
+  Version bump closes bug #72486.
 
   14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -musepack-tools-1.15r.ebuild, -musepack-tools-1.15r-r1.ebuild,
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index e6058c818595..b425355ef6b9 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,6 +1,18 @@
-MD5 431c39e0094e845bae92659d79722b25 ChangeLog 1626
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5433f0ef1d7bade38754ae9f1b14d6e0 ChangeLog 1878
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 fd2147daafd30e321b336c1200160930 musepack-tools-1.15s.ebuild 1831
 MD5 582859ba29730bd84422391062b5929b musepack-tools-1.15r-r2.ebuild 1747
-MD5 1455d6a964f7627af39de693f68a6069 files/musepack-tools-1.15r-Makefile.patch 3459
+MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s 68
+MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893
 MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
 MD5 da322e6de9051b732f4d858efb9656e5 files/digest-musepack-tools-1.15r-r2 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBp7aKArHZZzCEUG0RAjLpAJoDrvdp5WIlyHn0z/jxmwy1kq4OigCeP4kD
+NWBIuPUBFEK7oakS0xzUV4M=
+=TJcs
+-----END PGP SIGNATURE-----
diff --git a/media-sound/musepack-tools/files/digest-musepack-tools-1.15s b/media-sound/musepack-tools/files/digest-musepack-tools-1.15s
new file mode 100644
index 000000000000..8fd08627a75f
--- /dev/null
+++ b/media-sound/musepack-tools/files/digest-musepack-tools-1.15s
@@ -0,0 +1 @@
+MD5 7b2aa799490a306efbd6642c2623a793 mpcsv7-src-1.15s.tar.gz 501116
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15r-Makefile.patch b/media-sound/musepack-tools/files/musepack-tools-1.15s-Makefile.patch
index eebd5b596cbd..76799512c368 100644
--- a/media-sound/musepack-tools/files/musepack-tools-1.15r-Makefile.patch
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15s-Makefile.patch
@@ -1,15 +1,5 @@
-diff -ru sv7/Makefile sv7_nu/Makefile
---- sv7/Makefile	2004-03-18 00:17:54.000000000 +0200
-+++ sv7_nu/Makefile	2004-04-16 20:41:00.842641680 +0300
-@@ -12,7 +12,7 @@
- 
- # Select the compiler. Normally gcc is used.
- 
--CC       = cc   -pipe -L/lib
-+CC       = gcc   -pipe -L/lib
- CC3      = gcc3 -pipe -L/lib
- 
- 
+--- Makefile.orig	2004-06-18 23:27:10.227221536 +0300
++++ Makefile	2004-06-18 23:29:28.279234440 +0300
 @@ -20,8 +20,7 @@
  # If unset Intel 386 with optimization for Pentium is selected.
  
@@ -38,24 +28,6 @@ diff -ru sv7/Makefile sv7_nu/Makefile
  	-Wall                   \
  	-pedantic               \
  	-W                      \
-@@ -143,7 +142,7 @@
- 	-fstrength-reduce       \
- 	-fexpensive-optimizations \
- 	-funroll-all-loops -fmove-all-movables -fstrength-reduce \
--	-mpreferred-stack-boundary=2 -malign-jumps=5 -malign-loops=0 -malign-functions=5
-+	-mpreferred-stack-boundary=2 -falign-jumps=5 -falign-loops=0 -falign-functions=5
- 
- # -fcse-follow-jumps \
- 
-@@ -156,7 +155,7 @@
- 	-frerun-loop-opt        \
- 	-fstrength-reduce       \
- 	-fmove-all-movables -fstrength-reduce -fcse-follow-jumps \
--	-mpreferred-stack-boundary=2 -malign-jumps=5 -malign-loops=0 -malign-functions=5
-+	-mpreferred-stack-boundary=2 -falign-jumps=5 -falign-loops=0 -falign-functions=5
- 
- # Options to generate Assembly code for inspecting
- 
 @@ -189,7 +188,7 @@
  
  # Merge all options together for CFLAGS and CFLAG_SIZE
@@ -71,12 +43,13 @@ diff -ru sv7/Makefile sv7_nu/Makefile
  $(MPPDEC_TARGET): $(MPPDEC_OBJ)
 +ifndef BLDSTATIC
  	$(CC)         $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)        $(LDADD)
- 	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
+-	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
 -	$(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)-static $(LDADD)
 -	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)-static
++#	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
 +else
 +	$(CC) -static $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET) $(LDADD)
-+	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
++#	-$(STRIP)     $(STRIPOPT)                $(MPPDEC_TARGET)
 +endif
  
  
@@ -87,22 +60,29 @@ diff -ru sv7/Makefile sv7_nu/Makefile
  $(MPPENC_TARGET): $(MPPENC_OBJ)
 +ifndef BLDSTATIC
  	$(CC)         $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET)        $(LDADD)
- 	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)
+-	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)
 -	$(CC) -static $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET)-static $(LDADD)
 -	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)-static
++#	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)
 +else
 +	$(CC) -static $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET) $(LDADD)
-+	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)
++#	-$(STRIP)     $(STRIPOPT)                $(MPPENC_TARGET)
 +endif
  
  
  $(MPPDEC_TARGET)-profiling: $(MPPDEC_OBJ)
-@@ -344,7 +349,7 @@
- 	-$(STRIP)     $(STRIPOPT)           $(TAGGER_TARGET)
+@@ -336,12 +341,12 @@
+ 
+ $(REPLAY_TARGET): $(REPLAY_OBJ) mpp.h config.c
+ 	$(CC) $(CFLAGS) $(REPLAY_OBJ) -o $(REPLAY_TARGET)      $(LDADD)
+-	-$(STRIP)     $(STRIPOPT)           $(REPLAY_TARGET)
++#	-$(STRIP)     $(STRIPOPT)           $(REPLAY_TARGET)
+ 
  
+ $(TAGGER_TARGET):
+ 	$(CC) -DMPP_DECODER $(CFLAGS) -o $(TAGGER_TARGET) $(TAGGER_TARGET).c
+-	-$(STRIP)     $(STRIPOPT)           $(TAGGER_TARGET)
++#	-$(STRIP)     $(STRIPOPT)           $(TAGGER_TARGET)
  
--$(CLIPSTAT_TARGET):
-+$(CLIPSTAT_TARGET): $(CLIPSTAT_OBJ)
- 	$(CC)         $(CFLAGS) $(CLIPSTAT_OBJ) -o $(CLIPSTAT_TARGET)  $(LDADD)
- 	-$(STRIP)     $(STRIPOPT)           $(CLIPSTAT_TARGET)
  
+ $(CLIPSTAT_TARGET):
diff --git a/media-sound/musepack-tools/musepack-tools-1.15s.ebuild b/media-sound/musepack-tools/musepack-tools-1.15s.ebuild
new file mode 100644
index 000000000000..9c8df4288af9
--- /dev/null
+++ b/media-sound/musepack-tools/musepack-tools-1.15s.ebuild
@@ -0,0 +1,64 @@
+# 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.15s.ebuild,v 1.1 2004/11/26 23:03:24 eradicator Exp $
+
+IUSE="static esd oss"
+
+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/ http://www.musepack.net"
+SRC_URI="http://www.saunalahti.fi/grimmel/musepack.net/source/mpcsv7-src-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+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 must 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}-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
+
+	sed -i 's/#define USE_IRIX_AUDIO/#undef USE_IRIX_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
+
+	if ! ( use x86 || use amd64 ); then
+		sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h
+	fi
+}
+
+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*
+}