summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2009-07-26 20:56:25 +0000
committerTony Vroon <chainsaw@gentoo.org>2009-07-26 20:56:25 +0000
commit801c049d202f95af67b4c13cbf0164f450d319b8 (patch)
treeb2a0eaf996d07a01c768f5cadb59e782de5b5e30 /media-plugins/audacious-plugins
parentMarked stable on AMD64, tested on a dual Opteron 2435 system with a Xonar D2X... (diff)
downloadgentoo-2-801c049d202f95af67b4c13cbf0164f450d319b8.tar.gz
gentoo-2-801c049d202f95af67b4c13cbf0164f450d319b8.tar.bz2
gentoo-2-801c049d202f95af67b4c13cbf0164f450d319b8.zip
Patch by Samuli Suominen <ssuominen@gentoo.org> changes Musepack dependency to a SV7-only transition library. Mark 2.1 version stable on AMD64.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins/audacious-plugins')
-rw-r--r--media-plugins/audacious-plugins/ChangeLog11
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-2.1-r1.ebuild125
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-2.1.ebuild4
-rw-r--r--media-plugins/audacious-plugins/files/2.1-libmpcdecsv7.patch33
-rw-r--r--media-plugins/audacious-plugins/files/2.1_alpha1-timidity-conf-path.patch11
5 files changed, 170 insertions, 14 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/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);