Use transition package media-libs/libmpcdecsv7 instead of media-libs/libmpcdec for Musepack support.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 121 insertions, 1 deletions

diff --git a/media-sound/aqualung/ChangeLog b/media-sound/aqualung/ChangeLog
index b8250822dd71..4890e74030e9 100644
--- a/media-sound/aqualung/ChangeLog
+++ b/media-sound/aqualung/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/aqualung
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.5 2009/07/22 15:54:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.6 2009/07/26 12:49:51 ssuominen Exp $
+
+*aqualung-0.9_beta10-r2 (26 Jul 2009)
+
+  26 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +aqualung-0.9_beta10-r2.ebuild,
+  +files/aqualung-0.9_beta10-libmpcdecsv7.patch:
+  Use transition package media-libs/libmpcdecsv7 instead of
+  media-libs/libmpcdec for Musepack support.
 
   22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   USE cdda is now global.
diff --git a/media-sound/aqualung/aqualung-0.9_beta10-r2.ebuild b/media-sound/aqualung/aqualung-0.9_beta10-r2.ebuild
new file mode 100644
index 000000000000..6d18343e2f20
--- /dev/null
+++ b/media-sound/aqualung/aqualung-0.9_beta10-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta10-r2.ebuild,v 1.1 2009/07/26 12:49:51 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils versionator
+
+MY_PV="$(delete_version_separator 2)"
+MY_PV="${MY_PV/_p/.}"
+
+DESCRIPTION="A music player for a wide range of formats designed for gapless playback"
+HOMEPAGE="http://aqualung.factorial.hu/"
+SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="sndfile modplug mp3 vorbis speex flac musepack wavpack ffmpeg ladspa
+	cddb cdda ifp jack lua alsa oss lame systray libsamplerate podcast debug"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="vorbis? ( media-libs/libvorbis )
+	sndfile? ( media-libs/libsndfile )
+	flac? ( media-libs/flac )
+	modplug? ( media-libs/libmodplug )
+	alsa? ( virtual/alsa )
+	mp3? ( media-libs/libmad )
+	lame? ( media-sound/lame )
+	musepack? ( media-libs/libmpcdecsv7 )
+	ffmpeg? ( media-video/ffmpeg )
+	speex? ( media-libs/speex media-libs/liboggz )
+	wavpack? ( media-sound/wavpack )
+	cddb? ( media-libs/libcddb )
+	jack? ( media-sound/jack-audio-connection-kit )
+	cdda? ( dev-libs/libcdio )
+	ifp? ( media-libs/libifp )
+	lua? ( dev-lang/lua )
+	libsamplerate? ( media-libs/libsamplerate )
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	ladspa? ( media-libs/liblrdf )
+	dev-util/pkgconfig
+	dev-libs/libxml2"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libmpcdecsv7.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with oss) \
+		$(use_with jack) \
+		$(use_with flac) \
+		$(use_with vorbis ogg) \
+		$(use_with vorbis vorbisenc) \
+		$(use_with sndfile) \
+		$(use_with mp3 mpeg) \
+		$(use_with lame) \
+		$(use_with modplug mod) \
+		$(use_with musepack mpc) \
+		$(use_with ffmpeg lavc) \
+		$(use_with speex) \
+		$(use_with wavpack) \
+		$(use_with cddb) \
+		$(use_with systray) \
+		$(use_with ladspa) \
+		$(use_with cdda) \
+		$(use_with lua) \
+		$(use_with ifp) \
+		$(use_with libsamplerate src) \
+		$(use_with podcast) \
+		$(use_enable debug) \
+		--with-loop \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed"
+	dodoc AUTHORS README || die "dodoc failed"
+	newicon src/img/icon_64.png aqualung.png
+	make_desktop_entry aqualung Aqualung
+}
diff --git a/media-sound/aqualung/files/aqualung-0.9_beta10-libmpcdecsv7.patch b/media-sound/aqualung/files/aqualung-0.9_beta10-libmpcdecsv7.patch
new file mode 100644
index 000000000000..765c84fb6fe1
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-0.9_beta10-libmpcdecsv7.patch
@@ -0,0 +1,27 @@
+diff -ur aqualung-0.9beta10.orig/configure.ac aqualung-0.9beta10/configure.ac
+--- aqualung-0.9beta10.orig/configure.ac	2009-02-08 12:54:25.000000000 +0200
++++ aqualung-0.9beta10/configure.ac	2009-07-26 15:45:15.000000000 +0300
+@@ -526,9 +526,9 @@
+ if test "$mpc" = "no"; then
+ 	AC_MSG_RESULT(no)
+ else
+-	AC_CHECK_LIB(mpcdec, mpc_streaminfo_init, [lib=yes], [lib=no], [-lstdc++])
++	AC_CHECK_LIB(mpcdecsv7, mpc_streaminfo_init, [lib=yes], [lib=no], [-lstdc++])
+ 	if test "$lib" = "yes"; then
+-	        mpc_LIBS="-lmpcdec -lstdc++"
++	        mpc_LIBS="-lmpcdecsv7 -lstdc++"
+ 		AC_DEFINE([HAVE_MPC], [1], [Defined if compile with Musepack support])
+ 	fi
+ 	if test "$lib" = "no" -a "$mpc" = "yes"; then
+diff -ur aqualung-0.9beta10.orig/src/decoder/dec_mpc.h aqualung-0.9beta10/src/decoder/dec_mpc.h
+--- aqualung-0.9beta10.orig/src/decoder/dec_mpc.h	2009-02-08 12:55:56.000000000 +0200
++++ aqualung-0.9beta10/src/decoder/dec_mpc.h	2009-07-26 15:45:29.000000000 +0300
+@@ -23,7 +23,7 @@
+ #define _DEC_MPC_H
+ 
+ #ifdef HAVE_MPC
+-#include <mpcdec/mpcdec.h>
++#include <mpcdecsv7/mpcdec.h>
+ #endif /* HAVE_MPC */
+ 
+ #include "file_decoder.h"