Initial attempt at supporting libmp4v2 revision r479 wrt #397575 by Jaakko Perttilä

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 118 insertions, 15 deletions

diff --git a/media-libs/faac/ChangeLog b/media-libs/faac/ChangeLog
index e38c25eaf472..e471c06a8f7f 100644
--- a/media-libs/faac/ChangeLog
+++ b/media-libs/faac/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/faac
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.82 2012/01/07 00:38:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.83 2012/01/20 18:59:33 ssuominen Exp $
+
+*faac-1.28-r2 (20 Jan 2012)
+
+  20 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> +faac-1.28-r2.ebuild,
+  +files/faac-1.28-libmp4v2_r479_compat.patch:
+  Initial attempt at supporting libmp4v2 revision r479 wrt #397575 by Jaakko
+  Perttilä
 
   07 Jan 2012; Ulrich Mueller <ulm@gentoo.org> faac-1.28-r1.ebuild:
   Add MPEG-4 to LICENSE and change LGPL-2 to LGPL-2.1, bug 357779.
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 73a75d3035d0..7c4a23802d9f 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -3,24 +3,20 @@ Hash: SHA1
 
 AUX faac-1.28-altivec.patch 964 RMD160 892eafd60e8aaacfb5c580e2785f0675595c6b1e SHA1 79e403c5b6528c556930e4927e7e5cfb5cd24fe4 SHA256 36647018413fd0804762ec6dfad1c4c26566ce67130a5052172639d3d5c68a03
 AUX faac-1.28-external-libmp4v2.patch 1766 RMD160 fcb3567d6a3752e10a0180b9d0937b3211de59f3 SHA1 790f83abaecb458f67e627f04b1eccfbbf2be2b7 SHA256 8e0bfe501acb7f31a701ab2c797c2ace539ccd60e5f5b3c0ae538bcd5719c1df
+AUX faac-1.28-libmp4v2_r479_compat.patch 1849 RMD160 138129a4bcc2a938fb7a325a41daae45c3014981 SHA1 8cb8f3400f54c3264388eef84cba9e3a06786af5 SHA256 5173a7a8910f21821f32402422eeb20c835c04d0c63003238d3246a08f4cf1c8
 DIST faac-1.28.tar.gz 678891 RMD160 03902393488f04223aabdc804bfe77bb32a61c94 SHA1 d00b023a3642f81bb1fb13d962a65079121396ee SHA256 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
 EBUILD faac-1.28-r1.ebuild 1035 RMD160 0f595bb17adb61e172dd18939d73a3f7e59bcfd9 SHA1 73e1ae6616c8c2129cf8391d6afa7eb3460b40dd SHA256 4dc194e74ec4d434b8af448f0016189ea941be11297674b84f4420a70106d079
-MISC ChangeLog 10214 RMD160 4197b6128bb30f7d0e9915f4b4d3956ce310dab9 SHA1 237b55a30a44a0900b0c90502c7bb5ea59c950e5 SHA256 21a3a8f8b347a9cdac420097e1cf35f1c7b1bd36033cdaa2a7ede69e4892e6c6
+EBUILD faac-1.28-r2.ebuild 1051 RMD160 df1cbf9471d6777804f2716679aeeb5b109ca4c0 SHA1 bb2f93451dcd17ba547787e4ff281d69252f8847 SHA256 bc64b1c5cabae94b8efbf49b94fe195639bef1c601ac6e1702a8e320c47e6ac9
+MISC ChangeLog 10462 RMD160 827c295c9bda9305bdb898690368d4c2e9d1d68b SHA1 425d0115e9f73a9989517319c3c126aa3b0338c8 SHA256 82f79daa2e54be0d7201caa42a6ee28b94fe67ea21668fa9fd94e55ae894a942
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPB5QHAAoJEDxpGckxwJCBAAsQAJib2ONMOKcFqVD3YT1n5sLC
-5cjBxhQeM6IKRTpRxoPUxXyJi0bzmp7iucFR9s4C+No3jwvlXJw8yL/qpsKiqWaT
-9g7zzguk0gjd9vkRXKpjay2Bbn7itrIn9cHT92rb5cELcpZ4UdYZV11WUEqCvJDB
-4/QqavQbnFg3fk1PPvWm7GqsO2xoAm7PqHCvJRlrIeixoRwAZziyEXzfpUK/jtVk
-tcmdkoNjyTm3ubTlz1NHnQf46lJDpLav3hFGTRZGC1GtmT/+z7L2DHiZQN+N1jM3
-vjVWumBHUY0ZSCj6c59F7dIq47brli6eYcbIi6sfBaZBr5/8hYJG7QXSZLwTbazC
-vXW8i9C6gwdP/Zg24m/PWCexH88OP5N0OtRblVuYwCPz039Dn1pD23ocjxFTg1/Q
-6c1ZnOukLkdnOCsPtPgoMffjsoAtHK3ArvG0+UDLoOeYSoOCuO/EN8gTU7rVvGou
-0YJzmn94N65nK79xTZaNpF2BK1H8qNSEYpb7IiLb4bQuMLkJ44+OWS8eXLLKwi+n
-tPssxi+fabCOHuhnjIw6Ot1FMCSvYnTyjxsZ9GjmKW1g2fabqaCoR9xw88J70NF4
-HIglUvNt9cV52gKIGXr/hfkHuebHk5Ieq/EBzW70HlWmUFzcp8oYQxTUVTQXmm3P
-SW4PD3HrAH+prGY3weVV
-=pHzw
+iQEcBAEBAgAGBQJPGbkYAAoJEEdUh39IaPFNHz0H/2m2jS0T6hz23CxjjCn8H5c3
+jtNSJxoBj/NXPLKA4qjHG2TBrG47QFwktm445wSqGtGu6R/tKsp+Lpk7oecujI8c
+lohJ4wdHwEo9vgm86PSOeb3hPLWllCSG2JA1V97JTgPy+lQtrH3Z+fx5PCkCeadu
+DsK5BxO81zfcJWNttDChf3cHE/9ieif9yTRvKuH0R0H/B+oXKrBtpMvWU6jRrUJo
+e4Y6Fpyq2W8b97+8uOZgQQ0pdaIGsAhlC9ZiMjl/ZgMvpQ76MpXCH8ixIrXWKQGx
+EMjUl4S5xi5I65qygcroOre4/CT5z+boWfesT1fPCY2j8R+WxDqQ4SJ0ivaVf7o=
+=DlQn
 -----END PGP SIGNATURE-----
diff --git a/media-libs/faac/faac-1.28-r2.ebuild b/media-libs/faac/faac-1.28-r2.ebuild
new file mode 100644
index 000000000000..9733a5165699
--- /dev/null
+++ b/media-libs/faac/faac-1.28-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r2.ebuild,v 1.1 2012/01/20 18:59:33 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com"
+HOMEPAGE="http://www.audiocoding.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPEG-4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static-libs"
+
+RDEPEND="media-libs/libmp4v2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-external-libmp4v2.patch \
+		"${FILESDIR}"/${P}-altivec.patch \
+		"${FILESDIR}"/${P}-libmp4v2_r479_compat.patch
+
+	eautoreconf
+	epunt_cxx
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	dohtml docs/*.html
+	insinto /usr/share/doc/${PF}/pdf
+	doins docs/libfaac.pdf
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-libs/faac/files/faac-1.28-libmp4v2_r479_compat.patch b/media-libs/faac/files/faac-1.28-libmp4v2_r479_compat.patch
new file mode 100644
index 000000000000..cbcfb4832d98
--- /dev/null
+++ b/media-libs/faac/files/faac-1.28-libmp4v2_r479_compat.patch
@@ -0,0 +1,59 @@
+This is ticket "3476707" at upstream sf.net "faac" project bug tracking system:
+http://sourceforge.net/tracker/?group_id=704&atid=100704
+http://sourceforge.net/projects/faac/
+http://bugs.gentoo.org/397575
+
+--- frontend/main.c
++++ frontend/main.c
+@@ -873,8 +873,13 @@
+     if (!faacEncSetConfiguration(hEncoder, myFormat)) {
+         fprintf(stderr, "Unsupported output format!\n");
+ #ifdef HAVE_LIBMP4V2
++    /* r479 fix */
++#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE
++        if (container == MP4_CONTAINER) MP4Close(MP4hFile, 0);
++#else
+         if (container == MP4_CONTAINER) MP4Close(MP4hFile);
+ #endif
++#endif
+         return 1;
+     }
+ 
+@@ -885,12 +890,11 @@
+         unsigned long ASCLength = 0;
+     char *version_string;
+ 
+-#ifdef MP4_CREATE_EXTENSIBLE_FORMAT
+-    /* hack to compile against libmp4v2 >= 1.0RC3
+-     * why is there no version identifier in mp4.h? */
++#ifdef MP4_DETAILS_ERROR
++    /* r453 fix */
+         MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0);
+ #else
+-    MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0, 0);
++        MP4hFile = MP4Create(aacFileName, 0);
+ #endif
+         if (!MP4_IS_VALID_FILE_HANDLE(MP4hFile)) {
+             fprintf(stderr, "Couldn't create output file %s\n", aacFileName);
+@@ -1141,11 +1145,21 @@
+         /* clean up */
+         if (container == MP4_CONTAINER)
+         {
++#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE
++        /* r479 fix */
++            MP4Close(MP4hFile, 0);
++#else
+             MP4Close(MP4hFile);
++#endif
+             if (optimizeFlag == 1)
+             {
+                 fprintf(stderr, "\n\nMP4 format optimization... ");
++#ifdef MP4_DETAILS_ERROR
++    /* r453 fix */
+                 MP4Optimize(aacFileName, NULL, 0);
++#else
++                MP4Optimize(aacFileName, NULL);
++#endif
+                 fprintf(stderr, "Done!");
+             }
+         } else