Version bump for dev channel release. Should fix problems with H.264 codec

support with system ffmpeg, bug #316029 by Daniel Faucon
<koolfy@gmail.com>
(Portage version: 2.1.7.17/cvs/Linux i686)

3 files changed, 59 insertions, 3 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 3d8421ec70cf..b6e78952f45c 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,15 @@
 # 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.86 2010/04/19 09:09:45 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.87 2010/04/19 18:55:32 phajdan.jr Exp $
+
+*chromium-5.0.375.9 (19 Apr 2010)
+
+  19 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-drop_sse2-r0.patch, -chromium-5.0.375.3.ebuild,
+  +chromium-5.0.375.9.ebuild:
+  Version bump for dev channel release. Should fix problems with H.264 codec
+  support with system ffmpeg, bug #316029 by Daniel Faucon
+  <koolfy@gmail.com>
 
   19 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org>
   +files/chromium-drop_sse2-r1.patch, chromium-9999.ebuild:
diff --git a/www-client/chromium/chromium-5.0.375.3.ebuild b/www-client/chromium/chromium-5.0.375.9.ebuild
index fa85d13cc643..cefa3f9193ed 100644
--- a/www-client/chromium/chromium-5.0.375.3.ebuild
+++ b/www-client/chromium/chromium-5.0.375.9.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.375.3.ebuild,v 1.1 2010/04/14 18:47:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.9.ebuild,v 1.1 2010/04/19 18:55:32 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -72,11 +72,15 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# The 375 branch tarballs have redundant src directory, which makes
+	# our patches apply in the wrong directory.
+	rm -r src || die "rm src failed"
+
 	# Changing this in ~/include.gypi does not work
 	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
 
 	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
-	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
+	epatch "${FILESDIR}"/${PN}-drop_sse2-r0.patch
 
 	# Allow supporting more media types provided system ffmpeg supports them.
 	epatch "${FILESDIR}"/${PN}-supported-media-mime-types.patch
diff --git a/www-client/chromium/files/chromium-drop_sse2-r0.patch b/www-client/chromium/files/chromium-drop_sse2-r0.patch
new file mode 100644
index 000000000000..7006246118ee
--- /dev/null
+++ b/www-client/chromium/files/chromium-drop_sse2-r0.patch
@@ -0,0 +1,43 @@
+--- build/common.gypi.orig	2010-04-19 18:19:49.000000000 +0200
++++ build/common.gypi	2010-04-19 18:20:41.000000000 +0200
+@@ -881,24 +881,24 @@
+             # used during computation does not change depending on how the
+             # compiler optimized the code, since the value is always kept
+             # in its specified precision.
+-            'conditions': [
+-              ['branding=="Chromium"', {
+-                'cflags': [
+-                  '-march=pentium4',
+-                  '-msse2',
+-                  '-mfpmath=sse',
+-                ],
+-              }],
+-            ],
++            #'conditions': [
++            #  ['branding=="Chromium"', {
++            #    'cflags': [
++            #      '-march=pentium4',
++            #      '-msse2',
++            #      '-mfpmath=sse',
++            #    ],
++            #  }],
++            #],
+             # -mmmx allows mmintrin.h to be used for mmx intrinsics.
+             # video playback is mmx and sse2 optimized.
+-            'cflags': [
+-              '-m32',
+-              '-mmmx',
+-            ],
+-            'ldflags': [
+-              '-m32',
+-            ],
++            #'cflags': [
++            #  '-m32',
++            #  '-mmmx',
++            #],
++            #'ldflags': [
++            #  '-m32',
++            #],
+           }],
+           ['target_arch=="arm"', {
+             'target_conditions': [