Add fix from upstream for building with glibc-2.16 #426254 by devsk.

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

4 files changed, 74 insertions, 18 deletions

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index a9a76b03c019..e541c8b3241a 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/alsa-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.151 2012/05/05 08:27:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.152 2012/08/18 02:57:41 vapier Exp $
+
+  18 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/alsa-plugins-1.0.25-glibc-2.16.patch, alsa-plugins-1.0.25-r1.ebuild:
+  Add fix from upstream for building with glibc-2.16 #426254 by devsk.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> alsa-plugins-1.0.24.ebuild,
   alsa-plugins-1.0.25.ebuild, alsa-plugins-1.0.25-r1.ebuild:
@@ -655,4 +659,3 @@
   New package alsa-plugins, built from upstream's alsa-plugins tarball.
   Features jack, resampling, a52 and other plugins. Supersedes
   media-plugins/alsa-jack.
-
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index a300547df585..ae42f863e0ef 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,15 +1,36 @@
-AUX 51-pulseaudio-probe.conf 437 RMD160 6c481be7345f023efa92536c4ca0759890a580f4 SHA1 b02e0dc3ab9b4411630def4be0e925dd9a6e21fb SHA256 59e27621718449afbc8370af22a7185f9396eabc47894f940ad9775c04101939
-AUX alsa-plugins-1.0.19-missing-avutil.patch 489 RMD160 d32cfe36584809e4aa979a2ee12d4059607c710a SHA1 2a3e565e9e630fbadef45fe1643d78bb83d4be2b SHA256 8b3f3469043f0cf9d313f6a0869080f711e5c0635085f7951a7510b1ddb8168a
-AUX alsa-plugins-1.0.21-automagic.patch 343 RMD160 fdc54ada82c96919c027fd6468ae707eb0ace945 SHA1 aa22f83603c908159231100e7ba1d64965720b30 SHA256 d1342b93f7f1ad61ceb01e52b4d37bf2de418609bc737ba851c1a64cb1d639d5
-AUX alsa-plugins-1.0.23-automagic.patch 346 RMD160 59875c0f8372c16e38a232b05a9681c5d9b463ae SHA1 b05aca9232383e21c79915d096aafe357c9cab08 SHA256 fe30d4011c06c37a84ff74f467f37d3c6e7a43c01b436de49addf9a36f794840
-AUX alsa-plugins-1.0.25-avcodec54.patch 1041 RMD160 0d27b57784a93331532049165ee4c93b999b342a SHA1 a1c90ae74155b04ad04026f2abc6a2f4fceddb04 SHA256 8d1ae7cf337b2081b2501bf7e1fa45fa779fbc53e9fdd00d65777081ec1162a5
-AUX pulse-alsa.conf 435 RMD160 4de093dbba575a3c1fa15fec4a0614fc2d064916 SHA1 579ad8059e1f0a772add0469f6408a1a9b71b253 SHA256 375c30b3c3df309c219695af901cbc829e287fe1cec39880ca6a1255d7f8d9ef
-AUX pulse-default.conf 196 RMD160 8d6eda7a28dab00200fff54e2915c7a45ab1aa2f SHA1 ab25eb9d11357e220cbcf542f2ba384b9ebb29ac SHA256 331ddca02bf9324f924baa7ab14460d8878f1db917e509bfc8c314938c53c26f
-AUX pulse.conf 433 RMD160 6fa0c0dc8a33d4cd757a70e69b20d47bba2c7afa SHA1 4ec0c6521cb126b29f00f82555d92b78dfccfe10 SHA256 bdea4e706b353c4baca34583f0bab1b01b1bdee091d72c263102e531d6b0bf57
-DIST alsa-plugins-1.0.24.tar.bz2 329502 RMD160 70f14c04805a2c1ac34a23e507d6ffd031c12bad SHA1 3f8680de2e3f14ee74027f7e070b3fe416e19dd4 SHA256 fa8e12eb2dfeac083f117c03b3708a017531426ba542a8a729e4801d37861263
-DIST alsa-plugins-1.0.25.tar.bz2 331568 RMD160 757f19af4d86557568188e481391b77f36ab320e SHA1 ab66de081c5b0137943658a2991ba3d5efe91573 SHA256 a0e374fd6d5ee9683473a5b6e73dadde61d54851065ed670d6627d344b565aab
-EBUILD alsa-plugins-1.0.24.ebuild 2333 RMD160 55a429101a33df94b198f137c3f1562b993ddf68 SHA1 3cfaae8449e01fda41c4000059a04455bd154710 SHA256 2482828a69b5be7fcbafee7e9647364264c9535466a05efd491ccc9767b64557
-EBUILD alsa-plugins-1.0.25-r1.ebuild 2576 RMD160 bad85ef9daa4da672b5e6b3b12781fa579f98b95 SHA1 22a2b80908e2ee26e32160060af6cae14051b362 SHA256 670d08b407753eab3356d710e80a67801655d510ff72cc0796ee8f3c97bb2ab0
-EBUILD alsa-plugins-1.0.25.ebuild 2161 RMD160 50e187357ed32beac6c3c12bdb1ea8cfec5ccf7f SHA1 06f3b557fb3fbdacd2567a7144de7a8b7a64d4b7 SHA256 9b2c43093a9350e7c1e72dde8ccabcc2e80f419eceac2e4d20227ba770f9ceb9
-MISC ChangeLog 22951 RMD160 4b4c3913c4ba2da3b086fffa39e6f5f757474289 SHA1 5879e105c9a7941a9cfe56e418896ae4a29a8a2b SHA256 555a66381d06494914a95d28f6c8d1c34ec11f7ed1256d76b30bcb3c6084a92c
-MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 51-pulseaudio-probe.conf 437 SHA256 59e27621718449afbc8370af22a7185f9396eabc47894f940ad9775c04101939 SHA512 325c323ad4dcf03a4cf2528d6f5d6a0769c3e3d7bcf09c6fc11fb9cb61bef2cec1e8ad5073c07b6865ffdec4c32165cd80a7c856d13d538ff8320be1c83f9af7 WHIRLPOOL 5a964d1a130a110081d2868ffebb679721ee6b2ae078dd2d2acd832fb7b5b37b0cdd464716486f9b8a12f725efb82ed5d8ec6fb255be73a26fcd72946f355172
+AUX alsa-plugins-1.0.19-missing-avutil.patch 489 SHA256 8b3f3469043f0cf9d313f6a0869080f711e5c0635085f7951a7510b1ddb8168a SHA512 a983563a9eaa7a2cb3c8482689abbf2b90fccdc1fd1aab9ab631e7105fa4cb819b6284630f77c7a0a849d12406e0bc899dbd996eedb35703355365801d132e3d WHIRLPOOL 99ca63417abe57aa264ad337744856eca90f41a2b5373456c7af188ff3aa6f97bdcb8e2899ec83e1a163f7daa1d134af548f77961def614a1658e8c9ec136df6
+AUX alsa-plugins-1.0.21-automagic.patch 343 SHA256 d1342b93f7f1ad61ceb01e52b4d37bf2de418609bc737ba851c1a64cb1d639d5 SHA512 02001a11d2f625a64b6c35faf5da12b1748cd8d50f52931dad205ed0d354f54e7f4d32d8d11ab06cf588c8cd1ce497000a9799629f736bd39ac29eb73994ce17 WHIRLPOOL 93f4bbd024c0b98fa1880970cb9edae24c760c028abbb51f39a0614bf949232519ae436240291f9092f42548adb5db973a4d6b9a4ce96681a297bd4a6ba5600f
+AUX alsa-plugins-1.0.23-automagic.patch 346 SHA256 fe30d4011c06c37a84ff74f467f37d3c6e7a43c01b436de49addf9a36f794840 SHA512 e10f990a0138d83af93bbcb8848a588ed0a1dc643452352b75ca56e243979b69a07a1b6685dbd4c5ff6e32a3d2e98fcb3c0f5da35ff5645c0cae490ece3c710c WHIRLPOOL 89c7967ed0a20658468943424761c52cf8ce894093becdfe9e8ad637cc221bd7495b83e7d8a709774b45fd606abcdb79ccf361536405455bdcf0d6a7c6549b4f
+AUX alsa-plugins-1.0.25-avcodec54.patch 1041 SHA256 8d1ae7cf337b2081b2501bf7e1fa45fa779fbc53e9fdd00d65777081ec1162a5 SHA512 16797183efce9896eeb03bd7b5468ea0993133914b4dbc9a280b8297af17175f71c1b42842baf7d13d46967de9e42fd51372aa9ccd5bea08abbd84d5d0c8019d WHIRLPOOL b614707af0b885f7b329a1f37a9dc11c6b4764f6ae5fb289d149eb80151f3eaed0a9c04b324267da2d29f7864ebc314d331d7c7483cea6ce0f3acd568f22a2fc
+AUX alsa-plugins-1.0.25-glibc-2.16.patch 830 SHA256 d75cfbfb4c0ad89ea282c0c6ac6526a2eecdbf57f902bcc9451f52c8a1adaa65 SHA512 efb44179a640d28e5a5d58838861c6f2c0bd0c52cc76f3a8f04228836b9d577de8010aace744a763d497a661c8e49ff3ed7aa11917e46f81bdb1fe9cc6111fa2 WHIRLPOOL ead695486c44028c07d377d1458fae0329b3ba1e4d9539d9a578c12d7b2b784949952ce0f4f736a8ac75538292ea7a2a22098d5cce60dde30c6d3809afab1311
+AUX pulse-alsa.conf 435 SHA256 375c30b3c3df309c219695af901cbc829e287fe1cec39880ca6a1255d7f8d9ef SHA512 03318630d23287c9679b15460ff30f06ad236f0dedd0118f251e3d877873886efed78585d6cb010669d6c0e29fbbc6333767cbd418771fdc1eb76ffeb5f4a5b2 WHIRLPOOL 130b12ce106107091a82ab4837a6b94323005054f2d5ce15ff7b42e2b5497b09a76433bf959efdd38c1c578dcfbe6d65bba91a1bcbda25afd2b9450ec9236270
+AUX pulse-default.conf 196 SHA256 331ddca02bf9324f924baa7ab14460d8878f1db917e509bfc8c314938c53c26f SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e WHIRLPOOL 373d276717005df7531b9a517d5392d7ff6ac765d677819ffc59799cfa6fd944428008e7e6e827bc31db0ed861044576f45eea67137158bb5a543717e17b00f1
+AUX pulse.conf 433 SHA256 bdea4e706b353c4baca34583f0bab1b01b1bdee091d72c263102e531d6b0bf57 SHA512 025152cc3404f62e3ed6a3349ff4f87f7b2e414548174c49602c7e501748bd7c887b3c8b8ccfae4961900c5cf96f2cf5e107ccbb02562ca24f756e7cf42f0580 WHIRLPOOL 6f5a2a3414ba4a28b78a566991dc1c6d14abe1e480ff05ef638c34f270a8c315734eb1de9ce2bad5664914afc6ddecc55023b8585d229259ee4fa1d15b861b62
+DIST alsa-plugins-1.0.24.tar.bz2 329502 SHA256 fa8e12eb2dfeac083f117c03b3708a017531426ba542a8a729e4801d37861263
+DIST alsa-plugins-1.0.25.tar.bz2 331568 SHA256 a0e374fd6d5ee9683473a5b6e73dadde61d54851065ed670d6627d344b565aab SHA512 c396c386614e2faf39d6add82d925dcf4db47cd3cd2d8c6e786e9ce16bc7a14cff2b3c927dc49b7ff80e1799117494d6a5f0d97496eba3a5a3f91eb2258bab96 WHIRLPOOL 1a5f32bb1f3d68111ad5ac5ba22fa7edd47bd254be5d1d077d1433866ee0ee230c319c118e6cef5e7f25a7e14bbb79adc30e639e8cf163feff8a5a3f0042ecb1
+EBUILD alsa-plugins-1.0.24.ebuild 2333 SHA256 2482828a69b5be7fcbafee7e9647364264c9535466a05efd491ccc9767b64557 SHA512 cce37d52205114b8501c6b91c908993b588f260de3088b217e7bb4b9d01f51935240906079224e8614006fa889c1b40ba34fccff14ab1a55fc055d1702539aff WHIRLPOOL 673ee7feae4c7812cf241d37ea371d3bcbdd72fc6caa50974bfbf0dbe67f58dfad95b54b1fc4d0f6ac7cca9e4d3200511c0cd2963026f4b17bcc05bb12b42d20
+EBUILD alsa-plugins-1.0.25-r1.ebuild 2621 SHA256 b9097b8137f04c5c0c311a85fbfa9e2b50d6a94a0567dc39c8a924afcbd911a9 SHA512 0ea7db9e75989a2aa35d8745f73869eae241b4d8b96835fa1cd30fcfbd35ae405dcf41e75f72dcbe8718e070d00d241ba791e213a3e3a4266bc4fc61e9a540ef WHIRLPOOL 418e707384e5151bafabbb1155efd334424699c8da3811688deb90de41b00c39a09eb2479aa1ce1efd58c889b4a4e92f781c2f0531fea046d9d6ec9a71b5a54c
+EBUILD alsa-plugins-1.0.25.ebuild 2161 SHA256 9b2c43093a9350e7c1e72dde8ccabcc2e80f419eceac2e4d20227ba770f9ceb9 SHA512 3f072df2a0bc0db163dda54143d3e4a418375ffb284e577398dbec30a677a9d49c2db5cad3dfb72bf18d9fce0473698f9fc979e4ce470280153aa91d26975b01 WHIRLPOOL f641ca97f9d2ffe2169e4cd1f9165e0a9f550fff3ad340a0cf98baaf2e7c5ce5008accd7c64f067a467662f4c950bfd593fa3bf123b90dd24a4317be6a24b6d2
+MISC ChangeLog 23150 SHA256 cf23b6d34429fa444d5482750382ca56de074d89a7313599ec5573a080095add SHA512 825c2a597b636470234154edc8f6b8bc33294f5c2c486596d44644907c55c769324cae15d7310cda6f7ca76eedbb4cc88908b4d8d9392c32b18aaa75c540297c WHIRLPOOL 100e7a68c96a7c4d541fd748b5da25a656af728b09d7a72e9823fecd6077d9b25d1c128139b8b40c77e6618a16b6a4f910127cedd5c576661af3aa757b0d612c
+MISC metadata.xml 220 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 SHA512 bfa2051cacad9c45a63629f41143d807230d2c6470275bcfc1e96a16dfaa885905054ab76eedbb11a6b2414fb0ca1996ba8222913a8c6fd7d8219e48adb90fac WHIRLPOOL 38c7fa4c2a63df86caebb43afa06ed95650a09dec9cd676738d8074fc699820ca66a9b8a7f00d64747ab2adf4e348efa1249aaab6f6778b045be7d2372e27b42
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQLwSvAAoJELEHsLL7fEFWTpEP/jFpHlS+opOR/zjCygw1FKU6
+lLnUB6w33h30QIURpM2DlZl5otNfkz8dgxCFHcIxOpE9l4PbwkGIHzV9Vo9thdM5
++O2bP9URvqlAyJdvD2TQX6qBIzaRtiQVOfhKJ/5cZ/E2sNykzs+rSi3f05/k7fz3
+blzyS4LzmU5O1QtBjBKg7ofS3Njsr0mlf8Jf1TzxOSoZuXjlfYi9BitDH9GpcRzV
+H06rfQid8Gl9MiSIGGgDxkLK7jteeCQorSouW+eYWmQoCWwYIhcw79pgnMy1yzxV
+GCJvCneTgr3K2vpWhFUKKKh1oncQ6tWhCIZ/G5mAGp20w4xWl6x3HJqKtFkCongx
+GA+goGKZk6q/2yhvg9mjmcvJVCQxHXr4c+C0FwcVZS5X50DPkauNcrNof30K2JaG
+6IPSDJ2808DS/2oD8Qd4eS9SoDCfEp8Uuy3Jk6OA6hbPTdebUVUciuJC7euMPdEv
+hDiRl0WOjxC19sGnWW2ZE8nHEuR7JukwT8+pkK2vsQXJ1ZAb4GVe2r4egIFpTlIS
+L34lJNyeAowjz8qhtnuau3ecuwWygLxTSBcYb1+qmGSiQPUWVmzfknVKFa0lb7Xa
+LHo1VzZMZXf+TJTwv0lxXgVOyq5a428c/W2IBhzXCmCKJb0YHNCovBy3am7L3CN/
+i18sjx6vzy1nxJ3dhECc
+=SR5n
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
index 613d2912e726..8b34cd00b981 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild,v 1.10 2012/05/05 08:27:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild,v 1.11 2012/08/18 02:57:41 vapier Exp $
 
 EAPI=3
 
@@ -35,6 +35,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.0.19-missing-avutil.patch"
 	"${FILESDIR}/${PN}-1.0.23-automagic.patch"
 	"${FILESDIR}/${PN}-1.0.25-avcodec54.patch"
+	"${FILESDIR}/${P}-glibc-2.16.patch" #426254
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-glibc-2.16.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-glibc-2.16.patch
new file mode 100644
index 000000000000..2942c47fde45
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.25-glibc-2.16.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/426254
+
+From 81ae188c8d1b42d187b97846e3b31479a00d4720 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Tue, 31 Jul 2012 11:18:54 +0200
+Subject: [PATCH] usb_stream: Fix build with glibc 2.16
+
+_GNU_SOURCE needs to be defined at first.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ usb_stream/pcm_usb_stream.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usb_stream/pcm_usb_stream.c b/usb_stream/pcm_usb_stream.c
+index b1fd68f..8220849 100644
+--- a/usb_stream/pcm_usb_stream.c
++++ b/usb_stream/pcm_usb_stream.c
+@@ -18,8 +18,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  */
+ 
+-#include <byteswap.h>
+ #define _GNU_SOURCE
++#include <byteswap.h>
+ #include <sys/mman.h>
+ #include <sys/shm.h>
+ #include <sys/ioctl.h>
+-- 
+1.7.9.7
+