Added new version that solves the mpeg4ip conflict and applies the fix for FreeBSD.

(Portage version: 2.1_pre1)

4 files changed, 77 insertions, 11 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 8c94faa93330..23e275f39819 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/faad2
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.54 2005/12/19 09:53:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.55 2005/12/19 11:16:52 flameeyes Exp $
+
+*faad2-2.0-r8 (19 Dec 2005)
+
+  19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> +faad2-2.0-r8.ebuild:
+  Added new version that solves the mpeg4ip conflict and applies the fix for
+  FreeBSD.
 
   19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
   Taking over faad2 for sound herd.
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index d3ea94789e8f..d457808313e4 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,13 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d28411ac6abf47ed3f490f6e0feaef90 ChangeLog 7512
 MD5 9167396e4beb71ea1c2f38c0933e2241 faad2-2.0-r3.ebuild 2091
 MD5 f17e09277ed7b2502a798579f4517d72 faad2-2.0-r6.ebuild 2127
 MD5 9744749cd5b5b9f8315709147174f04e faad2-2.0-r7.ebuild 2141
+MD5 dffa8a65d4c38072d026a3c3d6dc775d faad2-2.0-r8.ebuild 1601
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r3 61
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r6 61
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r7 61
+MD5 e91b90137cc00d581de4a6502ba3ac2d files/digest-faad2-2.0-r8 127
 MD5 edab653b8b9960b0ea4a04a745786c5f files/faad2-2.0-amd64.patch 9564
 MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416
 MD5 c7b0b0563f7c682ecd92ef4c32ceef60 files/faad2-2.0-gcc34.patch 296
@@ -16,10 +15,3 @@ MD5 1ceab8b26925d147b1e0a359ce23d56e files/faad2-2.0-noext.patch 856
 MD5 c3dc0623a7f8ff83085ae703b2312d48 files/faad2-gcc4-warnings-and-errors.patch.gz 3265
 MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
 MD5 fa11072383948db52dccac007cc2c73d metadata.xml 387
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDpoMbAiZjviIA2XgRAgWOAJ95Lpia0bIqiGhqq0zXWabMPm8mDQCghKLa
-82aK5Sc2BaddT70oet4PtlY=
-=10J2
------END PGP SIGNATURE-----
diff --git a/media-libs/faad2/faad2-2.0-r8.ebuild b/media-libs/faad2/faad2-2.0-r8.ebuild
new file mode 100644
index 000000000000..491c77e9f6dd
--- /dev/null
+++ b/media-libs/faad2/faad2-2.0-r8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r8.ebuild,v 1.1 2005/12/19 11:16:52 flameeyes Exp $
+
+inherit eutils libtool flag-o-matic autotools
+
+PATCHLEVEL="1"
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="http://www.audiocoding.com/"
+SRC_URI="mirror://sourceforge/faac/${PN}-${PV/_/-}.tar.gz
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="xmms"
+
+RDEPEND="xmms? ( >=media-sound/xmms-1.2.7
+		media-libs/id3lib )
+	media-video/mpeg4ip"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	sys-devel/automake
+	sys-devel/autoconf"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	eautoreconf
+}
+
+src_compile() {
+	# see #34392
+	filter-flags -mfpmath=sse
+
+	# mp4v2 needed for rhythmbox
+	# drm needed for nothing but doesn't hurt
+	econf \
+		--with-mp4v2 \
+		--with-drm \
+		$(use_with xmms) \
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS ChangeLog NEWS README README.linux TODO
+
+	# unneeded include, <systems.h> breaks building of apps, but
+	# it is necessary because includes <sys/types.h>,
+	# which is needed by /usr/include/mp4.h... so we just
+	# include <sys/types.h> instead.  See bug #55767
+	sed -i -e "s:#include <systems.h>:#include <sys/types.h>:" \
+		${D}/usr/include/mpeg4ip.h
+	sed -i -e "s:\"mp4ff_int_types.h\":<stdint.h>:" \
+		${D}/usr/include/mp4ff.h
+
+}
diff --git a/media-libs/faad2/files/digest-faad2-2.0-r8 b/media-libs/faad2/files/digest-faad2-2.0-r8
new file mode 100644
index 000000000000..a9bbb52ecc73
--- /dev/null
+++ b/media-libs/faad2/files/digest-faad2-2.0-r8
@@ -0,0 +1,2 @@
+MD5 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz 766660
+MD5 8153776babec288c4c638aa6d833c8a6 faad2-patches-1.tar.bz2 7791