Restore mp4ff shared library with Debian patch.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 79 insertions, 7 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index fc915f61d904..81164709eff7 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/faad2
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.118 2009/02/19 23:08:41 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.119 2009/07/20 08:21:12 vapier Exp $
+
+*faad2-2.7-r1 (20 Jul 2009)
+
+  20 Jul 2009; Mike Frysinger <vapier@gentoo.org> +faad2-2.7-r1.ebuild,
+  +files/faad2-2.7-libmp4ff-shared-lib.patch:
+  Restore mp4ff shared library with Debian patch.
 
 *faad2-2.7 (19 Feb 2009)
 
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 9280683b8fa1..e18d775289a1 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -6,16 +6,18 @@ AUX faad2-2.6.1-broken-pipe.patch 799 RMD160 96f3be97dee17a36a9f2937927b0ad773ee
 AUX faad2-2.6.1-implicitdeclar.patch 335 RMD160 3f2d995eca4bb6d83c03fab62d293abc7afe4458 SHA1 d4ab5d38c9b75ed6417529c4d1a7ca204293c224 SHA256 e8eb2f5369ee359ecf54d3dae605283aa09688cd63270c9c74dcf4ea873abed5
 AUX faad2-2.6.1-libtool22.patch 324 RMD160 e7fa8d2592f7ba65b94a1f1f2d8b12a3ddc901c2 SHA1 ca4ee04aa1757b8f9deeef52b5bf35dc823da844 SHA256 9e9cf179b379fc028c60fd466b3b61e9b1f9c2b4016cbf6a93b15770c2ee1dfd
 AUX faad2-2.6.1-main-overflow.patch 609 RMD160 cd9fce4b343015321ab6c90f673d47f43ffa6acf SHA1 3c1172e62198db30f0d7fbabff41b0b942947dee SHA256 9c309f8b6809c05da5a52b51e9bb391fa22c6e2ef6b9d9755579e15412eb9994
+AUX faad2-2.7-libmp4ff-shared-lib.patch 867 RMD160 d0721533c875ef4e4510c56272953b0db1dfc4c2 SHA1 247658aa795cd6d44a153fae8c5cb62e427f3ecf SHA256 e0aaefeb20ebfec2f09e88a190f78e5744d9f1c71fe41977db8e4f29b5b88022
 DIST faad2-2.6.1.tar.gz 839410 RMD160 ad559933dad6a65576a9947819190f04cb3b1c16 SHA1 b4ad33d3c4dfa6dbf3011a3da34c631926cabfad SHA256 8ad2c2e0c09b787a943e2ef831c1c84534e3a8726cc1eb1abc4da9eb3038285c
 DIST faad2-2.7.tar.gz 1137407 RMD160 3f0ca461e2953014d5b17edccb3337767d478b8d SHA1 80eaaa5cc576c35dd28863767b795c50cbcc0511 SHA256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330
 EBUILD faad2-2.6.1-r2.ebuild 1409 RMD160 f663605b90c46ac90a4efdb8a91d6901935a3862 SHA1 3f0ada96ee577ac980a16c9486f90084440aa315 SHA256 be86012617172a8ad79886c5627554a7baef07a89b05b8b5a2b8b6789ed5d58f
+EBUILD faad2-2.7-r1.ebuild 828 RMD160 c12ddc3d8d791db2b646114698db8a71e99123e6 SHA1 fd3445ebf904d9bd07c78c1150988912177d0316 SHA256 6287f114c7ff8c81d493584cb39318f8a75542c8bf06f050e01d82a5ee854c61
 EBUILD faad2-2.7.ebuild 784 RMD160 84ba8553faddcedf4b8e23554ca103c93eaa3626 SHA1 4dac9cbbd67332a0c0dc5b9e688235736d45a555 SHA256 0069f999a330d7831a19d632a373c2c071d46f871188d18bc7833a2f128787f2
-MISC ChangeLog 16439 RMD160 4397800e94439e7e0ae2a1f6ac01dd945412ed50 SHA1 460b18ac422488f92c9c5e1b7418b60929f8a3a9 SHA256 2621371fe9d49cf85c62c301859056400588d79c6caaca0abb49d49c5c236cd4
+MISC ChangeLog 16635 RMD160 9aa5612bfe661897f4d769fbbfa7c59ac68eacbe SHA1 1c1937f315b7b6691ba0eab0affc04c0c74cc96b SHA256 70c7293b1c43ce0ac3d1e6d80de096360ddaff278d8d2bc9c1b660f4d92cc381
 MISC metadata.xml 509 RMD160 eccae902db760c56d55258ef0013946723a2399b SHA1 a12df0b8f27cf44403cbfb6a62547575e0d96a6c SHA256 401e3bd91028ddba4278b165e7ae400f181fb439beb09d0c96e4067778e0f52f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkmd5oIACgkQvFcC4BYPU0qySACfVHsVH9KOG8Bg88JFiVAISQr0
-2F4An2l4C1q4m+Kdzlkiu+WFjz4QOsEV
-=tIi0
+iEYEARECAAYFAkpkKP8ACgkQlPl3HsVfCDpp9gCaA/mkkH0xM0njkQrJ7FgZwx9q
+6ycAnAqnhMis9UdUZQ41Lqfwypp9G6z5
+=d8mc
 -----END PGP SIGNATURE-----
diff --git a/media-libs/faad2/faad2-2.7-r1.ebuild b/media-libs/faad2/faad2-2.7-r1.ebuild
new file mode 100644
index 000000000000..d1e9fd6042dd
--- /dev/null
+++ b/media-libs/faad2/faad2-2.7-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.7-r1.ebuild,v 1.1 2009/07/20 08:21:12 vapier Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="http://www.audiocoding.com/faad2.html"
+SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="digitalradio"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-libmp4ff-shared-lib.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_with digitalradio drm) \
+		--without-xmms
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README README.linux TODO
+}
diff --git a/media-libs/faad2/files/faad2-2.7-libmp4ff-shared-lib.patch b/media-libs/faad2/files/faad2-2.7-libmp4ff-shared-lib.patch
new file mode 100644
index 000000000000..56a131192969
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.7-libmp4ff-shared-lib.patch
@@ -0,0 +1,29 @@
+Ripped from Debian
+
+Patch to create a shared lib for libmp4ff.
+
+--- a/common/mp4ff/Makefile.am
++++ b/common/mp4ff/Makefile.am
+@@ -1,7 +1,8 @@
+-lib_LIBRARIES = libmp4ff.a
++lib_LTLIBRARIES = libmp4ff.la
+ include_HEADERS = mp4ff.h mp4ffint.h
+ 
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++AM_CFLAGS = -DUSE_TAGGING=1
+ 
+-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
++libmp4ff_la_LDFLAGS = -version-info 0:0:0
++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+ 		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
+--- a/frontend/Makefile.am
++++ b/frontend/Makefile.am
+@@ -5,7 +5,7 @@
+ 	   -I$(top_srcdir)/common/mp4ff
+ 
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
+-	     $(top_builddir)/common/mp4ff/libmp4ff.a
++	     $(top_builddir)/common/mp4ff/libmp4ff.la
+ 
+ faad_SOURCES = main.c \
+ 	       audio.c audio.h \