Fix broken build with gcc-5.1 that makes Firefox segfault (bug #549612, thanks to Gabriel Marcano).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

4 files changed, 86 insertions, 6 deletions

diff --git a/media-plugins/gst-plugins-faad/ChangeLog b/media-plugins/gst-plugins-faad/ChangeLog
index dda36b926372..b8fc2991d492 100644
--- a/media-plugins/gst-plugins-faad/ChangeLog
+++ b/media-plugins/gst-plugins-faad/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/gst-plugins-faad
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-faad/ChangeLog,v 1.176 2015/03/29 10:53:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-faad/ChangeLog,v 1.177 2015/05/25 22:48:38 tetromino Exp $
+
+*gst-plugins-faad-1.4.5-r1 (25 May 2015)
+
+  25 May 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gst-plugins-faad-1.4.5-r1.ebuild,
+  +files/gst-plugins-faad-1.4.5-version-check.patch:
+  Fix broken build with gcc-5.1 that makes Firefox segfault (bug #549612,
+  thanks to Gabriel Marcano).
 
   29 Mar 2015; Jeroen Roovers <jer@gentoo.org> gst-plugins-faad-1.4.5.ebuild:
   Stable for HPPA (bug #534012).
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index 43355d7f617a..cd01854f4039 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -1,18 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gst-plugins-faad-1.4.5-version-check.patch 1428 SHA256 0e1ccb5bbf46eca2a542b4e59c59867fb55fd6e4a3dbac7186d84d0ef4e02d6f SHA512 50d1b170cc8ed01dd8eb10f7bf55d5826ba830be2296767fe050e2e1320b2c4b953db46148d4d257abd911f85b2057d0ca35ecf1f73fd54b6a71ebd3b037c73c WHIRLPOOL e134732ebe653a5d4c8bad5dbcf99366a47710243c7c03dcdf9278a7083d5eefc793b8fac9151ead5b68e4f17f1256ba2f7226e5598b148142cbbdfbfbb4bdf9
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
 DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
 DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
 EBUILD gst-plugins-faad-0.10.23-r1.ebuild 471 SHA256 d022efe0da8fdd341a6a1244bc72bb344a2fcca13403affd073e568bac9488ca SHA512 e0d85e42d98835c1a02662deaf35028c762615d091ce488eb26bc3aa39124452d41fbb377abc11c6f9e49bb62944cb47125dfc1287e21b90ad727d9aac06ac29 WHIRLPOOL be14b002370ef67f5a025e51fa9683aa5ec1e522ef2d64bf40c7b7e862f4e7331553543667393de67495b1eb5329a6fc100e82a169f56cfe86bbd921f6c9cf97
 EBUILD gst-plugins-faad-1.2.4-r1.ebuild 469 SHA256 e39f4176a5ac0f6eed6b703c60fbf14625bdb5be7c83edd95e7e095320a4525d SHA512 8cf50fb1c10240f68dc399b8be56b37fe8e5597b071b8efbff8558df9e2c3cf1142427e673c72ffbc223c3d13185ea6b457e899188d47aa30ba33576020671b1 WHIRLPOOL 5fde5217ec7b57a0399a1e1c86ba21d155ed08a35ba34bdfe5c727b5343edc6866508bf2751f0ab03afda42bea3d989ec37523cf39c73294b0ab2e932292da67
+EBUILD gst-plugins-faad-1.4.5-r1.ebuild 626 SHA256 07939a676e4c7fa856be6eb74ee13c98fc07da3e177aec6f83a8ec2dc761d010 SHA512 8f01485228393a45f828416902280702fcc9e85530251dc8527d037929e3e3f95c694da7ece26971f4df6fe0790733141b17e29bae45b92b8d666abd096533de WHIRLPOOL addf40a3c22d37c5b5ce6fe10f71da9061f080ea906cc1ffe76008a64feee8638d0f9ace67b65e4502afb3c537abadc887c844081a9c8cc21edaa56466e0b8f3
 EBUILD gst-plugins-faad-1.4.5.ebuild 468 SHA256 156c9bac2a295f66491b53262790c5910db6ee331b969071d5892e456743e68e SHA512 0c2dd4f5d1a46e6b76ce0d709786945af04da8cdb2d62a3db83aba6f48fa35c8bb1c6d9c7998812d3944ba721359dc42bd08b06e4b92fa7394fff27a3dc539d0 WHIRLPOOL 76af20445706f816d27c95abc65db30b3fd5cf8bd2e3f383ff61d22806da713b2f527a8be2e3d7a2b592db2ff2bb2b79507bd9fb3526441b810dd2e08bc8c926
-MISC ChangeLog 22942 SHA256 d7a62666b6c34c3ca88333a00b07f5321f7b55010ed2ef1420212a513d3c02ec SHA512 086c4311401e32086417223ab8aec167d1042d0d5ebf3617be83d121c2e25a2dbab2698b8decb75d404f71748db9867c73549f24aee1539f8951f9a8511f9443 WHIRLPOOL 1e187ed0fa1da70889c3c3b8b9c32b5d42c43f496a495fdb575990622162d03329fcd4d31c749dee3c381ec79f60352d518f5981dcb07d4eedfa61e1e1556548
+MISC ChangeLog 23244 SHA256 63652340aecdbe9c2a92214f6f30413197a0389c1417d7e46d855faae17b17da SHA512 379edc825367719afc248bdb06ecbb062c10633ce0978d7cb471a4898afeedf77e6d65193a5473261f43fb5a16eec3cf33425715fe5ec70e7a51c90dfd783cf9 WHIRLPOOL 68dd490c6703a69fc26a90a6d219beb85dd9e92715c4196aec5514a02c98f305cd3183bdecd31a6ef2e96ec4ac11060284f35c5cf7c40f222bea6ec81bd20e46
 MISC metadata.xml 162 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1 SHA512 8b02f1dfc23c5609db66995b8b5f3b371d7c9ec232bd8117177af0522cd521f0217f5b49fb512213cb3db606c00df2511e0874ca0cac490ded306a8ddcfb5185 WHIRLPOOL b6621e0156545e7b124a3f55c2fe03a8878eb44d1b54fc3373adf9915dfe9c57a411741daf8863af74fdec93bacf929e905aa50954f906cec098bf0c4ddf2652
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUX2ZQACgkQVWmRsqeSphMnigCeNxCFO8/agNf+w0/zlxL5ih6h
-28QAnjZ8Na7ewzs4xEL3J1amqP7FwM5J
-=Bm+t
+iQJ8BAEBCABmBQJVY6bIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNXyYP/285mh/erityM6NCtDGIROYt
+bEIjqHfTrvmp0AlVqg7Mz5yIc9kJmcXRcKnnJ/xHYo9ZXsvp2qkJFILQ5HMXVsci
+RJFClEkEz9R2i7lxjJh2eEYxuqefUkzwi2WMg8tiJCdWAyYWTRyFXJGeONU0d2Qt
+JD2a+v9lPCIIzx9OUWLjtp8y6O39kjY11GGmR+H3lARz3gpmwhtu3yxNSYkSWTzX
+Si9XZazCgVGjPiQ8cq+mTYVJmIVCvV3+p6usbz/631EQiChz+eSPOmBglJ040wSD
+1KEybq8QGhEm8tEcdgnZzpp2zAIj4FVKy1FWHsF1bAeh+naQpvuywrubrVZsJyFJ
+uv3ZKlFJaJ3Wor2orXwOh6RI0WmiDZGzJSiAYT56rY/QHGv6RAugTi3zg96G6zZo
+vaytfF0BlUYEttoi3YkvY8SZBdsm7SB7vMPGQb9h+c7pBRDdq400+6Q8Wc31jS1K
+cyVy89w7yjC/dVBjljb3EjttGbS3AvNbc36P4qX6O+ys90rPDaIP0LVv0Dk1ktBD
+H+jYQ4eEAVox3vjJIrVGbKxiOjtY6/7PG5znXPjpEiDrCMHJVxk+yevhWRyD60sY
++M3p2c5gMEThTtnxoCbPZZ3ThaG+e7TWo8sKL7OgWowaWOQ7hbEi+wFqU7VgITmI
++G9YXpWSfag0fSLDZF+N
+=jKye
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-faad/files/gst-plugins-faad-1.4.5-version-check.patch b/media-plugins/gst-plugins-faad/files/gst-plugins-faad-1.4.5-version-check.patch
new file mode 100644
index 000000000000..fdcdc7554482
--- /dev/null
+++ b/media-plugins/gst-plugins-faad/files/gst-plugins-faad-1.4.5-version-check.patch
@@ -0,0 +1,38 @@
+From bde0f119097117cf0256e450af4267a47782260b Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Wed, 13 May 2015 16:23:26 +0200
+Subject: [PATCH] fix faad2 version check
+
+On fedora 22, the output of cpp inserts extra debug comments, which
+makes our regexp for the faad2 version check fail. This in turn causes
+it to compile with the wrong arguments passed which then causes stack
+corruption and crashes.
+
+Fix this by only checking for the version (which should be by itself on
+a single line). This is potentially less safe, it might be possible that
+a similar string would appear in a later version in the header file.
+
+Fixes https://bugzilla.gnome.org/show_bug.cgi?id=748571
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4e2823e..c56295e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2050,9 +2050,9 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
+       AC_MSG_CHECKING([Checking FAAD2 version in $faad_hdr])
+       for minor in 10 9 8 7 6 5 0; do
+         if test x$faad2_minor_version = "x"; then
+-          AC_EGREP_CPP([GST_CHECK_FAAD_VERSION \"2\.$minor\"], [
++          AC_EGREP_CPP([\"2\.$minor\"$], [
+               #include <$faad_hdr>
+-              GST_CHECK_FAAD_VERSION FAAD2_VERSION
++              FAAD2_VERSION
+             ], [
+               faad2_minor_version=$minor
+             ])
+-- 
+2.4.1
+
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.4.5-r1.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..9f083694d851
--- /dev/null
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.4.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-faad/gst-plugins-faad-1.4.5-r1.ebuild,v 1.1 2015/05/25 22:48:38 tetromino Exp $
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit autotools gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# From upstream git, fixes corrupt build with gcc-5.1
+	epatch "${FILESDIR}"/${P}-version-check.patch
+	eautoreconf
+}