prelink bug fix thanks to 4nykey@nm.ru closes bug #49821. -* because of nasm dep.

5 files changed, 189 insertions, 3 deletions

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index f164bb9a4904..f83f2816f031 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,14 @@
 # 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.5 2004/06/25 00:14:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.6 2004/07/07 09:49:14 eradicator Exp $
+
+*musepack-tools-1.15r-r1 (07 Jul 2004)
+
+  07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/musepack-tools-1.15r-r1-Makefile.patch,
+  +musepack-tools-1.15r-r1.ebuild:
+  prelink bug fix thanks to 4nykey@nm.ru closes bug #49821. -* because of nasm
+  dep.
 
   16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
   musepack-tools-1.15r.ebuild:
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index a9772253fe6f..0418e7df872d 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,5 +1,8 @@
-MD5 9198f99a0d177ef29405ec279ebde1c6 musepack-tools-1.15r.ebuild 1626
 MD5 d9b4fae420b0d1c1b9f6266bfc072960 ChangeLog 941
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 1455d6a964f7627af39de693f68a6069 files/musepack-tools-1.15r-Makefile.patch 3459
+MD5 9198f99a0d177ef29405ec279ebde1c6 musepack-tools-1.15r.ebuild 1626
+MD5 9198f99a0d177ef29405ec279ebde1c6 musepack-tools-1.15r-r1.ebuild 1626
 MD5 da322e6de9051b732f4d858efb9656e5 files/digest-musepack-tools-1.15r 68
+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
diff --git a/media-sound/musepack-tools/files/digest-musepack-tools-1.15r-r1 b/media-sound/musepack-tools/files/digest-musepack-tools-1.15r-r1
new file mode 100644
index 000000000000..653a8cae944e
--- /dev/null
+++ b/media-sound/musepack-tools/files/digest-musepack-tools-1.15r-r1
@@ -0,0 +1 @@
+MD5 4ebf8573baf5ab176810052c16323b3a mpcsv7-src-1.15r.tar.gz 538420
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15r-r1-Makefile.patch b/media-sound/musepack-tools/files/musepack-tools-1.15r-r1-Makefile.patch
new file mode 100644
index 000000000000..2ba44b92d924
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15r-r1-Makefile.patch
@@ -0,0 +1,115 @@
+--- Makefile.orig	2004-06-18 23:27:10.227221536 +0300
++++ Makefile	2004-06-18 23:29:28.279234440 +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
+ 
+ 
+@@ -20,8 +20,7 @@
+ # If unset Intel 386 with optimization for Pentium is selected.
+ 
+ ifdef ARCH
+-else
+-ARCH     = -march=i586 -mcpu=i386
++ARCH     = #-march=i586 -mcpu=i386
+ endif
+ 
+ 
+@@ -80,7 +79,7 @@
+ # Name of libraries you need for linking
+ 
+ LDADD    = -lm
+-LDADD   += -lesd
++LDADD   += `esd-config --libs`
+ #LDADD  += -lossaudio
+ #LDADD  += -lrt
+ #LDADD  += -lsocket -lnsl
+@@ -100,7 +99,7 @@
+ # Warning options, unset if the compiler makes trouble because of unknown
+ # options
+ 
+-WARN  = \
++WARN  = #\
+ 	-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
+ 
+-CFLAGS        = $(ARCH) $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMAKE_$(BITS)BIT -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\"
++CFLAGS       += $(ARCH) $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMAKE_$(BITS)BIT -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\"
+ CFLAGS       += -I$(XINCLDIR) -L$(XLIBDIR)
+ #CFLAGS      += $(ASSEM)
+ CFLAGS_SIZE   = $(CFLAGS) $(OPTIM_SIZE)
+@@ -275,10 +274,13 @@
+ 
+ 
+ $(MPPDEC_TARGET): $(MPPDEC_OBJ)
++ifndef BLDSTATIC
+ 	$(CC)         $(CFLAGS) $(MPPDEC_OBJ) -o $(MPPDEC_TARGET)        $(LDADD)
+-	-$(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)
++endif
+ 
+ 
+ $(MPPDEC_TARGET)16: $(MPPDEC_OBJ)
+@@ -303,10 +305,13 @@
+ 
+ 
+ $(MPPENC_TARGET): $(MPPENC_OBJ)
++ifndef BLDSTATIC
+ 	$(CC)         $(CFLAGS) $(MPPENC_OBJ) -o $(MPPENC_TARGET)        $(LDADD)
+-	-$(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)
++endif
+ 
+ 
+ $(MPPDEC_TARGET)-profiling: $(MPPDEC_OBJ)
+@@ -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):
diff --git a/media-sound/musepack-tools/musepack-tools-1.15r-r1.ebuild b/media-sound/musepack-tools/musepack-tools-1.15r-r1.ebuild
new file mode 100644
index 000000000000..84d9c64cb8ee
--- /dev/null
+++ b/media-sound/musepack-tools/musepack-tools-1.15r-r1.ebuild
@@ -0,0 +1,59 @@
+# 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-r1.ebuild,v 1.1 2004/07/07 09:49:14 eradicator 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}/${PF}-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"
+	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*
+}