summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2013-01-17 04:41:59 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2013-01-17 04:41:59 +0000
commitb727f717084d14ece92b8ba0e10fd6540aef6ca2 (patch)
tree1b667df9f597caf478b85951a91b8a14d5a91c01 /www-client
parentDev channel bump. (diff)
downloadhistorical-b727f717084d14ece92b8ba0e10fd6540aef6ca2.tar.gz
historical-b727f717084d14ece92b8ba0e10fd6540aef6ca2.tar.bz2
historical-b727f717084d14ece92b8ba0e10fd6540aef6ca2.zip
Do not needlessly tar nacl toolchain. More system ffmpeg compatibility. Remove more bundled libraries.
Package-Manager: portage-2.1.11.31/cvs/Linux i686 Manifest-Sign-Key: 0x30427902
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/Manifest15
-rw-r--r--www-client/chromium/chromium-26.0.1384.2.ebuild23
-rw-r--r--www-client/chromium/chromium-9999-r1.ebuild23
-rw-r--r--www-client/chromium/files/chromium-system-ffmpeg-r1.patch106
5 files changed, 143 insertions, 32 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 57f7b94400e1..a45d3c240133 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# 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.792 2013/01/16 16:51:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.793 2013/01/17 04:41:52 phajdan.jr Exp $
+
+ 17 Jan 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ +files/chromium-system-ffmpeg-r1.patch, chromium-26.0.1384.2.ebuild,
+ chromium-9999-r1.ebuild:
+ Do not needlessly tar nacl toolchain. More system ffmpeg compatibility.
+ Remove more bundled libraries.
*chromium-26.0.1384.2 (16 Jan 2013)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c263ef9ab332..1527956c42ab 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -19,6 +19,7 @@ AUX chromium-revert-jpeg-swizzle-r2.patch 2233 SHA256 d99162aa6bae562f116a423472
AUX chromium-selinux-r0.patch 411 SHA256 f6ea97bbbc36579a74790338aebea8d090a0729a3f3cfc36086338007a4f9545 SHA512 a0168ec144369b8d9c88a6c8205b47758e80f7077809972776b15ea4b61a692a2a6775638692d5a2a5ac5a7fdc3961de6d19a43b6d01f9057c3ede48d2a7da67 WHIRLPOOL de5fa4ba46ea3cbd3a51ae2c03c85dfc10fe5b421765018b7a568bc3f0882ca063dab1214923a60785214bc8c801cd3aa578c686f400d51f37c4484b3982f48f
AUX chromium-svnversion-r0.patch 480 SHA256 f265a9ea756810f623289523d58b0c58b4ea1a001a693321b9cec4810fdc46de SHA512 1ed5770f717db1c2eb650c0a75bb52902fcc3956733afd8511e2bc9a57a6aae420824b4a4dba92ef59dc32eb156efb58826e6e77c29893db1080f04b803ec3fb WHIRLPOOL b4d8815cfc8fb8d8f82d57e19bc692e0f49d5349d27ae473ec2202c0ff0b8f7ce02e49c5c9baa46d823dadeae6ea07b3157a17d7717cf3554948013f84d42417
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-icu-r0.patch 337 SHA256 d634929ca192d867588a8eeaecb0c36de3f146e72cbc056896ce64ca1967f8a2 SHA512 179ac2e36606f300f9a381586713d8a32e27a9c4c5471cb81017f826bd4bdd4a4500d6fe0f0d4086c398ab4f21aa92a4d91a6388b97921940e0fb0e0ee0196d6 WHIRLPOOL afcd379f0c4d7e91a19201fd49793926ddc45d836ba139d6223558b224d919381606086534273aa39d2b5e0a9b73552eb946b006ad004fb6001aa376223bfbf2
AUX chromium-system-libpng-r0.patch 385 SHA256 d0a8b8f5b3d25be4bd2f060422c467dc827997a0b69dfc34a6d18dc9d2f36868 SHA512 cf055c7151113f8650d280c153548b86fd33910394a6ea0202073dffbca362a4601d7f56f48d5709c58f78647f4a52c2f62d44eb862fcecc28d3b2e962b290f1 WHIRLPOOL d4ecb4db97fa2b6e3360705236fc3553cff0c717082db51645399f0dd50ab2ef528c18c7e67aaed88ed4ca61d3820bcc00de7828972cd93c3393b44ff8c5ac6e
AUX chromium-system-opus-r0.patch 1007 SHA256 87d1b6befff07d9a1dfca86e1304e0b80dfc41b57acd892683850f2f080adfb4 SHA512 bfcd3007c32e08d1ccc2aeb6294cc2c95eb3253ee1de78cedb9d07f28411c8efa12261cb2c9ab1265cb33aa8211b1a7759ecc2b99048f6d222fd1e602366180e WHIRLPOOL 219898437d9bd173ae56015331daad10fb0fdcfc5f5835a929205320968f092565465912821f914cf0c922969dcecd2c601473e455ade981eb26706b5193cadf
@@ -37,17 +38,17 @@ DIST chromium-26.0.1384.2-lite.tar.xz 103884752 SHA256 624d5ffc6939818172c8c76c4
EBUILD chromium-24.0.1312.52.ebuild 15868 SHA256 65f300829a756d014096cd034453a3a7a8a15fab194df7586f426715b0c8c207 SHA512 e55b9bf028646fdc1780674de3b9dbd8b19b5a83f9d3cc7dd6a2317f0dde79b9fba170ea9b41a50c7fa140d6d0cdc341bbc998fd183a00a897dc2a86c079cf1c WHIRLPOOL 209630457c9a4352282b091a8d67b5404d0fe2695a328207df76d149257a6c4fd723b98aac6718b54fa966d876f3cca3d8b4f374dbf09031db1a2eca98a84587
EBUILD chromium-25.0.1364.26.ebuild 16407 SHA256 589567c1485513dbb563975262dc01aa67c3c2eb744f80ad511cf96011630e70 SHA512 f467f9b7f85b49d099b4fcaf01f1233c7cbc2fd68b1b3cab78eef9bbc79e3cf34894338faf6786e62894e208929fbc02992d2ee1e3810e27a9838612ce688fdc WHIRLPOOL 860f609b85e424350361dba2ee8f62f9439782b2e2ee988e5ef8a20731e1c756f6a0ac70b9391cdd28c617f20adc6be7e172ff854273c687e6ae72f2563006b1
EBUILD chromium-25.0.1364.29.ebuild 16226 SHA256 7ae7ce9a2b31bf8d3e3fd22fc3f8e14745b46dfa2dad38071f6ca706ec415f66 SHA512 f978f35eb8e92a661a6c854c469fb0351592427fd036208b17d4f9a119cc85e05dc0b743eeae82a03afad52bb7f7d93cf25bde4ae407fd1f8b543cda8bb996f8 WHIRLPOOL ca554bc1398efcdce5134006b046b3b15b56a8e53a80737c55c115c19ac31a73c2e904f030cd9f820f0809ae032ee1a1b7ab124a85a8b54257816935b1a791de
-EBUILD chromium-26.0.1384.2.ebuild 15652 SHA256 80eda7f2b6eea0df2c61620acbc2fc5c9fe822d843afad1f21269b84fcb239c6 SHA512 d514c667483a31ef21ea9ffe316f0088e4ab77a8cc5ea485f9dc2cf3659ea63173bb11f385e3205a3f193cc12165297737452dc3792583887e692cbe12f72256 WHIRLPOOL ff2abedc958ff1fe60eae46d3a65821221e0cc05a8e7449cf7337d6f46893d6fe855ffdc43d0fe16b62b830697b3419f5324a6dda368d186a242210a66325618
-EBUILD chromium-9999-r1.ebuild 17078 SHA256 5a6ce6144425c45a9d0581bc78c91fdca0e4fa7795c965c0777b9bfdfda08186 SHA512 5dcc0636a1f77bb9509ca2a389f02a63ed21fb600b6e139a4cd25c763ae94b73c6470087d40f937f47bf38552c2ec891a61e6d5c8a360e840313f1f543f6a1cb WHIRLPOOL ea8dedd91f04df9632f4150ee32019ace2e61474f668791511a51c56d3e8da7b33b6ffee41b4ce847e78048e79f8ccdf962468392cd73dade7e28d65cb44fec6
-MISC ChangeLog 51093 SHA256 9522e4268cee41a5ba552ba69af7cfc27a8d6527d9da07037c8ebb139d575a3c SHA512 42da004dfa4976c3970c7ceb383db0bc096514654b5623fcdf95be8d46e32bb77aaa091ddf0e3836b13d403c15903a54b1a171b2ef8e352efc7acc80fb6dd2e9 WHIRLPOOL 81d9e7f5571ba32896adff483b65bd9e897453ded69da6fb40b232cd50ffa7b8cf7d47d4fad81f178797c8b81a3e072ac9a510952516c8bcfac8d6af7963338a
+EBUILD chromium-26.0.1384.2.ebuild 15686 SHA256 96b65ef658b0df34e3f8d625d6b673f9e51eba6e500f217eed9ec0728fe578e6 SHA512 ed1ec1e145aae265f668c9817b52c6e9ba3d3b5e797363027b4d29ce29a17d8903fb1d981354ecea59028ab0af99dcfa288ff13ff1db171921d246ff5d5b071b WHIRLPOOL f7ad67f1281ceb60fcadd2c46a1974b87b671336c6f981179622260eb4246b4a124c7a4cdbcaa87890826360e74b35176d8504f43bd2610fc2845a70167c9abf
+EBUILD chromium-9999-r1.ebuild 17112 SHA256 0e2d056ae0b8bbe153a50304a81a1907e2aa00eb16404a6cfd84843d11e18d14 SHA512 03291c7f9e50bd308723d0f2f23519af64235788eee53a122412bab14388d18c1aa2560cb0b807f70fb3ee672f08fe268045e42121991d9eed9d9ccb9fc82214 WHIRLPOOL 701fcb077a4d0ed178c576c7133048b1018e8affef41c185a283c3c9377db9e311caf97ca870a7dd6c1f6a5e0e1f55100bb0308844ed5089a111fecc88be4c7a
+MISC ChangeLog 51354 SHA256 a66da0b40107603c0455ae1fadb31a0f434a5bb8019edfe998609f998c6b07f3 SHA512 51519d7789df56537fb0e7b08dc20090897f5b6c519d385265b047c4143359d35889ef8a8148fffb65c88c32f4c4ba2a22c652c901dd7c48e9882e2b3b131d29 WHIRLPOOL b8377ce275dce462f2083c04d973afcf37af910e7b199908f0ec0455c44931e6261974451445950da39eb112285a284bc914ac0c4a2ad41d02834b76212a6506
MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
-MISC chromium-9999-r1.ebuild.orig 17230 SHA256 61904a612bac65e04a749ddb22f49312922627295a57e8ec7f5e1fc5cf1f565c SHA512 0ccbdd0672cb3eed108cf887ea20f4aa9fbfb26010518e1b3269f445fd035d5da90f6b0173dae2c0a1a5033eeb7fb0d4cc86acc02366c7ba67223719998204e5 WHIRLPOOL 8e3302203ad124a6ea36eb9b381fd8606061b873944658644586f7942bacbe2988dfb1fa6a6315d0f18962d58c34aae9a4995ee53a8d555340c02450ed02330a
+MISC chromium-9999-r1.ebuild.orig 17078 SHA256 5a6ce6144425c45a9d0581bc78c91fdca0e4fa7795c965c0777b9bfdfda08186 SHA512 5dcc0636a1f77bb9509ca2a389f02a63ed21fb600b6e139a4cd25c763ae94b73c6470087d40f937f47bf38552c2ec891a61e6d5c8a360e840313f1f543f6a1cb WHIRLPOOL ea8dedd91f04df9632f4150ee32019ace2e61474f668791511a51c56d3e8da7b33b6ffee41b4ce847e78048e79f8ccdf962468392cd73dade7e28d65cb44fec6
MISC chromium-9999-r1.ebuild.rej 1764 SHA256 05e6bd4b6fb9e63979ffc8432c3440e1139e2c81978e25cf96b9499b9f9b753e SHA512 68af66b9436851db2be8faa5bcf30bf41f2830e33c104c42763ac6788680e150ccd8bd0fc908251a7b47c435b0042466f1317942ced3f9bda260d0efe1e6cadb WHIRLPOOL 7f75360a2e74f47b25628563ca082c8a5880c898d0d4ead895edd00428d0a1f81da40a874666091e20065dfc4afc2c4306cd931dd378bfa7b465fab2dae24e16
MISC metadata.xml 516 SHA256 e5ca0cf3ef65ca054555c35bbb492d02b40138a907fae82aaa236f774fdef32f SHA512 580852722eb6ce8c660ea05b4b9a6a6ca04582c1438401e92425b6733e7a9423f048818153f59394081df6f89bee349da2b3c97a61e030f995df5ae00bc41b58 WHIRLPOOL 03ac4c1574b769bdeebe082281809af638223bdcbdea1bc2faef86f484e0f26298be769f6311023642257d49eb3d31f223c445b07dba5c6aa699775fcedff8ad
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlD22pMACgkQuUQtlDBCeQLfiwCaA2rp5Hy6kKhG96LbSYq39sB4
-i80AniYoEmsGusek6/lGiK4obEPDAZ7h
-=SZGX
+iEYEAREIAAYFAlD3gRUACgkQuUQtlDBCeQIQeQCfTpAhJXPOwu3AFMDyL94aL00b
+7b8AnjdgcoINOJngV4G2j7DtEWXtrmT7
+=bGi4
-----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-26.0.1384.2.ebuild b/www-client/chromium/chromium-26.0.1384.2.ebuild
index 57374bc4e4d5..3e3b101a9ec5 100644
--- a/www-client/chromium/chromium-26.0.1384.2.ebuild
+++ b/www-client/chromium/chromium-26.0.1384.2.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.1384.2.ebuild,v 1.1 2013/01/16 16:51:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1384.2.ebuild,v 1.2 2013/01/17 04:41:52 phajdan.jr Exp $
EAPI="5"
PYTHON_DEPEND="2:2.6"
@@ -50,7 +50,7 @@ RDEPEND="app-accessibility/speech-dispatcher
media-libs/opus
media-libs/speex
pulseaudio? ( media-sound/pulseaudio )
- system-ffmpeg? ( >=media-video/ffmpeg-1.0 )
+ system-ffmpeg? ( || ( <media-video/ffmpeg-1.0 >=media-video/ffmpeg-1.0[opus] ) )
>=net-libs/libsrtp-1.4.4_p20121108
sys-apps/dbus
sys-apps/pciutils
@@ -119,14 +119,10 @@ pkg_setup() {
src_prepare() {
if ! use arm; then
- ebegin "Preparing NaCl newlib toolchain"
- pushd "${T}" >/dev/null || die
- mkdir sdk || die
- cp -a /usr/$(get_libdir)/nacl-toolchain-newlib sdk/nacl-sdk || die
- mkdir -p "${S}"/native_client/toolchain/.tars || die
- tar czf "${S}"/native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk || die
- popd >/dev/null || die
- eend $?
+ mkdir -p out/Release/obj/gen/sdk/toolchain || die
+ cp -a /usr/$(get_libdir)/nacl-toolchain-newlib \
+ out/Release/obj/gen/sdk/toolchain/linux_x86_newlib || die
+ touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
fi
# Fix build without NaCl glibc toolchain.
@@ -150,7 +146,7 @@ src_prepare() {
}
EOF
- epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
+ epatch "${FILESDIR}/${PN}-system-ffmpeg-r1.patch"
epatch_user
@@ -194,7 +190,6 @@ src_prepare() {
\! -path 'third_party/undoview/*' \
\! -path 'third_party/v8-i18n/*' \
\! -path 'third_party/webdriver/*' \
- \! -path 'third_party/webgl_conformance/*' \
\! -path 'third_party/webrtc/*' \
\! -path 'third_party/widevine/*' \
-delete || die
@@ -227,6 +222,10 @@ src_configure() {
# TODO: also build with pnacl
myconf+=" -Ddisable_pnacl=1"
+ # It would be awkward for us to tar the toolchain and get it untarred again
+ # during the build.
+ myconf+=" -Ddisable_newlib_untar=1"
+
# Make it possible to remove third_party/adobe.
echo > "${T}/flapper_version.h" || die
myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 74ce6e462c8a..e0839fe2f1aa 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.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-9999-r1.ebuild,v 1.159 2013/01/16 16:51:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.160 2013/01/17 04:41:52 phajdan.jr Exp $
EAPI="5"
PYTHON_DEPEND="2:2.6"
@@ -50,7 +50,7 @@ RDEPEND="app-accessibility/speech-dispatcher
media-libs/opus
media-libs/speex
pulseaudio? ( media-sound/pulseaudio )
- system-ffmpeg? ( >=media-video/ffmpeg-1.0 )
+ system-ffmpeg? ( || ( <media-video/ffmpeg-1.0 >=media-video/ffmpeg-1.0[opus] ) )
>=net-libs/libsrtp-1.4.4_p20121108
sys-apps/dbus
sys-apps/pciutils
@@ -177,20 +177,16 @@ pkg_setup() {
src_prepare() {
if ! use arm; then
- ebegin "Preparing NaCl newlib toolchain"
- pushd "${T}" >/dev/null || die
- mkdir sdk || die
- cp -a /usr/$(get_libdir)/nacl-toolchain-newlib sdk/nacl-sdk || die
- mkdir -p "${S}"/native_client/toolchain/.tars || die
- tar czf "${S}"/native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk || die
- popd >/dev/null || die
- eend $?
+ mkdir -p out/Release/obj/gen/sdk/toolchain || die
+ cp -a /usr/$(get_libdir)/nacl-toolchain-newlib \
+ out/Release/obj/gen/sdk/toolchain/linux_x86_newlib || die
+ touch out/Release/obj/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
fi
# Fix build without NaCl glibc toolchain.
epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
- epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
+ epatch "${FILESDIR}/${PN}-system-ffmpeg-r1.patch"
epatch_user
@@ -234,7 +230,6 @@ src_prepare() {
\! -path 'third_party/undoview/*' \
\! -path 'third_party/v8-i18n/*' \
\! -path 'third_party/webdriver/*' \
- \! -path 'third_party/webgl_conformance/*' \
\! -path 'third_party/webrtc/*' \
\! -path 'third_party/widevine/*' \
-delete || die
@@ -271,6 +266,10 @@ src_configure() {
# TODO: also build with pnacl
myconf+=" -Ddisable_pnacl=1"
+ # It would be awkward for us to tar the toolchain and get it untarred again
+ # during the build.
+ myconf+=" -Ddisable_newlib_untar=1"
+
# Make it possible to remove third_party/adobe.
echo > "${T}/flapper_version.h" || die
myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r1.patch b/www-client/chromium/files/chromium-system-ffmpeg-r1.patch
new file mode 100644
index 000000000000..63a6eb682f85
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-ffmpeg-r1.patch
@@ -0,0 +1,106 @@
+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',
++ ],
+ }, { # use_ffmpeg == 0
+ # Exclude the sources that depend on ffmpeg.
+ 'sources!': [
+diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
+index 81b770c..7b6d673 100644
+--- a/webkit/media/webkit_media.gypi
++++ b/webkit/media/webkit_media.gypi
+@@ -24,6 +24,7 @@
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
+ '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
++ '<(DEPTH)/media/media.gyp:media',
+ '<(DEPTH)/media/media.gyp:shared_memory_support',
+ '<(DEPTH)/media/media.gyp:yuv_convert',
+ '<(DEPTH)/skia/skia.gyp:skia',
+--- 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
+@@ -84,8 +86,10 @@
+ return kCodecGSM_MS;
+ case CODEC_ID_PCM_MULAW:
+ return kCodecPCM_MULAW;
++#ifdef CODEC_ID_OPUS
+ case CODEC_ID_OPUS:
+ return kCodecOpus;
++#endif
+ default:
+ DVLOG(1) << "Unknown audio CodecID: " << codec_id;
+ }
+@@ -129,8 +133,10 @@
+ return CODEC_ID_GSM_MS;
+ case kCodecPCM_MULAW:
+ return CODEC_ID_PCM_MULAW;
++#ifdef CODEC_ID_OPUS
+ case kCodecOpus:
+ return CODEC_ID_OPUS;
++#endif
+ default:
+ DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
+ }
+@@ -423,8 +429,10 @@
+ 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:
+--- a/media/filters/ffmpeg_audio_decoder.cc.orig 2013-01-17 00:18:24.998163847 +0000
++++ b/media/filters/ffmpeg_audio_decoder.cc 2013-01-17 00:37:12.863736499 +0000
+@@ -402,6 +402,10 @@
+
+ int decoded_audio_size = 0;
+ if (frame_decoded) {
++#if !defined(LIBAVCODEC_VERSION_MAJOR) || !defined(LIBAVCODEC_VERSION_MINOR)
++#error missing version info
++#endif
++#if LIBAVCODEC_VERSION_MAJOR >= 54 && LIBAVCODEC_VERSION_MINOR >= 13
+ int output_sample_rate = av_frame_->sample_rate;
+ if (output_sample_rate != samples_per_second_) {
+ DLOG(ERROR) << "Output sample rate (" << output_sample_rate
+@@ -412,6 +416,7 @@
+ queued_audio_.push_back(queue_entry);
+ break;
+ }
++#endif
+
+ decoded_audio_size = av_samples_get_buffer_size(
+ NULL, codec_context_->channels, av_frame_->nb_samples,