Fix build on amd64, reported as part of bug #513048 by mgorny and floppym.

Package-Manager: portage-2.2.8-r1/cvs/Linux i686
Manifest-Sign-Key: 0x4F1A2555EA71991D!

3 files changed, 32 insertions, 7 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 21e945a0a5e5..fc552bd090bf 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1094 2014/06/12 14:14:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1095 2014/06/14 08:34:17 phajdan.jr Exp $
+
+  14 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  files/chromium-ffmpeg-r1.patch:
+  Fix build on amd64, reported as part of bug #513048 by mgorny and floppym.
 
   12 Jun 2014; Mike Gilbert <floppym@gentoo.org>
   -chromium-35.0.1916.114-r1.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 40801ca9fefb..0f42716306e7 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -11,7 +11,7 @@ AUX chromium-cups-r0.patch 838 SHA256 f8a9e97c91b99474c968001a7fd58ee1996afd5f84
 AUX chromium-d8-r0.patch 334 SHA256 6c7be33f0e5d0b18edc06be416bd41b0a2567ee5463d97a20ecdd0421a1793ba SHA512 c83a3d6fd99f3396db2a05ddc0177e6a2027c6439a6c9dc4c9b57c1ca64887075f8e899ee899812b0c5f234ec3a513254ef1ee2cbeb32a38de589194a5fc8c10 WHIRLPOOL 60a47a08308d8a21615cfcc43501a5a4e891f10b0d1a31cd89f75be3a8f5d84b3c50adbc353aec8a51b35c590b03047bcc88327d2bf31a3299345afef9f26f84
 AUX chromium-depot-tools-r0.patch 488 SHA256 14d86770eaaead42e244007ebe5a94d188f8668c2598fa6042ada87a90cae671 SHA512 0ed853976c2e6f2cfe3bc4a7e2cb89bc5e32e9ed1bcc6b5fa8abac1d6a9384526a5204a3dc8cbcfc23b86bcd984e73ac772ca1741eea0884237fd6846c516623 WHIRLPOOL ebe1d5c170fb5ced7b8f4a8fe3e59eca145af54ef847b19eb38b5ced14798067033b43e9988b64a940bf43d3322d7b5979d4019fd378293b17db8bba9e23b84a
 AUX chromium-ffmpeg-r0.patch 1018 SHA256 9f0ff544b0873f9017b11b55128dd4c1be1825bcc55cc6e941aa60eb9eace988 SHA512 11e66153a904fe4ecca34129a2b7fb6fc3893647acf3bb740bea531e2d2c6f473a1e33940383fd954828a0ccca0e8480a4134a22c4a59b8ea846ab408feef2e4 WHIRLPOOL 8846d23bbdcc359fb6ea5fbacb44cbeef2e2ce1a6a25b0eb6d820b7b4afd75ebcfb9d886fcfe7d9bbe028da60f62f1d2afc9a7b3898092fa73cd2084382b8ecc
-AUX chromium-ffmpeg-r1.patch 1144 SHA256 dda795b5085261f8fa918f4f12ae8caeb61aba8e76b7adbeb054916bfdd736eb SHA512 ae1610fa068b5c430b8e2ab73b4884d4bba661227ba7d71e6f482c79ab7d2eb1ef1e5d9ef1f476d0a5d40ad3db81a3167b100f3625641ae400b0bd9c1414b268 WHIRLPOOL 06aab498225665a37a818dd86572bdf2eed1fb4b0994d67ca0191bbe03adf0e984e164dbc1e4abb6b8be2ef4b94be3eeb4e9f3f976b8d49c681ca556585be99e
+AUX chromium-ffmpeg-r1.patch 1710 SHA256 fecd12857fd0e3f1eb4ec4764a0214a4ddf4cc4c5c9c5f0a0c5e4191cd390974 SHA512 1ee7d47c3556244c0d2e4e1b165463bc8538a6915f58873edaba53549446d7d513ee77bd31977e8a442aa94d70876cfe68d410783a53449a5edf7b91d5cad968 WHIRLPOOL cefbadfe4a34e91d2ea1857780fec75b08f42c12bd5ed3856ea8c3059fba6d3e3a305d589761d99362418911ff214e8f2c09fac73326dee17f9e4d84d3c8d3b5
 AUX chromium-gn-r0.patch 356 SHA256 a1145e83d775101b28dcdceb3ca076fc7e9a4b9f69a1a2236d0c97ad39afb3d3 SHA512 e91a59ed1865efb394614c13b7ecde10c72002b1daba5c40062b970529071419d461d07aab17cd60a5e06e382436384787b940edda5694c4b87b30423129eb63 WHIRLPOOL dec9ecd10253ccc6162557349c013db7a17f9c53f735f1ad8f5b3cbc1cd8e20e553a882ea111c6808be7864f258447b3f0fd2fc1cb46c89b9c593e4460527ef1
 AUX chromium-gn-r1.patch 380 SHA256 b1ca3f17959be4fb6c031563b1ee587b7e990166c41b9d5b9dce2f91bf01fe1c SHA512 9112a0b2688e0e1fdb27315873f1b829bfc0221320aed43ac92988b65c9ceb50f64af8e77c90c58efd670d3932c0b0e4555f06c25e35ed5a35de9f2316c0df00 WHIRLPOOL c967b0c8e9e2e5484a25903692dec33f3f2abb26ae4d814ccb3fe0aac205710f217627057c58ba21e92f466eb2e5917c8617e826390523ced633751a0655a4fc
 AUX chromium-gn-r2.patch 386 SHA256 f307300f5a124d9b262f850b2c44fb250c150c07a0d1a44ef01a25145bb1c05a SHA512 f59fcadd4310a90f9c92b58024a81ad3d195cb593a9d535bc5fbdf5eb9e78860fb35c8b5550ea0020510d8b15992899821494b6c943a27a7e2b6769b9517111f WHIRLPOOL b3712f7d2f6c32ad9056bd1fc96c91c0c993eb1363d1842f7a8e9e65833a2ea8df4f830f42f2d51c4e3caada6a7f3f4680328f22a97f8080e5b7f638526f4beb
@@ -46,13 +46,23 @@ EBUILD chromium-36.0.1985.32.ebuild 20035 SHA256 cedca29f38fc50bba0723620938e56f
 EBUILD chromium-36.0.1985.49.ebuild 20035 SHA256 4674237348092501f5d105e37f831f86813b0731afa292408dfd71f2c832e88f SHA512 8d96224b565ad4f884e292cb05839140a2c5c7a7380f6a42c2ee1e2be8f0e14a3fc0a06324223ad11e8aa849fa191cc4aebe3a22c3de5bc2a9b995fbeccad9e8 WHIRLPOOL 32a4529823285f1dbee2227847fc91548817d5053bce45377ce99ac81a285dabaebd5bd83218c0a3c24981704bb5aba0a9f735d1b0f92d95c8407d72c1ab124e
 EBUILD chromium-37.0.2024.2.ebuild 17060 SHA256 5fe03cc7004516e38cebd3eb52de17ecb338ecca7f6e9aa18b94f39ebd15e12c SHA512 9cd5ec23a1717d950944af1cb9f6aeebbcb36cff5affc8eb1c668ffd2691694906a7d40040f3323735b24213d8704e999c9892bb9054c016b72210327818c63d WHIRLPOOL 90bdd5a1f7d370148a3fc246bafa90321bd73c27177b833e026873374329de162c2ab3949bf49aff346d07d04654d5186eda2a5ea298265eb0480d06eb1a2039
 EBUILD chromium-37.0.2041.4.ebuild 17238 SHA256 2a3bb3e3b80a1e10f1cca0e70b31776478379021ff9a1acc8bb678bb65a5eebf SHA512 b766df857f91c93020f2a0495dafe864b413eaa38781a1b925bb50b843c6f543be87ec9d745e4b63a68d9ba35beb9c3be7c69f6082375ff6e5b340e1c9bcfd7c WHIRLPOOL 8b38db7993240b1270134394ecb00c790a9564a7dfcaea2ed41956f641fc167d9f37d0524d2e771f168f89aa70c95b8feccfa6122a7ea95f9c46564ae3d9eb8b
-MISC ChangeLog 108549 SHA256 2307641af5b72079f538aa96b195effdf23c128b20214beaa801b4289067bada SHA512 84555f204d8e6c44d454a4508e9a888a3947a4afdd2b42c74a78788252dde306397a876654ac2d454066f5cbd9dbc8fdccefb0d684ed2f44bcf1ddab1ca73f24 WHIRLPOOL df4f0344107a5a1150fa24c316a575726d7f976b84053dac9e0270a9325893b91e10cb411c2fb2ccbada8a9ab3587162ef7717a09f6ea5a3b5f1ced86b3e6db1
+MISC ChangeLog 108719 SHA256 3109b882eb42eff0769935ca98e4c6ad7f7076649f596968dc31ac1b2094d329 SHA512 1a5adf301fe7a9ef91427c95b096693447bc8ad37604242cfcdfd43d3ef70b2605961e12cb5825704d241e9ed94b0e537e87d95955f9e484737e437c1e10f163 WHIRLPOOL c718001cb55650b02dd97e398d6164854374c72d9eb33f1dc79617849c30759dffaae3dd7910a79365d2944de856e4be57ce88205f8e055dce8c17d75fc918e4
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 518 SHA256 821944f32fcf203b2573c164aeaa52fbc69e5f651d366cdda66901633461f5ef SHA512 01d29c4ce93a8a624fc8926e7e72e8bf124b91ae6fdbf6e7179e9d6ddd6db33d73acde62541777118da1c9d197c83d6c615c247d785e76a8ab560f915abd08d5 WHIRLPOOL f9b21a0d032d1f78b6aeb78f759b9f126b1b1cc118a5edd3a08eefcb2d7b51ff406abb95323fe05b4c04468aca68dddd3d39ce7edfb9b352abc1bc3890d7e1ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlOZteIACgkQC77qH+pIQ6TThAD+MQq35hOxWzsm4JW20AFEEt8M
-09ijgTU+wUngqmXWU4sA/j3h+xe1sn0YtZ5Peh8hikA0VckO6Ck9v9hb1S2wM2YM
-=vx5s
+iQIcBAEBCAAGBQJTnAmXAAoJEE8aJVXqcZkdaRwP/RKBwTU3hhDUlyRzAoJzrgmO
+j8UEy7mZAHVuvEZux1yHscJdWlCIiU35AElWpSR+nb/cAAqYMR23TiEDt8+dtd57
+ZIzbwpBxfmv2mOd+sJ4yCNeJXIaOtjY5mbfySjMGPPgkl2dsTzKsmINax2L4Ee55
+5kU1rpfTV39/QqE23NcNOfVZyu8OnOsD5GZzEXH8CA2GYmanHe9a6EVK+U1hYQHR
+28AdJYVHzr+KwGnnXSiHaouC7rJ8HOYN+a0PbZ1II5vzC3OxVFysdrhaB82Pu4Ka
+Zz8TZ9+sKI7EfpdoPojUY52ESZ8t/QmJxz7LCLr0ljx/eitg5rj8Wmv7Qnn016Qy
+3rEAw6jRjoaRa0fNIJ1ajb+92ILgXgyXcsvhwK14liC9smcCcNITA8tXEujGHaZO
+4/FU9edd3Wc7tTTdls4X2481RDXVuxNz2Frr300WrZKpx+Ox7u3YRIn4z5yLTvgg
+ub3OrAwjqAlpaJDXQOUgoiIneoiUcwpsJQ4jkyW08p0DxktLVZG1RAZPQJFKh6gc
+gkrA/xwCehXAEGOlqqyJABpcuJbHxFiQJkaQi0pFGChEYGjBQ3FdbJxMaV9wxTZ3
+whJqZyyghUkwprtlo/fxmfcIfGL4Xjvuz5vq/DSqoDq1VlQL9E0ElaNHeEzyyyU/
+lZkaLKRLFsyAQb+bMgl2
+=ACzW
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/files/chromium-ffmpeg-r1.patch b/www-client/chromium/files/chromium-ffmpeg-r1.patch
index ed037ddb6dc1..821c9e7ca7b9 100644
--- a/www-client/chromium/files/chromium-ffmpeg-r1.patch
+++ b/www-client/chromium/files/chromium-ffmpeg-r1.patch
@@ -27,3 +27,14 @@
  
    if target_os == 'linux':
      do_build_ffmpeg('ChromiumOS',
+--- third_party/ffmpeg/chromium/scripts/generate_gyp.py.orig	2014-06-13 13:13:35.762996021 +0000
++++ third_party/ffmpeg/chromium/scripts/generate_gyp.py	2014-06-13 13:13:38.693099249 +0000
+@@ -131,7 +131,7 @@
+ """
+ 
+ # Controls GYP conditional stanza generation.
+-SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon']
++SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon', 'x64']
+ SUPPORTED_TARGETS = ['Chromium', 'Chrome', 'ChromiumOS', 'ChromeOS']
+ # Mac doesn't have any platform specific files, so just use linux and win.
+ SUPPORTED_PLATFORMS = ['linux', 'win']