Add workaround for altivec wrt #306881. Thanks to Andrew John Hughes <gnu_andrew@member.fsf.org> for report and thorough analysis.

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

4 files changed, 66 insertions, 7 deletions

diff --git a/media-libs/faac/ChangeLog b/media-libs/faac/ChangeLog
index 62c65375371e..b36fab7913ca 100644
--- a/media-libs/faac/ChangeLog
+++ b/media-libs/faac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/faac
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.80 2010/09/16 00:54:42 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/ChangeLog,v 1.81 2011/03/06 11:29:18 xarthisius Exp $
+
+  06 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> faac-1.28-r1.ebuild,
+  +files/faac-1.28-altivec.patch:
+  Add workaround for altivec wrt #306881. Thanks to Andrew John Hughes
+  <gnu_andrew@member.fsf.org> for report and thorough analysis.
 
   16 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> faac-1.28-r1.ebuild:
   USE="static-libs" and punt .la files.
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 529f7d6b7ba8..3add32ca947e 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 DIST faac-1.28.tar.gz 678891 RMD160 03902393488f04223aabdc804bfe77bb32a61c94 SHA1 d00b023a3642f81bb1fb13d962a65079121396ee SHA256 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
-EBUILD faac-1.28-r1.ebuild 995 RMD160 7eaab3e668460b1f51846cad6bcfbe0aad5c6fe2 SHA1 877c4c65aa81328330bcbf88c4be6622eb7dfa72 SHA256 1a7cf6cb31cfc75ac571bb306575bc8db07f66fe2e8ee265f0aed56b1aa1e711
-MISC ChangeLog 9839 RMD160 6cbbcfe2f13d9d4e6909602a48cc46f045575a4b SHA1 912965104400ec6b28b8fd04011fd90a01f69eaf SHA256 f130cfed7d535bf26b29a7883b31f86688723f0ff88f9c45e12f4c58595309b9
+EBUILD faac-1.28-r1.ebuild 1033 RMD160 bbbb7b800337a8f2777695aa0d6fa659abfe161f SHA1 759b7d4dc826bb81d10957b78f4423597515b473 SHA256 c1f2c0025f83a8075e5c67c03684964590a83a736d296e5ce2a00abfb9274776
+MISC ChangeLog 10085 RMD160 b44329ec348dd14b90c5adf98b7cfac2300d7f2f SHA1 a8652629459f723677f93ffb4de95f184ee467d9 SHA256 98dc58cd0925086a62b3c74358502f0356058c27f4f49f246b47ededc27e0fad
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iJwEAQECAAYFAk1zcBQACgkQIiMqcbOVdxRUuQP/R9o1Y118NSwUNNMZwE91WjlL
+p2ZTqIupAufCb7CYsMCL1N6D1wzS0sZVHKtJricbNb4bkaJ1neyaL7EFa2qvcXxE
+uAYVlMztJtKODCipO6FuR4P4aqy8o6AASpkThifOegC9gCZDs3ZMjem4UJOJCLDq
+2WnkKgEC+qFJu57+07I=
+=hCJC
+-----END PGP SIGNATURE-----
diff --git a/media-libs/faac/faac-1.28-r1.ebuild b/media-libs/faac/faac-1.28-r1.ebuild
index 7c9cfde1307e..74bda8406624 100644
--- a/media-libs/faac/faac-1.28-r1.ebuild
+++ b/media-libs/faac/faac-1.28-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r1.ebuild,v 1.10 2010/09/16 00:54:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-1.28-r1.ebuild,v 1.11 2011/03/06 11:29:18 xarthisius Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -18,7 +18,8 @@ RDEPEND=">=media-libs/libmp4v2-1.9.0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-external-libmp4v2.patch
+	epatch "${FILESDIR}"/${P}-external-libmp4v2.patch \
+		"${FILESDIR}"/${P}-altivec.patch
 	eautoreconf
 	epunt_cxx
 }
diff --git a/media-libs/faac/files/faac-1.28-altivec.patch b/media-libs/faac/files/faac-1.28-altivec.patch
new file mode 100644
index 000000000000..ae461efc30d3
--- /dev/null
+++ b/media-libs/faac/files/faac-1.28-altivec.patch
@@ -0,0 +1,40 @@
+http://bugs.gentoo.org/306881
+
+--- configure.in
++++ configure.in
+@@ -33,7 +33,12 @@
+ AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
+                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
+                             external_mp4v2=no, -lstdc++),
+-               external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
++               external_mp4v2=no, [
++	       #if defined(__ALTIVEC__)
++	       #undef bool
++	       #endif
++	       #include <mp4v2/mp4v2.h>
++	       ])
+ 
+ if test x$external_mp4v2 = xyes; then
+   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
+--- frontend/main.c
++++ frontend/main.c
+@@ -30,6 +30,9 @@
+ #endif
+ 
+ #ifdef HAVE_LIBMP4V2
++#if defined(__ALTIVEC__)
++# undef bool
++#endif
+ # include <mp4v2/mp4v2.h>
+ #endif
+ 
+--- common/mp4v2/mpeg4ip.h
++++ common/mp4v2/mpeg4ip.h
+@@ -123,7 +123,6 @@
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-char *strcasestr(const char *haystack, const char *needle);
+ #ifdef __cplusplus
+ }
+ #endif