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

ffmpeg (bug #306921 by Carlos Augusto <silvaesilva@gmail.com>)
(Portage version: 2.1.7.17/cvs/Linux i686)

4 files changed, 45 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e3c6f0566899..c493caa744d9 100644
--- 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/chromium-5.0.366.2.ebuild b/www-client/chromium/chromium-5.0.366.2.ebuild
index efb0ce9ae0b8..fa835e2e833d 100644
--- 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 4ab5fc081f76..1f785df9cc82 100644
--- 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
index 000000000000..8694cc626e16
--- /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