Only claim to support more audio/video codecs when we are using system

ffmpeg (bug #306921 by Carlos Augusto <silvaesilva@gmail.com>)
Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e3c6f056689968adc487aada5b11ca52edb43176..c493caa744d93a14abf2c26964196317ddd8d379 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.73 2010/04/02 05:31:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.74 2010/04/03 20:40:54 phajdan.jr Exp $
+
+  03 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-5.0.366.2.ebuild, chromium-9999.ebuild,
+  +files/chromium-ffmpeg.patch:
+  Only claim to support more audio/video codecs when we are using system
+  ffmpeg (bug #306921 by Carlos Augusto <silvaesilva@gmail.com>)
 
 *chromium-5.0.366.2 (02 Apr 2010)
 

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ef97342fe122f711c6b4e3d56c8df81ba090cfb2..8af9cf3ba7cdd026c135a57b56e143f9090bd92f 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,6 @@
 AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566
 AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af8 SHA1 1aa9701b329d970db00726ba883d7dd5448ba372 SHA256 2da9ffbbaff5d00045b49ae75658df3c9f536543d388caff7a18ff093a0b1cd6
+AUX chromium-ffmpeg.patch 994 RMD160 18382f56bf9df5926ead966de002ca39b73c70e9 SHA1 bbf217e4d0adc7eaeb11772fadebace8371291c1 SHA256 a10abccdd8c03ffc5ef016f41cbece38d7beff0df399bf8f3eb5f5ceb2d012cc
 AUX chromium-fix-make-build.patch 677 RMD160 b0dd0057d6f28e5d79b0bd9fd45b8e7cb79cbfcf SHA1 c7a7bf5fe81349f077a15458d66d53e1aa523f33 SHA256 8de8636ceedcbf0dc4f8494f48fd78baf261ef9334efe359d7e99bc668193c9e
 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
@@ -12,7 +13,7 @@ EBUILD chromium-5.0.307.11.ebuild 6141 RMD160 f457412c120d1d52c735a6a163d507ae05
 EBUILD chromium-5.0.342.7.ebuild 6449 RMD160 aa8a24a34332a43d1cb0284a9c9ee3a4209fda16 SHA1 d2e67b8bbe037d0105eedbe4f2cdb5ff118dec95 SHA256 2946eda059d79673013b7c235cf9d2a11baa56fd87ae049d630af79974fbe3f1
 EBUILD chromium-5.0.360.0.ebuild 6451 RMD160 86b1deeb8084b0c5eb388bca47bbe06ead1fc56d SHA1 b309bc663c4b6ef7c9e8076ba5e111e72503f82d SHA256 9ad943b3a68ef75841b0ee4242569452cb8c0d4f2e0da4fdb57ebff44d462e87
 EBUILD chromium-5.0.360.5.ebuild 6451 RMD160 825579af6bbcf0a8b37b31d46256b928fcf6cc83 SHA1 4952bf83c702edad474a59484b25c92b31d64ac3 SHA256 785ad6ed01dc26d8516b3d531e28ffcef443c34e9a3f4879402080a8c7718b0f
-EBUILD chromium-5.0.366.2.ebuild 6451 RMD160 138cf6427b6d410a17257d4909655f24dfe0b1fa SHA1 755c805a7ab95206732e607238715cab9166b244 SHA256 4b1f5620e47726a907c05cfaa1f1ff661e2fb68ef92ea129706b09c5370cdc7f
-EBUILD chromium-9999.ebuild 8204 RMD160 31a1cf8fbd7baebb3222a56fa7986b33a84df12c SHA1 883726c9cdfb79f633b9ba1aef62d9b6309a4d7d SHA256 6d77dd6ba8a64afce4e68bb4661b8aa11514d77d68515c984a499e704cb4e80c
-MISC ChangeLog 16753 RMD160 79346c8f141fa8a18c980d3c112c051acbc62d83 SHA1 f6a10166d7ac5728777115ad9cc6e74d49016f34 SHA256 11d3d4acc69131e234a8b8aaebbe2b005e40607242c4b90015c0cffd4e799ce2
+EBUILD chromium-5.0.366.2.ebuild 6420 RMD160 d601725cbbc67361ea89be5f279e95e4e84d4840 SHA1 47411bd1ac08ec9445aedea4701ccfd5ea8a6357 SHA256 5cc26d537267bd87ddbfa186794fa18b0a0bd5fe8377d6ffcd1ddb1885f92089
+EBUILD chromium-9999.ebuild 8173 RMD160 5bb3caf7748ddb46213944c138ccb23fcb4ad644 SHA1 2af2cdde69a7248e2a4e26fd81ce7d21229dafdd SHA256 aa1aef082add4a158abb3be4fbc8c34f69af11c0158bc01071a0e6a7d4b8d54b
+MISC ChangeLog 17030 RMD160 2ccfca1e091dc3f4087686f8c047cb3c7838c7e8 SHA1 19a7538691a0c327f887ef6fd68913a7a1ce44d3 SHA256 e59f19d22195a92ce3536a920ff40a8f8272938b07adbf2ff67e7f8e5906471e
 MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c

diff --git a/www-client/chromium/chromium-5.0.366.2.ebuild b/www-client/chromium/chromium-5.0.366.2.ebuild
index efb0ce9ae0b852ac9aa1d7d1f6903baab0bd4ace..fa835e2e833d3717385423e8cf2208f8e79a6606 100644 (file)
--- a/www-client/chromium/chromium-5.0.366.2.ebuild
+++ b/www-client/chromium/chromium-5.0.366.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.366.2.ebuild,v 1.1 2010/04/02 05:31:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.366.2.ebuild,v 1.2 2010/04/03 20:40:54 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -89,7 +89,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-drop_sse2.patch
        if ! use bindist; then
                # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
-               epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
+               epatch "${FILESDIR}"/${PN}-ffmpeg.patch
        fi
        # Prevent the make build from filling entire disk space on some systems,
        # bug 297273.

diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 4ab5fc081f767a11031e43865c0ad7487f13ebfe..1f785df9cc820c3102bb5ba35039e05b760f1510 100644 (file)
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.34 2010/03/19 17:16:03 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.35 2010/04/03 20:40:54 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
@@ -134,7 +134,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-drop_sse2.patch
        if ! use bindist; then
                # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
-               epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
+               epatch "${FILESDIR}"/${PN}-ffmpeg.patch
        fi
        # Prevent the make build from filling entire disk space on some systems,
        # bug 297273.

diff --git a/www-client/chromium/files/chromium-ffmpeg.patch b/www-client/chromium/files/chromium-ffmpeg.patch
new file mode 100644 (file)
index 0000000..8694cc6
--- /dev/null
+++ b/www-client/chromium/files/chromium-ffmpeg.patch
@@ -0,0 +1,34 @@
+--- third_party/ffmpeg/ffmpeg.gyp.orig 2010-04-03 18:29:54.000000000 +0200
++++ third_party/ffmpeg/ffmpeg.gyp      2010-04-03 18:31:02.000000000 +0200
+@@ -55,6 +55,11 @@
+     'asm_library': 'ffmpegasm',
+   },
+   'conditions': [
++    ['use_system_ffmpeg==1', {
++      'defines': [
++        'CHROMIUM_SYSTEM_FFMPEG',
++      ],
++    }],
+     ['OS!="win" and use_system_ffmpeg==0', {
+       'targets': [
+         {
+--- net/base/mime_util.cc.orig 2010-04-03 18:32:32.000000000 +0200
++++ net/base/mime_util.cc      2010-04-03 18:33:09.000000000 +0200
+@@ -189,7 +189,7 @@
+   "audio/ogg",
+   "application/ogg",
+ 
+-#if defined(GOOGLE_CHROME_BUILD)
++#if defined(CHROMIUM_SYSTEM_FFMPEG)
+   // MPEG-4.
+   "video/mp4",
+   "video/x-m4v",
+@@ -208,7 +208,7 @@
+ // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
+ // for more information.
+ static const char* const supported_media_codecs[] = {
+-#if defined(GOOGLE_CHROME_BUILD)
++#if defined(CHROMIUM_SYSTEM_FFMPEG)
+   "avc1",
+   "mp4a",
+ #endif