Patch by Samuli Suominen <ssuominen@gentoo.org> changes Musepack dependency to a SV7-only transition library. Mark 2.1 version stable on AMD64.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 184 insertions, 17 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 6af6acf208a7..9cbf18ab2e86 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.126 2009/07/22 16:04:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.127 2009/07/26 20:56:25 chainsaw Exp $
+
+*audacious-plugins-2.1-r1 (26 Jul 2009)
+
+  26 Jul 2009; <chainsaw@gentoo.org> +files/2.1-libmpcdecsv7.patch,
+  audacious-plugins-2.1.ebuild, -files/2.1_alpha1-timidity-conf-path.patch,
+  +audacious-plugins-2.1-r1.ebuild:
+  Patch by Samuli Suominen <ssuominen@gentoo.org> changes Musepack
+  dependency to a SV7-only transition library. Mark 2.1 version stable on
+  AMD64.
 
   22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   audacious-plugins-2.0.1.ebuild, audacious-plugins-2.1_beta1.ebuild,
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index a0da12f0fec5..dc8ba9854f15 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,14 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.5.1-libmtp-0.3.0-API.patch 1936 RMD160 5a02b522df61e0dc32db13ab18d825ad1289b03f SHA1 1bfe2256f7f30703b39c98e9a3d815d89f22e9f2 SHA256 9e4154cfd8ae19a9525e7c5429ade2f5f049cc263fcb421ebc1ed208baf8d619
 AUX 1.5.1-missing-include.patch 376 RMD160 ae09acafa32c52696d4d8cec79636cfa17eee87e SHA1 fee2cdfeecac269c5ae6c32bf1eaff14de281c13 SHA256 fc91c4cf6b8d70d8a81e5744abdd3c19b6eaf6f76332a6b782e2ecb62389ea59
 AUX 2.0.1-icecast-flawed-vorbis-enum.patch 578 RMD160 297eefc31bb4435a8d19136233aeaeb78d25343a SHA1 b928760a5d9edc56e77a65935cf5bca524b816b9 SHA256 7b9164e054c7e284930ae1ae7bd9a9c1e7d6254af9d35a58fbe8a0965b4d203a
-AUX 2.1_alpha1-timidity-conf-path.patch 572 RMD160 a0abe4590ecfb19a74b70ca34a1d31f8088c1b0e SHA1 c8add51f34455a06e6676f0e171cddea8a767da0 SHA256 e7caeb0ae9820f1e3babaf35355269a3b522e08940d00e4d974321e48f23c03c
+AUX 2.1-libmpcdecsv7.patch 1549 RMD160 3ff62a034d28b35c08c4e90f859065400258bc21 SHA1 d919d4a34868cc0b097281f71a20315a663a0c56 SHA256 1cb0933640889a010e46b2672d34d9ca3ff218dcea35c508191c9a55cfeab1bc
 DIST audacious-plugins-1.5.1.tgz 2944448 RMD160 4b9fc29ccf61d1a503f10f060cbdee8b148f28b8 SHA1 630c936027c66649795cac7327cf6ab3590d3e49 SHA256 aed33732c55566604a24cd2cd1751c24d159ff8eca510647c5c3c7889fd8ae15
 DIST audacious-plugins-2.0.1.tgz 3505273 RMD160 61c8528f6a2440dbc433aff5ae6849d740883e1a SHA1 cbb702b269e59ccdc36f483768881baa865af012 SHA256 3279a2160d026c16828a850dd2d0b289bd69569c3a8ad6e060c6673b5d8cf648
 DIST audacious-plugins-2.1-beta1.tgz 3616603 RMD160 fd47e1016f4590c84f12aa204771aef86f6019f8 SHA1 281c73573faae75c215c23abef7e8adad06402ca SHA256 58d83885b49ee627eb75eb90e1e5cb36d7e9daf07d25a03f63b51b0b55ff9dc3
 DIST audacious-plugins-2.1.tgz 3610509 RMD160 fb73e37b5c05baf376dfbcf9744d96ae85de0d02 SHA1 735c773688e65ee57ce72005a72a53bb7cacc78b SHA256 fe7441e9ee6ab903fa71d21e6ee6b1b2d398567a6618d519cbeb5fa0a6e3a013
 EBUILD audacious-plugins-1.5.1-r3.ebuild 3345 RMD160 5f966da48fdba4bc70ce1feb1dea5836c4969773 SHA1 1c23f90575ac5737893dfe873fd706dbd6b9000b SHA256 031b9a34c94295d868b4165ab6cb788d137aad1d349bf2172478557b77ac7587
 EBUILD audacious-plugins-2.0.1.ebuild 3316 RMD160 1dd8bf74abfec6f9e549bffac681a16d73b2968d SHA1 c5f580ca288082645a6f9106825c3b1cf2c35130 SHA256 424dc69b431395712f61a77a3f44fb1d71f23e65c1261a81674e228d8522a78e
-EBUILD audacious-plugins-2.1.ebuild 3322 RMD160 8042f1475f0054f5e8e44d608deec383f770b27e SHA1 2b90db94c86590906b323bdca9dcf56f9ffd7423 SHA256 52d23a42a74c38742f02af5143f71b549cd57298fad016a97a684003858c02b4
+EBUILD audacious-plugins-2.1-r1.ebuild 3416 RMD160 cbb44940931755e01dd4aeaf9001f9d062feb3f8 SHA1 eb02284b9303ae38db0b44aef08a88afa3072c95 SHA256 d17016fe2a4e4e734c66941f88130022cf1f8763f02395d7996e61029505a018
+EBUILD audacious-plugins-2.1.ebuild 3320 RMD160 649a7b10a579a1658a762609895e651440cbf73f SHA1 c42576eb551b2e5ba87eebfcd105bd565ef28d10 SHA256 9984bb513139d268fec023b0c8d19da87223f5f5d707ee89d6728b3da58291dc
 EBUILD audacious-plugins-2.1_beta1.ebuild 3328 RMD160 b547f68885eeeef55ca30fe278ae3f8a9a980acb SHA1 f7f1e3fcea14016bd638e5432efb8fccf4793b2e SHA256 37038e33677b906886e0266dc1f765efb0e24e7be3195b729a0a2ed437341846
-MISC ChangeLog 26767 RMD160 beb275c6f6e6f74ebcbc1f2fc07a2d7ec8606d9e SHA1 dc893dbb95819999760e2e6310d8c9388689b335 SHA256 abc89c30dfe4c3d48f6003455b900d391e462877248ae9586cac2f257e6e3c03
+MISC ChangeLog 27138 RMD160 73c8bd64997a549079f43de49fee236d3fa51c88 SHA1 ac86ddfc5a3f2301073f5f9ecc4a064872e90ef8 SHA256 5c79ab8893247c74c03d8aa1c0fa38624c92b13f9b97b5d72f2d217abc05d7fb
 MISC metadata.xml 933 RMD160 a101abab026c1c2640b33a6e34d7e462a2e8a77b SHA1 30fc4bbee1c3b44aa8b3d292832932a47d4ce84c SHA256 b71897abce5726f445e94145fa1379b901715c72b8f151615d55296011f2a0fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpswxAACgkQp5vW4rUFj5pQGQCeP1m69cPxJEVOEmMDHto3eaOr
+cuoAoKqoRSpj963Ua3mFBlN/lLxxAMCP
+=gCT2
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.1-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.1-r1.ebuild
new file mode 100644
index 000000000000..1d0e6996ed98
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.1-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.1-r1.ebuild,v 1.1 2009/07/26 20:56:25 chainsaw Exp $
+
+inherit eutils flag-o-matic
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="adplug alsa bs2b cdda esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
+nls oss projectm pulseaudio scrobbler sdl sid sndfile sse2 timidity tta vorbis wavpack wma"
+
+RDEPEND="app-arch/unzip
+	>=dev-libs/dbus-glib-0.60
+	dev-libs/libxml2
+	>=media-sound/audacious-2.1_beta1
+	>=net-misc/neon-0.26.4
+	>=x11-libs/gtk+-2.14
+	adplug? ( >=dev-cpp/libbinio-1.4 )
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	bs2b? ( media-libs/libbs2b )
+	cdda? ( >=media-libs/libcddb-1.2.1
+		>=dev-libs/libcdio-0.79-r1 )
+	esd? ( >=media-sound/esound-0.2.38-r1 )
+	flac? ( >=media-libs/libvorbis-1.0
+		>=media-libs/flac-1.2.1-r1 )
+	icecast? ( media-libs/libshout )
+	jack? ( >=media-libs/bio2jack-0.4
+		media-sound/jack-audio-connection-kit )
+	lirc? ( app-misc/lirc )
+	mp3? ( media-libs/libmad )
+	mtp? ( media-libs/libmtp )
+	musepack? ( media-libs/libmpcdecsv7 media-libs/taglib )
+	projectm? ( >=media-libs/libprojectm-1.2.0
+		>=media-libs/libsdl-1.2.5 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	scrobbler? ( net-misc/curl )
+	sdl? (	>=media-libs/libsdl-1.2.5 )
+	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
+	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+	timidity? ( media-sound/timidity++ )
+	tta? ( media-libs/libid3tag )
+	vorbis? ( >=media-libs/libvorbis-1.2.0
+		  >=media-libs/libogg-1.1.3 )
+	wavpack? ( >=media-sound/wavpack-4.41.0 )
+	wma? ( >=media-libs/libmms-0.3 )"
+
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )
+	>=dev-util/pkgconfig-0.9.0"
+
+mp3_warning() {
+	if ! useq mp3 ; then
+		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-libmpcdecsv7.patch"
+}
+
+src_compile() {
+	mp3_warning
+
+	econf \
+		--enable-aac \
+		--enable-chardet \
+		--enable-dbus \
+		--enable-modplug \
+		--enable-neon \
+		--disable-coreaudio \
+		--disable-dockalbumart \
+		--disable-projectm \
+		$(use_enable projectm projectm-1.0) \
+		$(use_enable adplug) \
+		$(use_enable alsa) \
+		$(use_enable alsa bluetooth) \
+		$(use_enable bs2b) \
+		$(use_enable cdda cdaudio) \
+		$(use_enable esd) \
+		$(use_enable flac flacng) \
+		$(use_enable flac filewriter_flac) \
+		$(use_enable ipv6) \
+		$(use_enable jack) \
+		$(use_enable gnome gnomeshortcuts) \
+		$(use_enable lirc) \
+		$(use_enable mp3) \
+		$(use_enable musepack) \
+		$(use_enable mtp mtp_up) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable sdl paranormal) \
+		$(use_enable sid) \
+		$(use_enable sndfile) \
+		$(use_enable sse2) \
+		$(use_enable timidity) \
+		$(use_enable tta) \
+		$(use_enable vorbis) \
+		$(use_enable vorbis filewriter_vorbis) \
+		$(use_enable wavpack) \
+		$(use_enable wma) \
+		$(use_enable wma mms) \
+		$(use_enable icecast) \
+		|| die
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS
+}
+
+pkg_postinst() {
+	mp3_warning
+}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild
index f1c07bbe2a3b..31c981ddbf70 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild,v 1.2 2009/07/22 16:04:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild,v 1.3 2009/07/26 20:56:25 chainsaw Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="adplug alsa bs2b cdda esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
 nls oss projectm pulseaudio scrobbler sdl sid sndfile sse2 timidity tta vorbis wavpack wma"
 
diff --git a/media-plugins/audacious-plugins/files/2.1-libmpcdecsv7.patch b/media-plugins/audacious-plugins/files/2.1-libmpcdecsv7.patch
new file mode 100644
index 000000000000..feda15ed6a2a
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/2.1-libmpcdecsv7.patch
@@ -0,0 +1,33 @@
+diff -ur audacious-plugins-2.1.orig/configure.ac audacious-plugins-2.1/configure.ac
+--- audacious-plugins-2.1.orig/configure.ac	2009-07-07 01:40:35.000000000 +0300
++++ audacious-plugins-2.1/configure.ac	2009-07-26 18:54:48.000000000 +0300
+@@ -747,7 +747,7 @@
+ 
+ if test "x$enable_musepack" = "xyes"; then
+     PKG_CHECK_MODULES(TAGLIB, [taglib >= 1.4], [ 
+-       AC_CHECK_HEADERS(mpcdec/config_types.h,, [
++       AC_CHECK_HEADERS(mpcdecsv7/config_types.h,, [
+            enable_musepack=no
+        ])
+     ], [enable_musepack=no])
+diff -ur audacious-plugins-2.1.orig/src/musepack/libmpc.h audacious-plugins-2.1/src/musepack/libmpc.h
+--- audacious-plugins-2.1.orig/src/musepack/libmpc.h	2009-07-07 01:40:36.000000000 +0300
++++ audacious-plugins-2.1/src/musepack/libmpc.h	2009-07-26 18:55:09.000000000 +0300
+@@ -21,7 +21,7 @@
+ //libmpcdec headers
+ #undef TRUE
+ #undef FALSE
+-#include <mpcdec/mpcdec.h>
++#include <mpcdecsv7/mpcdec.h>
+ 
+ //GTK+ headers
+ #include <glib.h>
+diff -ur audacious-plugins-2.1.orig/src/musepack/Makefile audacious-plugins-2.1/src/musepack/Makefile
+--- audacious-plugins-2.1.orig/src/musepack/Makefile	2009-07-07 01:40:36.000000000 +0300
++++ audacious-plugins-2.1/src/musepack/Makefile	2009-07-26 18:55:21.000000000 +0300
+@@ -9,4 +9,4 @@
+ 
+ CXXFLAGS += ${PLUGIN_CFLAGS}
+ CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${GTK_CFLAGS} ${GLIB_CFLAGS}  ${TAGLIB_CFLAGS} -I../..
+-LIBS += ${TAGLIB_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS} -lmpcdec
++LIBS += ${TAGLIB_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS} -lmpcdecsv7
diff --git a/media-plugins/audacious-plugins/files/2.1_alpha1-timidity-conf-path.patch b/media-plugins/audacious-plugins/files/2.1_alpha1-timidity-conf-path.patch
deleted file mode 100644
index 1cabbfb47ee3..000000000000
--- a/media-plugins/audacious-plugins/files/2.1_alpha1-timidity-conf-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/timidity/xmms-timidity.c	2009-05-14 04:42:00.000000000 +0200
-+++ b/src/timidity/xmms-timidity.c	2009-06-12 22:55:44.195726707 +0200
-@@ -94,7 +94,7 @@
- 
- 	if (! aud_cfg_db_get_string(db, "timidity", "config_file",
-                                 &xmmstimid_cfg.config_file))
--        xmmstimid_cfg.config_file = g_strdup("/etc/timidity/timidity.cfg");
-+        xmmstimid_cfg.config_file = g_strdup("/etc/timidity.cfg");
- 
- 	aud_cfg_db_get_int(db, "timidity", "samplerate", &xmmstimid_cfg.rate);
- 	aud_cfg_db_get_int(db, "timidity", "bits", &xmmstimid_cfg.bits);