Drop SSE2 patch, it can now be disabled via a gyp define

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 8 insertions, 52 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index f3e4d313534a..87fc9c085213 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # 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.94 2010/05/04 14:51:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.95 2010/05/05 12:33:26 voyageur Exp $
+
+  05 May 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/chromium-drop_sse2-r1.patch, chromium-9999.ebuild:
+  Drop SSE2 patch, it can now be disabled via a gyp define
 
 *chromium-5.0.375.29 (04 May 2010)
 
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 47630709846e..f451f8f8b376 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.48 2010/05/04 11:15:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.49 2010/05/05 12:33:26 voyageur Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
@@ -119,9 +119,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
-	epatch "${FILESDIR}"/${PN}-drop_sse2-r1.patch
-
 	# Allow supporting more media types provided system ffmpeg supports them.
 	epatch "${FILESDIR}"/${PN}-supported-media-mime-types.patch
 }
@@ -151,8 +148,8 @@ src_configure() {
 EOF
 	export HOME="${S}"
 
-	# Configuration options (system libraries)
-	local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
+	# Configuration options (system libraries and disable forced SSE2)
+	local myconf="-Ddisable_sse2=1 -Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
 	# -Duse_system_sqlite=1 : http://crbug.com/22208
 	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
 
diff --git a/www-client/chromium/files/chromium-drop_sse2-r1.patch b/www-client/chromium/files/chromium-drop_sse2-r1.patch
deleted file mode 100644
index c23576d9a7df..000000000000
--- a/www-client/chromium/files/chromium-drop_sse2-r1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- build/common.gypi.orig	2010-04-19 10:21:47.000000000 +0200
-+++ build/common.gypi	2010-04-19 10:23:40.000000000 +0200
-@@ -890,13 +890,14 @@
-             # compiler optimized the code, since the value is always kept
-             # in its specified precision.
-             'conditions': [
--              ['branding=="Chromium"', {
--                'cflags': [
--                  '-march=pentium4',
--                  '-msse2',
--                  '-mfpmath=sse',
--                ],
--              }],
-+	    # Disabled: see http://code.google.com/p/chromium/issues/detail?id=9007
-+            #  ['branding=="Chromium"', {
-+            #    'cflags': [
-+            #      '-march=pentium4',
-+            #      '-msse2',
-+            #      '-mfpmath=sse',
-+            #    ],
-+            #  }],
-               # ChromeOS targets Pinetrail, which is ssse3, but most of the
-               # benefit comes from sse2 so this setting allows ChromeOS
-               # to build on other CPUs.  In the future -march=atom would help
-@@ -909,13 +910,13 @@
-             ],
-             # -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': [