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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index f3e4d313534ad41fe948dc91029df5fe8e361cb2..87fc9c085213548a1bd00205b04f2e446ce45887 100644 (file)
--- 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/Manifest b/www-client/chromium/Manifest
index 0078f99b982a8cb69a59b2383677a900554d91f3..1f31d7bfdc85281ab9be883ddfb2b1949be9f50b 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,5 @@
 AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566
 AUX chromium-drop_sse2-r0.patch 1387 RMD160 5be0a252d4e99064e2cc5ba3fce33a5f525ba785 SHA1 a356549db631a7b147bf0046be8ab09d88874f15 SHA256 f035f196eea72855cf37d269810f4f99a5f348b7b8d7aaf537e35a11d6e1f1df
-AUX chromium-drop_sse2-r1.patch 1593 RMD160 5ebe750acbb90c3c3f314330256cdc36f1cfa8d6 SHA1 e48733964d663ff332609e23b11563187df7a4a5 SHA256 bfce9e286fd2fbb66034243ade492607dac605e6593fd02fd5f1be508b9a944e
 AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af8 SHA1 1aa9701b329d970db00726ba883d7dd5448ba372 SHA256 2da9ffbbaff5d00045b49ae75658df3c9f536543d388caff7a18ff093a0b1cd6
 AUX chromium-fix-make-build.patch 677 RMD160 b0dd0057d6f28e5d79b0bd9fd45b8e7cb79cbfcf SHA1 c7a7bf5fe81349f077a15458d66d53e1aa523f33 SHA256 8de8636ceedcbf0dc4f8494f48fd78baf261ef9334efe359d7e99bc668193c9e
 AUX chromium-gcc45.patch 655 RMD160 6d5ac8895dda520c5d1cc364a60a80b7576b1fa7 SHA1 fff6afa5c013b5c5efdb43c10262a4a09f024518 SHA256 b66ee24f118ef760c5279837897e3d2af5230b779543248466bf7c4f77cc5357
@@ -14,6 +13,6 @@ DIST chromium-5.0.375.29.tar.bz2 161965067 RMD160 fcdc113d014f2a58e6ba40d7e352db
 EBUILD chromium-5.0.342.9.ebuild 6548 RMD160 abb9d41541d252a60a61641ea76f6f7b1298bbcf SHA1 7f4e1c7f970b8f7a50247f27ca89bda3f064bb2a SHA256 6845b8905a1376ba8ec24ea09276d05b89d3b3c4da136d385260a4170b9e9d29
 EBUILD chromium-5.0.375.23.ebuild 6436 RMD160 d0d01d6761e605408d9d3bc07f66b33dc3f4407b SHA1 2eda56005b7f6b465497f62f548ab251d2a41f6b SHA256 504816c00293dab6da66b27740a7710fcb0328f6a0162176dd68757e0a773721
 EBUILD chromium-5.0.375.29.ebuild 6436 RMD160 189b59588b8be4b9cc73f17843f565f31533e071 SHA1 eda8acc93eae49d8748cac49fcbf8f55203c8243 SHA256 72220d7c31cd7c378e0e3113c379519d35ac7cd1ade061b61c284598755db65e
-EBUILD chromium-9999.ebuild 8092 RMD160 bf2161a03364ac1c4bacc9f08b942b51bfbe7e0d SHA1 e7f46c1b95f7bc082b3a4c9b62ede48378677c77 SHA256 abfd215a095dabd4ea18056bf7ae2b7045d656f6ea3f3e64c3411ca595f49ad6
-MISC ChangeLog 21550 RMD160 2aef42641bde56f5299079e578d6ce7f72de5636 SHA1 4180568929782ac3190c0df371a06681b0399ad0 SHA256 d66efd61450c2a6d8627c4fba7c57c9160d72da48a3a39b1f0744d3721f93223
+EBUILD chromium-9999.ebuild 8000 RMD160 2dd685a3b089b0aa070db70a7cd27d50778b8375 SHA1 1e150dbc1c1961c12473f73201f956fcfc235571 SHA256 597d44c1dff5153a6c3c04f19d4a22f6d02a1465c5238214f413418e4415d877
+MISC ChangeLog 21723 RMD160 4caf4ef8a1227cb582e02114f41416af20974d02 SHA1 1f39a9fbc1539ccf7a1c9287e5d239ff70ca50da SHA256 4e786bc19d9241eae4c194fe7ac6abe461ddf048dbf2ef2327327b34f5c2b0b8
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5

diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 47630709846eb610d054c145fbd94f7c7401904c..f451f8f8b37657c739f0ef0feaa28d2bf04c19b2 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.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 (file)
index c23576d..0000000
--- 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': [