aac USE for media-libs/faad2 by Hendrik Iben, bug 211805.

Package-Manager: portage-2.1.4.4

4 files changed, 106 insertions, 2 deletions

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index 3078c7abb2b3..019e52e68515 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/moc
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.47 2008/03/01 10:21:00 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.48 2008/03/05 19:04:57 drac Exp $
+
+*moc-2.5.0_alpha3-r1 (05 Mar 2008)
+
+  05 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  +files/moc-2.5.0_alpha3-faad2.patch, +moc-2.5.0_alpha3-r1.ebuild:
+  aac USE for media-libs/faad2 by Hendrik Iben, bug 211805.
 
 *moc-2.5.0_alpha3 (01 Mar 2008)
 
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 1fce6cd52fe2..fead03da3d66 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,7 +1,9 @@
 AUX moc-2.5.0_alpha2-endianess.patch 1747 RMD160 6b284b59d461aba3b3248b78cee7a4c576b9d67d SHA1 4a26b7f6b488f7781ba18a1423dadc0d74a6d8b7 SHA256 b6874f79f454a430dc96705b54048ee999576e8327436ca9ef1654b72bb5f28f
+AUX moc-2.5.0_alpha3-faad2.patch 933 RMD160 54fdaee534bde0f2004334ce1637d6f57a95028a SHA1 d387c13600458eb4bebe2d2715e5eaba36c748af SHA256 2a221a9328b3a1dd753af07d0ba64ebffba145b2309d7c9ac596b04fc8c4a283
 DIST moc-2.5.0-alpha2.tar.bz2 486681 RMD160 64efd4bff599ae419dad34905725db38633ec8c9 SHA1 9d448c79ad0889cc5a27c5d9e1bbe7b6a697954f SHA256 000deb3212a70fe4b83e4f005753746e80fdc7d5b74db89b8a6cf69410c455a3
 DIST moc-2.5.0-alpha3.tar.bz2 489824 RMD160 7a603538e2080f3e182a543bc82100a09a56c2fe SHA1 59251b6239ad38f3f5ba8a1f73d1e90246765ab7 SHA256 6b691295eb0b42aab17805798bd40fb308619a9ba8f6a1e1ed599e3449946617
 EBUILD moc-2.5.0_alpha2.ebuild 2042 RMD160 b6d43919bad24a254fa452317a74e44291271b04 SHA1 8c1588a576b9c5952e42525f04b1139575dc1a6d SHA256 eb844976f867392e231e1e4c8859e4a5f8eb4d9aa990b306eb2dd446eb3d5b8e
+EBUILD moc-2.5.0_alpha3-r1.ebuild 2109 RMD160 f564f390498234ae6d932cd0b6d85c5274b9fa10 SHA1 5f784aeb64f39f1115493402bc64603457b8915d SHA256 09b9f299b0e41f7404fefd3479e513ae57f98280cfa3984ab214f8c2afad47a2
 EBUILD moc-2.5.0_alpha3.ebuild 2011 RMD160 2ca4a5495b8097e10dcd82d09a9a1ac1c827307a SHA1 49313c809317b54ae2d624b110325df75104b517 SHA256 950ae9554e3611f14aa78e8be922d709613dbfc6f8029c821069ac90fa11c854
-MISC ChangeLog 6704 RMD160 bbe75a36892549ba8b65cb058248e90dd0033624 SHA1 cfa7614707756b5f6d12f8dece918a2a1bc8b77a SHA256 59aa0037653a60d5812a6f3f80b5c59c5649918db2c87f409d9dc29bdc7d4e91
+MISC ChangeLog 6918 RMD160 45d98ff9ea8bfec142f0ef6f393d057e84d2a2c7 SHA1 19509920ab5fc60348c52ed49728d580fd13195d SHA256 26bf380ca340fded3a217f05aa7ebf8ee32bf123f4f65ff8063489303efe2c79
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/moc/files/moc-2.5.0_alpha3-faad2.patch b/media-sound/moc/files/moc-2.5.0_alpha3-faad2.patch
new file mode 100644
index 000000000000..e114f0dc1376
--- /dev/null
+++ b/media-sound/moc/files/moc-2.5.0_alpha3-faad2.patch
@@ -0,0 +1,25 @@
+--- configure.in.orig	2008-03-04 16:45:23.000000000 +0100
++++ configure.in	2008-03-04 16:34:10.000000000 +0100
+@@ -276,12 +276,17 @@
+ AC_ARG_WITH(aac, AS_HELP_STRING(--without-aac,Compile without AAC support (libfaad2)))
+ if test "x$with_aac" != "xno"
+ then
+-	AC_CHECK_LIB(faad, faacDecInit, [
+-		AC_CHECK_HEADER([faad.h], ,
+-			AC_MSG_ERROR([You need libfaad2 header file (libfaad2 devel package).]))
+-	])
++        faad2_OK="no" 
++	AC_CHECK_LIB(faad, faacDecInit, [faad2_OK="yes"], [
++          AC_CHECK_LIB(faad, NeAACDecInit, [faad2_OK="yes"], [])
++        ]) 
++
++        if test "x$faad2_OK" = "xyes"; then
++	  AC_CHECK_HEADER([faad.h], ,
++            AC_MSG_ERROR([You need libfaad2 header file (libfaad2 devel package).]))
++        fi
+ 
+-	if test "$ac_cv_lib_faad_faacDecInit" = "yes" -a "$HAVE_ID3TAG" = "yes"
++	if test "x$faad2_OK" = "xyes" -a "$HAVE_ID3TAG" = "yes"
+ 	then
+ 		FAAD2_LIBS="-lfaad"
+ 		AC_SUBST([FAAD2_CFLAGS])
diff --git a/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild b/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
new file mode 100644
index 000000000000..1925889c0a69
--- /dev/null
+++ b/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild,v 1.1 2008/03/05 19:04:57 drac Exp $
+
+inherit autotools eutils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Music On Console - ncurses interface for playing audio files"
+HOMEPAGE="http://moc.daper.net"
+SRC_URI="ftp://ftp.daper.net/pub/soft/${PN}/unstable/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa aac jack mad musepack vorbis flac wavpack sndfile modplug timidity sid ffmpeg speex libsamplerate curl debug"
+
+RDEPEND="media-libs/libao
+	alsa? ( media-libs/alsa-lib )
+	aac? ( media-libs/faad2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
+	musepack? ( media-libs/libmpcdec >=media-libs/taglib-1.3 )
+	vorbis? ( >=media-libs/libvorbis-1 )
+	flac? ( media-libs/flac )
+	wavpack? ( >=media-sound/wavpack-4.31 )
+	sndfile? ( >=media-libs/libsndfile-1 )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	timidity? ( media-libs/libtimidity media-sound/timidity++ )
+	sid? ( >=media-libs/libsidplay-2 )
+	ffmpeg? ( media-video/ffmpeg )
+	speex? ( >=media-libs/speex-1 )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1 )
+	curl? ( >=net-misc/curl-7.12.2 )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-faad2.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf --without-rcc \
+		$(use_with aac) \
+		$(use_with jack) \
+		$(use_with mad mp3) \
+		$(use_with musepack) \
+		$(use_with vorbis) \
+		$(use_with flac) \
+		$(use_with wavpack) \
+		$(use_with sndfile) \
+		$(use_with modplug) \
+		$(use_with timidity) \
+		$(use_with sid sidplay2) \
+		$(use_with ffmpeg) \
+		$(use_with speex) \
+		$(use_with libsamplerate samplerate) \
+		$(use_with curl) \
+		$(use_enable debug)
+	emake || die "emake failed."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO *.example
+	rm -rf "${D}"/usr/share/doc/${PN}
+}