Dev channel bump. Fix bug #513048 by mgorny. Remove old.

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

5 files changed, 104 insertions, 17 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index fa8b30fcda2b..2f72dcb5831c 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1111 2014/07/30 01:01:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1112 2014/07/30 17:46:54 phajdan.jr Exp $
+
+*chromium-38.0.2107.2 (30 Jul 2014)
+
+  30 Jul 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-37.0.2062.44.ebuild, -chromium-38.0.2096.0.ebuild,
+  +chromium-38.0.2107.2.ebuild, +files/chromium-ffmpeg-r3.patch:
+  Dev channel bump. Fix bug #513048 by mgorny. Remove old.
 
 *chromium-37.0.2062.44 (30 Jul 2014)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 674d7ba08291..0871a30abad4 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -13,6 +13,7 @@ AUX chromium-depot-tools-r0.patch 488 SHA256 14d86770eaaead42e244007ebe5a94d188f
 AUX chromium-ffmpeg-r0.patch 1018 SHA256 9f0ff544b0873f9017b11b55128dd4c1be1825bcc55cc6e941aa60eb9eace988 SHA512 11e66153a904fe4ecca34129a2b7fb6fc3893647acf3bb740bea531e2d2c6f473a1e33940383fd954828a0ccca0e8480a4134a22c4a59b8ea846ab408feef2e4 WHIRLPOOL 8846d23bbdcc359fb6ea5fbacb44cbeef2e2ce1a6a25b0eb6d820b7b4afd75ebcfb9d886fcfe7d9bbe028da60f62f1d2afc9a7b3898092fa73cd2084382b8ecc
 AUX chromium-ffmpeg-r1.patch 1710 SHA256 fecd12857fd0e3f1eb4ec4764a0214a4ddf4cc4c5c9c5f0a0c5e4191cd390974 SHA512 1ee7d47c3556244c0d2e4e1b165463bc8538a6915f58873edaba53549446d7d513ee77bd31977e8a442aa94d70876cfe68d410783a53449a5edf7b91d5cad968 WHIRLPOOL cefbadfe4a34e91d2ea1857780fec75b08f42c12bd5ed3856ea8c3059fba6d3e3a305d589761d99362418911ff214e8f2c09fac73326dee17f9e4d84d3c8d3b5
 AUX chromium-ffmpeg-r2.patch 566 SHA256 fdbff9c17a7074b27956f1205d5aaaff5457f60af4a4e7df6fe2350a5db7b19b SHA512 e90bd77ff38226d43e74ebec9e75421c760948d80cca0cd09ac9c895d6cb528dca53c38e91b4d983bdf36c2fa30b8150c36a9499b9b94b54690d4f0562d42881 WHIRLPOOL f6574972b3cdd1931e49563a3223d28390d40a5c38334a022e1d98bdc693da47e1e9d34adf11b63842843f9a08b225e9e9e6f5d55f1265447b10d13e965e6494
+AUX chromium-ffmpeg-r3.patch 2300 SHA256 abb231a7ada44b8d67fb2e6bde0150264f6bd5dc3d1b9c890e8b29259532ac26 SHA512 4114101a79899da0bbc403ecdd0d3343d4baf168a2325da95de5850ffc79138788cbd8f7f2bd96417a6d1fc6a2e342a1901428eb67ed1605f5b03ff3d3b78019 WHIRLPOOL fddaca3a34eb5c7bebae44a27b157c9d384fdf3176374527f95c8807cdd1f3b098a55592db423b8562a5e815704d4dbf7a7d22ad53be029d37bdbd2de5ab0721
 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
@@ -41,20 +42,30 @@ DIST chromium-36.0.1985.125-testdata.tar.xz 111516748 SHA256 566530e718daee0ce0e
 DIST chromium-36.0.1985.125.tar.xz 205462088 SHA256 1782d0a5397e94313dee9e456de38bdfccf575c4e565f064a6ed7f9c509d5023 SHA512 a2c0f9b9fc91526ee053f0eca1aa2c6267b316717b8cb30bd5c50cad8891c28e1bf804838b2af035df46771d29d6815610066437d32afc504fbe39d2c48f303c WHIRLPOOL 3ee0ba43b0a3f93b4b7bededbe8443f1f9673a1c0712b7db09411ac96fe05327c835475ccb7298800b40c32dcac56573c0cf035f092ae52cf353b075c81fb16b
 DIST chromium-37.0.2062.35-lite.tar.xz 214296572 SHA256 0cd76f90031b51266ef9b6301fca5447fee341c6fd31ca8760157fc40cd9eaaa SHA512 d9da7460f829d1cc18e0bbfb683226c3a1d8260fa5a0613d5a0ec6db05e04eab8f3c1d0d6c0ccda5f32a619a8a99992fdfbb536d84f841b0aff7e4236bfd9431 WHIRLPOOL d1feb60b8bb9fcb5764b661fabd9d64f4932e21afc40a2f0ae912300246ca04e141f366a06ea72290d333c2cf9e66f69859e312915055ae3ca63b54ce3f438c1
 DIST chromium-37.0.2062.44-lite.tar.xz 214300252 SHA256 c8cb12ef7c61991a6044c2fe13950bec7e3d56301fa043869b3845406f1e3aad SHA512 4a8b1f3755674b846a812c1e7410f295619df4604164c350b0d76bfc0aac452fbcf779ba690da966c103d373689cda6db1eaa795c15f2ec9a9a993cad3c901d8 WHIRLPOOL f9b2989a615dfc2896825cda2b50e62a32e51ac2adfc551d7c0ac59576c2b472ff8a1c67cfb473289c181d714999b54a1e91aae11c277ab720b42a539c9cfe64
-DIST chromium-38.0.2096.0-lite.tar.xz 216747852 SHA256 f623f2988db893ff83b49f86c2fe9f911e00a4c55792464c93ce8b61b286729a SHA512 f98a1132cb6ea3857630462844f83ad3b952a2d1dbc228d8bb5b1fcf888ec45f909a8bac174c316b2d4e533fa715cb98eba238cab5ad04b61da93c03cf78d3b4 WHIRLPOOL 67c5490a474b2288df01eb5cfeb0b70853721685500357b2a31da1bfbb6668884b61cb8ba6b5107fac8bd0457133091d26a2adf57d6fc776b84a072ad2a309d0
 DIST chromium-38.0.2101.0-lite.tar.xz 219453756 SHA256 09ca3662caa376d62f66597f80e514656cb68c378894848e7f4034395cf28e7d SHA512 8ee05cf986ded8779e146826478d6e52504391b5603d104230dd703cfe2e3327667d7bf8b193b3b034048765e7c3ca6375189e929dc5c330e5d8ee974803121c WHIRLPOOL 2ff39e511da5cecb9af964e376ac536fe2dbaf11b7a4abbea4d3615316cf8bc13b800bfd37e18ff98d3c1f6dffedd29f0d98d01c6b40970283793d762474e04d
+DIST chromium-38.0.2107.2-lite.tar.xz 228350836 SHA256 7f31275be73c6933f785803b89b6f627ac6ec184d28f395aac724d736debd43e SHA512 2c17853f510d8c489993d2e07ad6e007398d429183938fda5c40293785d13bcf4db376c6077542735889aef9aba5051944e146ec94970358ec9496ad690d9bee WHIRLPOOL b9f98b030a175addfa1028444ae0f682443a89836146242671c1670069f711edbf615a095caf119696195fce6525546633fc48b651d3c40f8a97a00a225bec77
 EBUILD chromium-36.0.1985.125.ebuild 20024 SHA256 d059a8f1c1d4c8a8838d272a2a10bb60eea0a05056e4a073df100529d5714183 SHA512 593b0ca1ed6c1fbdc15b9b0c426f54df337e7031d75bf468b3a3997840309c53c0c59178ad02e0d69de3c9f4a2db19319fafd745141a94f3c8f99ab1feed3722 WHIRLPOOL 52166987d30626c9dbf68ed78c5ca35cbe8d423e2d2f80a5d5bada34f8f0793a6ddd0330be5d4a84235162358e33db045e3b1edfdc5b0de6373dac40bab8189f
 EBUILD chromium-37.0.2062.35.ebuild 17558 SHA256 ea6ce35d7c8ea3ec71461fedd4ccc2fe7cd00ccbf1bb0932feb357abe0a80ec8 SHA512 0570c00cff65ae488dd14df7f7dc2f3ea5b70d5b91f31641033c647b681e97e4f27f7a2115f07dd66d0ebd2e5308ebdf6df4d4d2a15d3e6c3d5ab9288308a747 WHIRLPOOL a4aa59daf38afb3c24ce90843a93ef8d4ddc4f37b520ed55aa739321c8bad9c076651265ebad2bdbab8fc00e4c5e1f0fb456f03f8b3787ac36b17d8a38485e46
-EBUILD chromium-37.0.2062.44.ebuild 17558 SHA256 7ea61da993cdf6b7c6a393830d6ed59becea5cd58666eed793b5ece77f3112a2 SHA512 9495b2e6fde84b97277de3fb32d0ef6bf8010a72ae259340242eac797be1fb0136d4e0e4b8f2e68fa402120b454afcebce4d398d5c419272f2e5fe8152425f61 WHIRLPOOL cc30ee2f616e75b41a63f2c137902cf0b4fbba06d3ec13b15835fdb36d489410e8ce8a46794326833c68851fe9fdd11fee82bd4c3b3728e478bfea31fa046e02
-EBUILD chromium-38.0.2096.0.ebuild 17659 SHA256 2bf9e600e74bfc5fb01886de80129594920b17abf064cf0cfc6440d80bda7557 SHA512 84868814a14de1e0869a26a3d67d526fdf9b6fd1a908d06dfa261f063a362571a7fc18abb5b20c30eb45624b499e8db689f4dd4d8ed6af605d393ef02f52a6a4 WHIRLPOOL 1c9877d810f97b7b33d73d1fca6e1234f791e3bc41fbf06b9af77f34e1a7a3f39d863eccebdb1a6731a4953132c134db3287c3ea06b37fb6ad912bfd10850e2a
+EBUILD chromium-37.0.2062.44.ebuild 17705 SHA256 5d83270836f9969df534f07ca3ee43035bdef7affefe0d2c3f2f6349a6ad435e SHA512 7804f06d32b1ee85db14c13d83fa64c2eebffa33e7cf8af9c76cc4e0c1fa02a6f1febb5525f327532b7e04a68fd12c86ae9efb8924dc81924dad57bbe17501ff WHIRLPOOL 19a76afc1cb2dbff9a28c01f72adfd464dccafe8b14a50b5a70859d36e3a1baf7d7b4607de527dd46b89cee85505426d4c46f66fd2535a837183a99fcca20e1d
 EBUILD chromium-38.0.2101.0.ebuild 17590 SHA256 c971e85c449f33c2ced56cf56d13ac738e363b9b6f669a9412fbb50423c01291 SHA512 7bf7ed41bccb640d4a874ae1354a46b63695cf96c77babaec3be70340cec0df7e1d3e135d5ec04eb0bc295c1d30446cb0cb2b417c5742377921f98212abded70 WHIRLPOOL 715325cf82e4fc221c38b07b21e41530109196655533b544c85b7b55940b0d2649c6b7f7c6697335462caadd828db22526944352c07f4f0ed30fd03c644a5886
-MISC ChangeLog 111487 SHA256 10b99c9ad892bda44594b71f1599ee53cbbdae40705bb8698ba3d461c7ac9f11 SHA512 4659ba618aba473458c5859a865f545399c45e4f0395bd63e5d8dba24c80c4cfe875d61ec1fa016d118af976e83e8738f2cc7dea83807443c4339fa6739d3e5f WHIRLPOOL 22a3d1e7eb2685fa8e8eb2500dbc15ae709f359a328b277c982843f6a94900637a03a51970935649bb4c8cad3805828e22ff768c243a377f1b02788d6ab5abc5
+EBUILD chromium-38.0.2107.2.ebuild 17681 SHA256 ad7cf12a0e68bd69c51ef583c93998e625ca2e36b81b940789b48ee0998463a6 SHA512 60a04be1d9a1525ee304c1ec62aa61a67583a8f19989419ae37b162db2fe8ecb974d2d81d7e2d7eebcbd941dfc5694416976605f7b4725b80a6269f679d31380 WHIRLPOOL 60440790fff41972844638a1c1bfb721f36c18342359c8eeb603f3a4abc4bfbbcaaf039c58e32672864e0836c17108f2ba9e105c235a99644c4404f540f2a943
+MISC ChangeLog 111769 SHA256 833dbbb6a7239284a4b6d3bdf4559437f8bba0df11450cc4eac58c7ba138c3c0 SHA512 f559865703928186bc2582bf2c71977d86ace91d877c49baefa8c957a21d09ab308c83953b52005ebe22a861fc41b59d52723c949a6c1d1170be0ff8cc765234 WHIRLPOOL 900d676f6b45f8132dcbeec54b80f97651fe52734b7d7174b2d7f12fb0aa8039ad915fd612b488cc184c7a3d4811c6ec8cdeea418bb7e06261e3a8568b957158
 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
 
-iF4EAREIAAYFAlPYQ/gACgkQC77qH+pIQ6QpYQD/fuTHgE+x2e+z/7y46pgg+Upz
-OnQkBpef7qASdK4b4AsA/1jDL+lr8IDqKPmY7sCjQSRCKx90CVl7jc7Vhe+cNMOm
-=MZW9
+iQIcBAEBCAAGBQJT2S+bAAoJEE8aJVXqcZkdIg0P/2M3Id32q39uWYpZeP/eRloY
+fxW1NLzNn/4YeKpL40mLfNv1lOj2jJyhGExH12FbXHT5+12Kpf3l1liG+DX79Wun
+IV0YNUm67MHnvBsBt/HHc7DpMwrjqgYiQFt9bYs1Of+EsrUMwlkuNHT/lpx0yDSm
+0sUhDwDYm8jsJ22N7GY4i9UW+5WcBzeVlFzCZiLLhHar3otq0MLmxdEMI1mcpcvJ
+LNZmAYoLET5xtVC5BOsl5JxGY9jJCh3JEt0j+hAwAfbG/+ogTSC9eUvoWRDSuZdT
+gY/ozpqxgv7TcVnEvgK3p9ePKOg1rw9WG6UBh9mcjzEe9DfXE7tzrHLcRwY6naOq
+6Cqp1e66/jqXQ2Oo1avJKuscCDbGLkadKA38nFr3wLGo/93EKWBPe8SB/6ThPxun
+6QMJtXcBAeKeAihZl2lmUR2gGFFVHshQmFOSBKHzFD0UkRP2Ao4ULaU7HTeAMLjU
+fIXUXbHv/FUspA+kdBdFr/hIC1VLIo3hQwi+dz1/XuXKJ+hTA6rc5k3Gy6eXtXMm
+IFhvc9fYVjSCXu+epmWF1OwVXA/NXdyIdqn2KW56BP41+UlWuh/MvFoMEtLslj2F
+I/9IKfIuQdGMIwb5D5x+s4t0wvfd2m3w9y5c4ad2qM45zLgUuQV86yirS1e+rrUu
+2JfwtvtDQWDGoy8JBJn4
+=uh2z
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-37.0.2062.44.ebuild b/www-client/chromium/chromium-37.0.2062.44.ebuild
index 4939b87ecc1b..ec00be6d0e00 100644
--- a/www-client/chromium/chromium-37.0.2062.44.ebuild
+++ b/www-client/chromium/chromium-37.0.2062.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2062.44.ebuild,v 1.1 2014/07/30 01:01:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2062.44.ebuild,v 1.2 2014/07/30 17:46:54 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -171,6 +171,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-angle-r0.patch"
 	epatch "${FILESDIR}/${PN}-ffmpeg-r2.patch"
+	epatch "${FILESDIR}/${PN}-ffmpeg-r3.patch"
 
 	epatch_user
 
@@ -358,10 +359,12 @@ src_configure() {
 		-Dpython_ver=${EPYTHON#python}
 		-Dsystem_libdir=$(get_libdir)"
 
+	ffmpeg_branding="Chromium"
 	if ! use bindist; then
 		# Enable H.264 support in bundled ffmpeg.
-		myconf+=" -Dffmpeg_branding=Chrome"
+		ffmpeg_branding="Chrome"
 	fi
+	myconf+=" -Dffmpeg_branding=${ffmpeg_branding}"
 
 	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
 	# Note: these are for Gentoo use ONLY. For your own distribution,
@@ -444,7 +447,8 @@ src_configure() {
 	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
 	einfo "Configuring bundled ffmpeg..."
 	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} -- ${build_ffmpeg_args} || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
 	chromium/scripts/copy_config.sh || die
 	chromium/scripts/generate_gyp.py || die
 	popd > /dev/null || die
diff --git a/www-client/chromium/chromium-38.0.2096.0.ebuild b/www-client/chromium/chromium-38.0.2107.2.ebuild
index 5af7bc9a31e8..6750214eb6fa 100644
--- a/www-client/chromium/chromium-38.0.2096.0.ebuild
+++ b/www-client/chromium/chromium-38.0.2107.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-38.0.2096.0.ebuild,v 1.1 2014/07/21 16:22:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-38.0.2107.2.ebuild,v 1.1 2014/07/30 17:46:54 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -100,6 +100,7 @@ RDEPEND+="
 	!=www-client/chromium-9999
 	!<www-plugins/chrome-binary-plugins-37
 	x11-misc/xdg-utils
+	virtual/opengl
 	virtual/ttf-fonts
 	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
 
@@ -169,9 +170,7 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-libaddressinput-r0.patch"
-	epatch "${FILESDIR}/${PN}-nacl-r0.patch"
-	epatch "${FILESDIR}/${PN}-pnacl-r0.patch"
+	epatch "${FILESDIR}/${PN}-ffmpeg-r3.patch"
 
 	epatch_user
 
@@ -361,10 +360,12 @@ src_configure() {
 		-Dpython_ver=${EPYTHON#python}
 		-Dsystem_libdir=$(get_libdir)"
 
+	ffmpeg_branding="Chromium"
 	if ! use bindist; then
 		# Enable H.264 support in bundled ffmpeg.
-		myconf+=" -Dffmpeg_branding=Chrome"
+		ffmpeg_branding="Chrome"
 	fi
+	myconf+=" -Dffmpeg_branding=${ffmpeg_branding}"
 
 	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
 	# Note: these are for Gentoo use ONLY. For your own distribution,
@@ -447,7 +448,8 @@ src_configure() {
 	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
 	einfo "Configuring bundled ffmpeg..."
 	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} -- ${build_ffmpeg_args} || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
 	chromium/scripts/copy_config.sh || die
 	chromium/scripts/generate_gyp.py || die
 	popd > /dev/null || die
diff --git a/www-client/chromium/files/chromium-ffmpeg-r3.patch b/www-client/chromium/files/chromium-ffmpeg-r3.patch
new file mode 100644
index 000000000000..aa2699fde0f6
--- /dev/null
+++ b/www-client/chromium/files/chromium-ffmpeg-r3.patch
@@ -0,0 +1,63 @@
+--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
++++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
+@@ -7,7 +7,6 @@
+ from __future__ import print_function
+ 
+ import collections
+-import functools
+ import multiprocessing
+ import optparse
+ import os
+@@ -22,6 +21,14 @@ SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__))
+ FFMPEG_DIR = os.path.abspath(os.path.join(SCRIPTS_DIR, '..', '..'))
+ 
+ 
++BRANDINGS = [
++  'Chrome',
++  'ChromeOS',
++  'Chromium',
++  'ChromiumOS',
++]
++
++
+ USAGE = """Usage: %prog TARGET_OS TARGET_ARCH [options] -- [configure_args]
+ 
+ Valid combinations are linux       [ia32|x64|mipsel|arm|arm-neon]
+@@ -113,8 +120,6 @@ def RewriteFile(path, search, replace):
+ 
+ def BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
+                 config_only, config, configure_flags):
+-  print('%s configure/build:' % config)
+-
+   config_dir = 'build.%s.%s/%s' % (target_arch, target_os, config)
+   shutil.rmtree(config_dir, ignore_errors=True)
+   os.makedirs(os.path.join(config_dir, 'out'))
+@@ -165,6 +170,9 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
+ 
+ def main(argv):
+   parser = optparse.OptionParser(usage=USAGE)
++  parser.add_option('--branding', action='append', dest='brandings',
++                    choices=BRANDINGS,
++                    help='Branding to build; determines e.g. supported codecs')
+   parser.add_option('--config-only', action='store_true',
+                     help='Skip the build step. Useful when a given platform '
+                     'is not necessary for generate_gyp.py')
+@@ -426,9 +434,15 @@ def main(argv):
+       '--enable-parser=gsm',
+   ])
+ 
+-  do_build_ffmpeg = functools.partial(
+-      BuildFFmpeg, target_os, target_arch, host_os, host_arch, parallel_jobs,
+-      options.config_only)
++  def do_build_ffmpeg(branding, configure_flags):
++    if options.brandings and branding not in options.brandings:
++      print('%s skipped' % branding)
++      return
++
++    print('%s configure/build:' % branding)
++    BuildFFmpeg(target_os, target_arch, host_os, host_arch, parallel_jobs,
++                options.config_only, branding, configure_flags)
++
+   do_build_ffmpeg('Chromium',
+                   configure_flags['Common'] +
+                   configure_flags['Chromium'] +