Beta channel bump. Update system ffmpeg patch (bug #460846 by floppym). Remove old.

Package-Manager: portage-2.1.11.52/cvs/Linux i686
Manifest-Sign-Key: 0x30427902

4 files changed, 229 insertions, 13 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d1c992e7707d..c77da06f43f7 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.840 2013/03/09 18:00:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.841 2013/03/11 22:03:28 phajdan.jr Exp $
+
+*chromium-26.0.1410.28 (11 Mar 2013)
+
+  11 Mar 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-system-ffmpeg-r2a.patch, -chromium-26.0.1410.12.ebuild,
+  +chromium-26.0.1410.28.ebuild:
+  Beta channel bump. Update system ffmpeg patch (bug #460846 by floppym).
+  Remove old.
 
   09 Mar 2013; Mike Gilbert <floppym@gentoo.org>
   +files/chromium-jsoncpp-path-r0.patch, chromium-26.0.1410.19.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c2276a322eca..1dd94ec7f832 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -14,6 +14,7 @@ AUX chromium-ppapi-r0.patch 422 SHA256 1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7
 AUX chromium-system-ffmpeg-r0.patch 1427 SHA256 bc0a5df11c60fe176d8ee2735aa97d1d43b8d6319997ca131647a6d7767d5411 SHA512 2527526065edf214ac6ecaba5a5f7d553340d46ba606fb712eea4a538ba8ca7a4c114b8df2ea65499f5d365f49c2797d95874799c76f2b44d9dccd61ad1938be WHIRLPOOL 90ca7608e1b8e885e01d223b6b8fa0463af217f385d9add10a5c47d2cf2c8729db18b5a78c3e4ce846386e44b8d77e1c37793ecd85fc21a7a4d31746dfeb18d2
 AUX chromium-system-ffmpeg-r1.patch 3522 SHA256 937bdb5cd0b34142399c6ea438d48086c45a1f6f8753cc6faac7c197c2da872f SHA512 6f46af9d11f27784276cadfe89f9c30c578ae61090a7d78adeb28bc76ba8ecdbc7d7f3f155edfbb6e05605fc51fc78e55bb86dac3a1869ca484028c2bbf57175 WHIRLPOOL 4826deaf080cde0183ccd437ce2598911736358b697b5c0980e719f92843710efef4333914a3a3c049d5125f239a65daf6e5466adb1b3787c026ee6e63335da6
 AUX chromium-system-ffmpeg-r2.patch 7178 SHA256 bcb48a35559793cf82eb72e16c84d75995fddaa9efee934ae91582e573695774 SHA512 1b641903939855901d5260752dcad29c2bbd17972e2c4556f3828b892817e277af90ce6fca15bd2927217ed2fccde028829f4c9900bc9de5df739154f090b6b9 WHIRLPOOL acc2639086811580450427eaa26d57c5caa3abd19c4d9cd1b554570c3732bb845023f838b2de0a480c2df7712f8c2d4f6ba81b20f44502fbd86bffbefb9672a6
+AUX chromium-system-ffmpeg-r2a.patch 6627 SHA256 8344737762508e33f748a04a81fc460c82e1752ad49d214abf4ff670ecd06925 SHA512 fb7828ab03c6fe54945f37e829ba1e1b9ecb482b4df9c31e0e93a04065903a54b6887766806402aa1e9b13c63fb3a59eab1f0ce73207ab3ca6bcce362a2c3677 WHIRLPOOL 91891f9053fe1447808b3a3c015e9c8f08103cccd1944171c07bd3254ee85dfa88abdfb689b97949ae80a6cda59e6f561ab8a89fd45ab52bced9118d0679326b
 AUX chromium-system-ffmpeg-r3.patch 1788 SHA256 975292f51278fdcf147db0703e53947d53a691077ea22e47f66364f3e88f3282 SHA512 53a4404f3ce58d935648081f4012293527c7318da9ad456f71cdfd2a040f444098067f12b938a8c679a6c5a53381371259f1120a1420bfd57a9bbac0568c93e4 WHIRLPOOL 2767da9a699b1035cfba0dde326e481e3f4ceae588ea325df3ff3d826042c4864aaf51e36ffc4ad53104a2722f09846345d838a2f6074e66e47c09ae0ac2ae22
 AUX chromium-system-ffmpeg-r4.patch 1237 SHA256 749c646c0084fea6ba90fbdd21e6185a7f3ad0d2c8633403fd1b3df3ffe5f7a8 SHA512 d50b103a28a51452d88bb3866d1daebf05eed038b091504f909020d84aa2b7f814321fee6b52df8c257767eb00978955f6096dcfadded7fca90e30f1daddd234 WHIRLPOOL 5c5eb0e86943ea43c9c19a7a0b8a92b1413ac18818277f88727c99e35d41c93d0dd6c5a235482b292fcd50dd9ec81aec63fb591c192b72f3515bfcbcc191fbb5
 AUX chromium-system-libpng-r0.patch 385 SHA256 d0a8b8f5b3d25be4bd2f060422c467dc827997a0b69dfc34a6d18dc9d2f36868 SHA512 cf055c7151113f8650d280c153548b86fd33910394a6ea0202073dffbca362a4601d7f56f48d5709c58f78647f4a52c2f62d44eb862fcecc28d3b2e962b290f1 WHIRLPOOL d4ecb4db97fa2b6e3360705236fc3553cff0c717082db51645399f0dd50ab2ef528c18c7e67aaed88ed4ca61d3820bcc00de7828972cd93c3393b44ff8c5ac6e
@@ -23,24 +24,24 @@ AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a4
 AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf SHA512 96d4ffd01fec2773d7beaf2bc82b8eb969556f6e859e39136b4044521c5b8bfd36c13a7f2fcc64613935d4703d8ede8a56c7ce581a7732642cb8ee71039c801e WHIRLPOOL 6a65521487fa353a22f192c567b487c77a405e068c88898e0d8045b3de26bdd54ed736f104e495598e0cc8703d3f6abc80f8b2ea1e254007dfb18f50294e8c07
 DIST chromium-25.0.1364.152-lite.tar.bz2 125551576 SHA256 ff575ac5abafa370bb10b21cb7f542a1d27c399d7ce199b8eb61f814e8067af3 SHA512 c611943baf1723bd9adb51550315cc1e0d575582a89d53a992d79de33d1001acde50442c337cbecdaef2a35a522017423c257b77c7667c2ffaa8a2bb785872d1 WHIRLPOOL c87a3ed087e06396570f30bf86c74bc661fae8448f35744ea4d085d82ae8516061820a84b519fff777613a60a399fa23eb2183667a27714adb001a9634005172
 DIST chromium-25.0.1364.160-lite.tar.bz2 125544021 SHA256 e16a1f103df9e9054e7ad341037842a71214f2e8ac5e6ae3e0a64dfa10297a3e SHA512 0d4aabc3960e59b169e8868d7005788f7272f7ca8596e165534f53135feeabd30fd2b7b0787fed5d06b23db5e1530f0b1e4b4b63dfd3aefa49f2e2408798a1f2 WHIRLPOOL 696d5458a56dd5e4686d91e91440e5ab0be4f389691b4affac987f9f54fe4c9c9e58853a75426e01a059cb1cb74f8384832df471f2bb2438f401e011d1859267
-DIST chromium-26.0.1410.12.tar.xz 140786668 SHA256 b242b2c6e1d65cf3582e7e164bb2b6717e9d49cbeb17edb91ca5bedf28dddfb1 SHA512 b47e6dd6df3b14c4aaa2daa48eb50f57b3e766ae8f6702849e2aec9cc5963f567e46813df7f3472c5db9582dd2b97667634361b2a6094a11189d8a5a6b547517 WHIRLPOOL 764d37e67aede3f864e543b3574623929198699e736f047b023aad4b0c48d8086a5c74c2e9744ecbd878a58c5dbec3b9a3caad8df894035c7cefaed30d1d64af
 DIST chromium-26.0.1410.19.tar.xz 140798820 SHA256 f901cc35c76995d7d70d50c8d20a9a2f3667d3fbc72ad9d43d4ef5a826881e2e SHA512 09f5c4cfbe9c15edc4a2a42fe91f711fdbebb30920a9dcd10b2344f3fa23b04adca35296e4c4618601806a29c4622cbb28255f5feaff89c9fc85f41393493ba9 WHIRLPOOL 0e7d5361a900530660c33f4d1528ecea53c991c6fc24948b401af4bb1c30edc79833f6784e30777dada7caa8f15754f324a744be835dbadefef4f59cc5521c2c
+DIST chromium-26.0.1410.28.tar.xz 140799808 SHA256 341ebfbf9f0f7bc693831aab7d56f7a26f1c32a66ea007229d587703a0ef62bc SHA512 84fdbe6408289020f3626d9385ff720b82fb42576a3f3ce758fa6251f0995ccd8c3975f68dad1610945d41c3c1a530e90efd849c8e4cba88cd4a09720df8cc28 WHIRLPOOL 24785eefdf88dda1fa71d8400d5e21ec6ee3941b793c508cd03f0619f57488b9dd732832c87db7bd0944147793f1dc07edda793a79b37ba7f9ffaa727416f1ad
 DIST chromium-27.0.1425.0-lite.tar.xz 106076024 SHA256 9ca878cdb15b70f9d16dfe216263fd46bc0e017cec3d6252a58325bf862202b8 SHA512 ab409c89d1f1e704cd6a3b0797192ae466611429fad3de34d3800506c3994b3bb3c72322ad6655f2c6af38b7b36814764889b16081fabfe896ab3a807b015a03 WHIRLPOOL 5f76a971b560060672fb739e9677dfa0d5f70c0868e903e2f56447e8ed24cf5eb84da1be4686b1f5d3c74792eb09fe2766b701dbf03d0017024a26f56264a444
 DIST chromium-27.0.1430.0-lite.tar.xz 106375492 SHA256 163052accc62d2fd741782c0e9a025efb43d75414f1e56fe264a5062d3e11f82 SHA512 6d7358ef82db498b312c1571ab9179a7a7f7fe3642e3f084db4c1c76ee481e8a14da34bbc23734a28b87be29e859ef1b1500cda2caae9ad98f0b53345d426490 WHIRLPOOL b6ba7d53fd446ee0370d7237baa41e86be8fcf79ba390ff4c6db05d87afe6ca002715fd2167600732147dc87c9017c19bb55c62938800fd9023302ca1f3aac4d
 EBUILD chromium-25.0.1364.152.ebuild 16261 SHA256 0b69d780b235b5c68e7b5d738e0e0349f4df0e43fc69160ce7397fa84c514a60 SHA512 5da8b071721595524118bf71087b2af5287aefb380de8b8672528cf32d845e5a921f7c7b165fd82cdf5860c5745f52825757f8e11e0d3140098db8b4da0904e3 WHIRLPOOL a96c8f4365efd521e7fbe0834a5fb40312429b4e9235b3d5b5a8ff2ebdeaf10ee65194e684a525d890f43ed3a1babe07e9fdebbe22bd1ea660f8a83f7e5fd41c
 EBUILD chromium-25.0.1364.160.ebuild 16264 SHA256 04eaff67b6a82eeca1308a512d60059174a49684329af9e994a70aea606b4413 SHA512 d5fa478cac2ec8d337b342d1ad9963e2e4c68b5d956997f3de213d2cfc44021140446d23493cc82e88741f819d8b56638d382592654f92c40ee2c5a055703609 WHIRLPOOL f89a6ca8076e77aad43d5ffbff08c11b581057d52f7c3d9a2b599d6b8332436d46caddba3a5823d3b922697b658a3c0fb0df343dd61879661401589fb41fab19
-EBUILD chromium-26.0.1410.12.ebuild 15857 SHA256 f65b8e135a2e43797cd676c37ea47d0edc202594345161be56aee864c630487b SHA512 9f256362ddba0bdf87dd51d2c06069374c58eabebc0d687908c12df180ed885b8dbabab75bad6e974c4cd34ea54b0b21acff6f42a94693f95bc60368ac415d21 WHIRLPOOL 0974bf5a2e10501db2346b14634d55bc41eb501c64e900bbe295436c21d83e1a457c8b53dddeb0bd078fd3fdfc2e16b2e9815d178f5be36d1ae73a4a2b6726f8
 EBUILD chromium-26.0.1410.19.ebuild 15994 SHA256 fb1955fdd4c5d0a29c6e2244c594fe04602cbbd97224d736bb4dca6426a26cf1 SHA512 04bb4797551bbecc90c00b923f57d57cf5c0c3496d95a20744c8f4a9e458c9b4e74d03c621ef04443f1afe936a3e54daba1228bd7442290ae6d44ab9247abe67 WHIRLPOOL c691a88c74095e427e0622aa6757e61eed3cc0f89caa240638697720ef3b1e44de47741bc01086fb58cbedea15127fbbdef9648d2cc31debc3ef86e4dc2afe7f
+EBUILD chromium-26.0.1410.28.ebuild 15998 SHA256 0f578ebd186b6b5645cd4902ae4cdb8db419a15f5ffb8fe37d4a528e76df929c SHA512 0d25d463b1e896175d253ab450a282534d81ca38b9f8bd8ac5e0d65c0ca63ceded8db8c307ff96f813aecaee89b0d0c143a94cafff8fb27540ffffa69a5e8cd2 WHIRLPOOL 0b35ad6a26e839218b4c0600116c9234249fc37292821681a899ce5efd7aa5d1ec0790b64155784e55784aa59572602b73f98e2041affd18c2c8df22ba7e8293
 EBUILD chromium-27.0.1425.0.ebuild 15918 SHA256 61fa81a77b52eb24ab1dd921340d99023aaca5ec22b738da860f65a607ff97e9 SHA512 62d27fc9e016b17940ec784761e050bba67aa7878d42027f2ce7fc1a4a492a402a1bafc6773cf57e15aaa9664b967679a5ddbe7a4dcc18f65bbff95d838afb42 WHIRLPOOL cd73e6d2ad559a6e45c98bdb48d894f2e587ea31bfc028d0afc78cb580bfcc9af737cc25af2a890c57daadafa69c4bbf1a676bbd4895edd21adad8342f42d21a
 EBUILD chromium-27.0.1430.0.ebuild 16267 SHA256 b774b0f442b0e81b4963a707533b3692754b2583dd4b9137df1f228be3c52e4a SHA512 f47b1be1e98eeba4e4fdd177c3f918690f4d52120e4ae3a3cbcec5c70cb36650633d2a56525c3c21ddf916e4d7bc8e0e36130fcc78b6715e3ce327f7dc49c8cd WHIRLPOOL e728d72c9a5ec87c324a810885352696cee50285914e5f36fb0daebf0be12777130103e9fef62fdd3710a3a6675265594021b04b87f04369980510b00d792958
 EBUILD chromium-9999-r1.ebuild 18005 SHA256 0d428a9d19a52941e3eb1cda3c8ff9c0522f19af06ed9172e6fb09b71ea2510d SHA512 d5dd157c72bfb9a651470e9db25abc9834fc38b7613c808e6584ac5a4a7bb24b7f4b1d9b00fef7f7a9500d4ff153450560a092d42fa7e9d97889ae185b6e1e8f WHIRLPOOL 380f31c0c7fe8453c1ce505ea9ccaf80e31a8ae7a2eedcfd8b7ca25bf3f2ff1e4cd9079021dd7bd86d82fda380f2e7f9768857c295f7a7a4e311e02b796a335d
-MISC ChangeLog 60431 SHA256 724eb08f318426d2c6e3e6778d891f7d68083c9c5a60426093e1943ce9d593d1 SHA512 71c680ea7e872f832c2c5b3eeb4d438ee78d05f68314d547563e9c83409ff1036e2e4fb3c04013fce56e2018dfa169047a42a99ab683cb0db6246bbcbb704300 WHIRLPOOL 6d753308d043a20790ecf344265ebee400cdb29e8957cb4d51db8d6ce8f3a9ca292b274e9bfafd343c5b255e3f02916181ec29890266bd88a983f5a0f258bb5e
+MISC ChangeLog 60723 SHA256 de1882247ee954c8f6c4acf48194595942160fb4d80a484cfa6268e67d69aa56 SHA512 30691d376ee44885dedd48f54fc89e7de3877b52f4e0cba9e493d435ca7dfc3730c850a648e6647e1778767a3b706376f224c61c64eacb7d7b363fe489e44998 WHIRLPOOL 284f0c131d69720a9975361ff8956ed21f6bcd02bc1d267b7670f62ba72a3d9dcff0e8539fd2aa1e7f04d2b56684720a752258c9e6e3b476afdea165a9da3d16
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlE7eL8ACgkQC77qH+pIQ6TklQD/SnOjPjizal8FhvgNC97n67sQ
-2VlQKIDZ93VKtD2lBXIA+wXHhYpFErIDjkGIwLcUhGD+cq7XcSTyVjom76P0CVvD
-=4wsu
+iEYEAREIAAYFAlE+VLcACgkQuUQtlDBCeQIbLQCbBO/Qz6koeuGu/jChbfHwfcue
+ZYIAn2FBN/+VrT0TnwWMF/1CEGpvK4GB
+=M4xg
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-26.0.1410.12.ebuild b/www-client/chromium/chromium-26.0.1410.28.ebuild
index dfd057807619..84b9e3b94286 100644
--- a/www-client/chromium/chromium-26.0.1410.12.ebuild
+++ b/www-client/chromium/chromium-26.0.1410.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1410.12.ebuild,v 1.3 2013/02/28 20:03:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1410.28.ebuild,v 1.1 2013/03/11 22:03:28 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -34,13 +34,13 @@ RDEPEND="app-accessibility/speech-dispatcher
 	>=dev-libs/elfutils-0.149
 	dev-libs/expat
 	>=dev-libs/icu-49.1.1-r1:=
-	=dev-libs/jsoncpp-0.5.0
+	dev-libs/jsoncpp
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2[icu]
 	dev-libs/libxslt
 	dev-libs/nspr
 	>=dev-libs/nss-3.12.3
-	dev-libs/protobuf
+	dev-libs/protobuf:=
 	dev-libs/re2
 	gnome? ( >=gnome-base/gconf-2.24.0 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
@@ -51,7 +51,7 @@ RDEPEND="app-accessibility/speech-dispatcher
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
 	>=media-libs/libwebp-0.2.0_rc1
-	!arm? ( !x86? ( media-libs/mesa[gles2] ) )
+	!arm? ( !x86? ( >=media-libs/mesa-9.1[gles2] ) )
 	media-libs/opus
 	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
@@ -131,8 +131,11 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
 
 	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
+	epatch "${FILESDIR}/${PN}-mesa-r0.patch"
 	epatch "${FILESDIR}/${PN}-system-v8-r0.patch"
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r2.patch"
+	epatch "${FILESDIR}/${PN}-system-ffmpeg-r2a.patch"
+
+	epatch "${FILESDIR}/${PN}-jsoncpp-path-r0.patch"
 
 	epatch_user
 
@@ -397,6 +400,7 @@ src_test() {
 	local excluded_base_unittests=(
 		"ICUStringConversionsTest.*" # bug #350347
 		"MessagePumpLibeventTest.*" # bug #398591
+		"SecurityTest.CallocOverflow" # bug #458396
 	)
 	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
 
@@ -442,7 +446,7 @@ src_install() {
 		doins out/Release/libppGoogleNaClPluginChrome.so || die
 	fi
 
-	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
+	newexe "${FILESDIR}"/chromium-launcher-r3.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
 		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
 			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r2a.patch b/www-client/chromium/files/chromium-system-ffmpeg-r2a.patch
new file mode 100644
index 000000000000..ea5d93cb4d28
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-ffmpeg-r2a.patch
@@ -0,0 +1,203 @@
+diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
+index 17241b9..8a92312 100644
+--- a/media/filters/ffmpeg_glue.h
++++ b/media/filters/ffmpeg_glue.h
+@@ -28,9 +28,9 @@
+ #include "base/basictypes.h"
+ #include "base/memory/scoped_ptr.h"
+ #include "media/base/media_export.h"
++#include "media/ffmpeg/ffmpeg_common.h"
+ 
+ struct AVFormatContext;
+-struct AVIOContext;
+ 
+ namespace media {
+ 
+diff --git a/media/media.gyp b/media/media.gyp
+index df217d2..fde3830 100644
+--- a/media/media.gyp
++++ b/media/media.gyp
+@@ -363,6 +363,9 @@
+           'dependencies': [
+             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+           ],
++          'export_dependent_settings': [
++            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++          ],
+         }, {  # media_use_ffmpeg == 0
+           # Exclude the sources that depend on ffmpeg.
+           'sources!': [
+--- a/media/ffmpeg/ffmpeg_common.cc.orig	2013-01-17 00:07:51.635057013 +0000
++++ b/media/ffmpeg/ffmpeg_common.cc	2013-01-17 00:15:50.867406811 +0000
+@@ -10,6 +10,8 @@
+ #include "media/base/video_frame.h"
+ #include "media/base/video_util.h"
+ 
++#undef SampleFormat
++
+ namespace media {
+ 
+ // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
+Index: build/common.gypi
+diff --git a/build/common.gypi b/build/common.gypi
+index 34c6a15e0add1001e4a24712c9c809e3b698a390..521decfa19d102263086ebf4de7c8bac74c95e30 100644
+--- a/build/common.gypi
++++ b/build/common.gypi
+@@ -741,6 +741,9 @@
+     'google_default_client_secret%': '<(google_default_client_secret)',
+     'enable_managed_users%': '<(enable_managed_users)',
+ 
++    # Use system ffmpeg instead of bundled one.
++    'use_system_ffmpeg%': 0,
++
+     # Use system mesa instead of bundled one.
+     'use_system_mesa%': 0,
+ 
+Index: media/ffmpeg/ffmpeg_common.cc
+diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
+index 26953efc699a0dc1ce9cd951eb47b04713974b44..bf234304aa2b26fb7e0f729a4e75257099c00358 100644
+--- a/media/ffmpeg/ffmpeg_common.cc
++++ b/media/ffmpeg/ffmpeg_common.cc
+@@ -84,8 +84,10 @@ AudioCodec CodecIDToAudioCodec(CodecID codec_id) {
+       return kCodecGSM_MS;
+     case CODEC_ID_PCM_MULAW:
+       return kCodecPCM_MULAW;
++#ifndef CHROMIUM_OMIT_CODEC_ID_OPUS
+     case CODEC_ID_OPUS:
+       return kCodecOpus;
++#endif
+     default:
+       DVLOG(1) << "Unknown audio CodecID: " << codec_id;
+   }
+@@ -129,8 +131,10 @@ static CodecID AudioCodecToCodecID(AudioCodec audio_codec,
+       return CODEC_ID_GSM_MS;
+     case kCodecPCM_MULAW:
+       return CODEC_ID_PCM_MULAW;
++#ifndef CHROMIUM_OMIT_CODEC_ID_OPUS
+     case kCodecOpus:
+       return CODEC_ID_OPUS;
++#endif
+     default:
+       DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
+   }
+@@ -147,8 +151,10 @@ VideoCodec CodecIDToVideoCodec(CodecID codec_id) {
+       return kCodecMPEG4;
+     case CODEC_ID_VP8:
+       return kCodecVP8;
++#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
+     case AV_CODEC_ID_VP9:
+       return kCodecVP9;
++#endif
+     default:
+       DVLOG(1) << "Unknown video CodecID: " << codec_id;
+   }
+@@ -165,8 +171,10 @@ static CodecID VideoCodecToCodecID(VideoCodec video_codec) {
+       return CODEC_ID_MPEG4;
+     case kCodecVP8:
+       return CODEC_ID_VP8;
++#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
+     case kCodecVP9:
+       return AV_CODEC_ID_VP9;
++#endif
+     default:
+       DVLOG(1) << "Unknown VideoCodec: " << video_codec;
+   }
+@@ -468,8 +476,10 @@ ChannelLayout ChannelLayoutToChromeChannelLayout(int64_t layout, int channels) {
+       return CHANNEL_LAYOUT_6_1_FRONT;
+     case AV_CH_LAYOUT_7POINT0_FRONT:
+       return CHANNEL_LAYOUT_7_0_FRONT;
++#ifdef AV_CH_LAYOUT_7POINT1_WIDE_BACK
+     case AV_CH_LAYOUT_7POINT1_WIDE_BACK:
+       return CHANNEL_LAYOUT_7_1_WIDE_BACK;
++#endif
+     case AV_CH_LAYOUT_OCTAGONAL:
+       return CHANNEL_LAYOUT_OCTAGONAL;
+     default:
+Index: media/media.gyp
+diff --git a/media/media.gyp b/media/media.gyp
+index f514dec48e5cc78567d141f20e2cb970a8707e92..75b62bebb503e2d9488bf0fc5cec3fd0a7e1916d 100644
+--- a/media/media.gyp
++++ b/media/media.gyp
+@@ -469,6 +469,18 @@
+             'filters/vpx_video_decoder.h',
+           ],
+         }],
++        ['use_system_ffmpeg == 1', {
++          'defines': [
++            '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
++                '--code "#include <libavcodec/avcodec.h>\n'
++                'int test() { return CODEC_ID_OPUS; }" '
++                '--on-failure CHROMIUM_OMIT_CODEC_ID_OPUS)',
++            '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
++                '--code "#include <libavcodec/avcodec.h>\n'
++                'int test() { return AV_CODEC_ID_VP9; }" '
++                '--on-failure CHROMIUM_OMIT_AV_CODEC_ID_VP9)',
++          ],
++        }],
+         ['OS == "ios"', {
+           'includes': [
+             # For shared_memory_support_sources variable.
+Index: tools/compile_test/compile_test.py
+diff --git a/tools/compile_test/compile_test.py b/tools/compile_test/compile_test.py
+new file mode 100755
+index 0000000000000000000000000000000000000000..a52c0720209142af858d656a071ca43328dd3b16
+--- /dev/null
++++ b/tools/compile_test/compile_test.py
+@@ -0,0 +1,57 @@
++#!/usr/bin/env python
++# Copyright (c) 2013 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++"""
++Tries to compile given code, produces different output depending on success.
++
++This is similar to checks done by ./configure scripts.
++"""
++
++
++import optparse
++import os
++import shutil
++import subprocess
++import sys
++import tempfile
++
++
++def DoMain(argv):
++  parser = optparse.OptionParser()
++  parser.add_option('--code')
++  parser.add_option('--on-success', default='')
++  parser.add_option('--on-failure', default='')
++
++  options, args = parser.parse_args(argv)
++
++  if not options.code:
++    parser.error('Missing required --code switch.')
++
++  cxx = os.environ.get('CXX', 'g++')
++
++  tmpdir = tempfile.mkdtemp()
++  try:
++    cxx_path = os.path.join(tmpdir, 'test.cc')
++    with open(cxx_path, 'w') as f:
++      f.write(options.code.decode('string-escape'))
++
++    o_path = os.path.join(tmpdir, 'test.o')
++
++    cxx_popen = subprocess.Popen([cxx, cxx_path, '-o', o_path, '-c'],
++                                 stdout=subprocess.PIPE,
++                                 stderr=subprocess.PIPE)
++    cxx_stdout, cxx_stderr = cxx_popen.communicate()
++    if cxx_popen.returncode == 0:
++      print options.on_success
++    else:
++      print options.on_failure
++  finally:
++    shutil.rmtree(tmpdir)
++
++  return 0
++
++
++if __name__ == '__main__':
++  sys.exit(DoMain(sys.argv[1:]))