-sparc, version bump.

5 files changed, 108 insertions, 6 deletions

diff --git a/media-plugins/xmms-musepack/ChangeLog b/media-plugins/xmms-musepack/ChangeLog
index f338c2260397..819c8a3a9247 100644
--- a/media-plugins/xmms-musepack/ChangeLog
+++ b/media-plugins/xmms-musepack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/xmms-musepack
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/ChangeLog,v 1.17 2004/06/24 23:43:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/ChangeLog,v 1.18 2004/07/07 00:24:45 eradicator Exp $
+
+*xmms-musepack-1.00 (06 Jul 2004)
+
+  06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +xmms-musepack-1.00.ebuild:
+  -sparc, version bump.
 
   14 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xmms-musepack-0.99.ebuild:
diff --git a/media-plugins/xmms-musepack/Manifest b/media-plugins/xmms-musepack/Manifest
index 537663113a17..85e75f3b668a 100644
--- a/media-plugins/xmms-musepack/Manifest
+++ b/media-plugins/xmms-musepack/Manifest
@@ -1,9 +1,12 @@
-MD5 a02ba4392ce3f286cb4a696fbed734e0 xmms-musepack-0.99.ebuild 1609
-MD5 d673272e5de86a0af98cb1cd2ce6e5ff xmms-musepack-0.98-r2.ebuild 1675
-MD5 843422857f39f7269595a649083b9003 ChangeLog 3386
+MD5 27e276b283019f86c77696bb60ffc31f ChangeLog 3535
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 d673272e5de86a0af98cb1cd2ce6e5ff xmms-musepack-0.98-r2.ebuild 1675
+MD5 a02ba4392ce3f286cb4a696fbed734e0 xmms-musepack-0.99.ebuild 1609
+MD5 be4d5b9461f99dd32e5ae33df83369e0 xmms-musepack-1.00.ebuild 1588
+MD5 eb1357b5fbaa2b86c3267d732568201d files/digest-xmms-musepack-0.98-r2 58
 MD5 8432487239eef2afaf83861bc698f68b files/digest-xmms-musepack-0.99 71
 MD5 e4ac40cdcd84c7fa35957450457407ce files/xmms-musepack-0.98-bad-makefile.patch 2005
-MD5 eb1357b5fbaa2b86c3267d732568201d files/digest-xmms-musepack-0.98-r2 58
-MD5 4ae2eb59b8a6af5faa84ec00fa3b6118 files/xmms-musepack-0.99-bad-makefile.patch 1681
 MD5 db7221c06a0b86abf3ea066cc66a3b52 files/xmms-musepack-0.98-titles.patch 8955
+MD5 4ae2eb59b8a6af5faa84ec00fa3b6118 files/xmms-musepack-0.99-bad-makefile.patch 1681
+MD5 4e97b5144a2c0a49cb7e1ef0ef9e33c3 files/digest-xmms-musepack-1.00 70
+MD5 9fd390603c336d139e7a8a2ec1ffb183 files/xmms-musepack-1.00-bad-makefile.patch 1796
diff --git a/media-plugins/xmms-musepack/files/digest-xmms-musepack-1.00 b/media-plugins/xmms-musepack/files/digest-xmms-musepack-1.00
new file mode 100644
index 000000000000..c141e79f2ae3
--- /dev/null
+++ b/media-plugins/xmms-musepack/files/digest-xmms-musepack-1.00
@@ -0,0 +1 @@
+MD5 086faea9707911b90dde6291176e9a08 xmms-musepack-1.00.tar.gz 126468
diff --git a/media-plugins/xmms-musepack/files/xmms-musepack-1.00-bad-makefile.patch b/media-plugins/xmms-musepack/files/xmms-musepack-1.00-bad-makefile.patch
new file mode 100644
index 000000000000..7022260551fc
--- /dev/null
+++ b/media-plugins/xmms-musepack/files/xmms-musepack-1.00-bad-makefile.patch
@@ -0,0 +1,41 @@
+diff -Naur xmms-musepack-1.00.orig/Makefile xmms-musepack-1.00/Makefile
+--- xmms-musepack-1.00.orig/Makefile	2004-06-25 04:24:47.000000000 -0700
++++ xmms-musepack-1.00/Makefile	2004-07-06 16:59:19.598800902 -0700
+@@ -1,6 +1,6 @@
+ CC      = gcc
+ VERSION = 1.00
+-OPTIONS = -Wall -shared -O3 -march=pentium --fast-math -DPOSIX -D_REENTRANT -DREENTRANT -I.. -DMPP_ENCODER
++OPTIONS = -Wall -shared $(CFLAGS) -fPIC -DPIC -DPOSIX -D_REENTRANT -DREENTRANT -I.. -DMPP_ENCODER
+ 
+ 
+ SOURCE  = in_mpc.c bitstream.c huffsv46.c huffsv7.c requant.c synth_filter.c mpc_dec.c equalizer.c equal.c tags.c
+@@ -12,22 +12,22 @@
+ 
+ 
+ install-test:   all
+-	ln -f -s `pwd`/xmms-musepack-`echo $(VERSION)`.so \
+-	~/.xmms/Plugins/xmms-musepack-`echo $(VERSION)`.so
++	ln -f -s `pwd`/xmms-musepack-$(VERSION).so \
++	~/.xmms/Plugins/xmms-musepack-$(VERSION).so
+ 
+ install:        all
+ 	install -g root -o root -m 755 \
+-	  ./xmms-musepack-`echo $(VERSION)`.so \
+-	  `xmms-config --input-plugin-dir`/xmms-musepack-`echo $(VERSION)`.so
++	  ./xmms-musepack-$(VERSION).so \
++	  `xmms-config --input-plugin-dir`/xmms-musepack-$(VERSION).so
+ 
+ xmms-musepack-$(VERSION).so: $(SOURCE) $(HEADER) $(EQUAL) Makefile
+ 	@echo
+ 	@echo
+-	$(CC) -s -DVERSION=\"$(VERSION)\" $(OPTIONS) `xmms-config --cflags --libs` `gtk-config --cflags --libs` -o xmms-musepack-`echo $(VERSION)`.so $(SOURCE) 2>&1 | grep -v '/usr/'
++	$(CC) -s -DVERSION=\"$(VERSION)\" $(OPTIONS) `xmms-config --cflags --libs` `gtk-config --cflags --libs` -o xmms-musepack-$(VERSION).so $(SOURCE) 2>&1 | grep -v '/usr/'
+ 
+ 
+ clean:
+-	rm -f *.o xmms-musepack-`echo $(VERSION)`.so
++	rm -f *.o xmms-musepack-$(VERSION).so
+ 
+ uninstall:
+-	rm -f `xmms-config --input-plugin-dir`/xmms-musepack-`echo $(VERSION)`.so
++	rm -f `xmms-config --input-plugin-dir`/xmms-musepack-$(VERSION).so
diff --git a/media-plugins/xmms-musepack/xmms-musepack-1.00.ebuild b/media-plugins/xmms-musepack/xmms-musepack-1.00.ebuild
new file mode 100644
index 000000000000..9a41f1998103
--- /dev/null
+++ b/media-plugins/xmms-musepack/xmms-musepack-1.00.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-musepack/xmms-musepack-1.00.ebuild,v 1.1 2004/07/07 00:24:45 eradicator Exp $
+
+inherit eutils
+
+DESCRIPTION="XMMS plugin to play audio files encoded with Andree Buschmann's encoder Musepack (mpc, mp+, mpp)"
+HOMEPAGE="http://sourceforge.net/projects/mpegplus"
+SRC_URI="mirror://sourceforge/mpegplus/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-sparc: 1.00: error window about not being able to decode the file
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+DEPEND="media-sound/xmms"
+
+DOCS="ChangeLog README_mpc-plugin_english.txt README_mpc-plugin_finnish.txt README_mpc-plugin_german.txt README_mpc-plugin_korean.txt README_mpc-plugin_spanish.txt"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Fix up the atrocious Makefile.
+	epatch ${FILESDIR}/${P}-bad-makefile.patch
+
+#	Not needed for the plugin:
+#	if (! use esd && ! use oss); then
+#		eerror "You muse have either oss or esd active in your USE flags for xmms-musepack to work properly
+#	fi
+#
+#	use esd || sed -i 's:#define USE_ESD_AUDIO:#undef USE_ESD_AUDIO:' mpp.h
+#	use oss || sed -i 's:#define USE_OSS_AUDIO:#undef USE_OSS_AUDIO:' mpp.h
+
+	# Actually, it looks for esd.h which is stupid because this is an input plugin.
+	# See bug #40970
+	sed -i -e 's:#define USE_ESD_AUDIO:#undef USE_ESD_AUDIO:' \
+	       -e 's:#define USE_OSS_AUDIO:#undef USE_OSS_AUDIO:' mpp.h
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe ${P}.so
+	dodoc ${DOCS}
+}