Update drop_sse2 patch, bug #315247

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

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 9450c25cdcb13532001b7bda3cc0a2e152c23d69..3d8421ec70cfcc319eee829ce30f95fdf079f42e 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.85 2010/04/14 18:47:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.86 2010/04/19 09:09:45 voyageur Exp $
+
+  19 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/chromium-drop_sse2-r1.patch, chromium-9999.ebuild:
+  Update drop_sse2 patch, bug #315247
 
 *chromium-5.0.375.3 (14 Apr 2010)
 

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index db5044daf7092a64e0fe02319c2d334d39b4a65b..5cc026029a2700a88ca927fada1d9b71d5b0e721 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,4 +1,5 @@
 AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566
+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-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
@@ -11,6 +12,6 @@ DIST chromium-5.0.375.3.tar.bz2 311290995 RMD160 ef9b85b57827e3cf39027576fc890f7
 EBUILD chromium-5.0.342.9.ebuild 6477 RMD160 501a5608b94501dbea4124afccc18ddfff4009bd SHA1 0a6ebcfc916645985431f1392c0f70373bd3dd47 SHA256 ca181e9d8051eaec05efe26b0dc87fd30e00eb1bd8d3dc2252df6d8238a6cf43
 EBUILD chromium-5.0.371.0.ebuild 6705 RMD160 4ecace29d830d36ea0eeca02272ba74258883f31 SHA1 f117fb77b34f0c7ccace47e04dfa06952f10e9f8 SHA256 df746bacaba24d923acd017f3f576b5c8775bfc72aae9cd9198bb4ef8152a12b
 EBUILD chromium-5.0.375.3.ebuild 6393 RMD160 d7d5a67365d53d8180247fab3172557a39585968 SHA1 0978755af68a504f8729e86eef9ec34e78b45e9a SHA256 dcc12f33060be679f0c12de07ef0dab75408c8e4652faba4d23dc8503c074b78
-EBUILD chromium-9999.ebuild 8146 RMD160 d7010cb1dc20c7538e001a2e618318122c03898a SHA1 03493ef38c0d66cf7b380fcf7c2a937787405b17 SHA256 f42535aaecc3ed11124820027cc437661d3e68d3a7b60b36cd7da628dd2b7c16
-MISC ChangeLog 19658 RMD160 d04eaea625730c95d1009d7254138066cce3e0d8 SHA1 e549bc4c4ab3072338821fb2f051adf87360ffd4 SHA256 93c367d75b1263ea846d3bf8f5b89e41795e92033ce92ede8e4a942bc5588ace
+EBUILD chromium-9999.ebuild 8147 RMD160 8a3afd6deb332b79e3c610798fd9e0334585ad35 SHA1 540114a4fc125c367e874a15cf9b1b347a48200e SHA256 dd918f3cb309c321f7db9280c5e87fa3f10ad0fb4f9871d47e4754121d10415f
+MISC ChangeLog 19810 RMD160 00cf668650d14579d5c190e089c54cd56dda4c5a SHA1 ec46a4abeab813c785579a51ce4b0a52f648f375 SHA256 5f8907ea887e99f66cf79e718f728b6ec228e42019336450519b35f344a15223
 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 b6df6704871be5b4756d3d03c4a701a8f0d921d2..a858e92ab0f4d0b6d3bf45e527ae2d462b5f88b6 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.43 2010/04/14 18:47:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.44 2010/04/19 09:09:45 voyageur Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
@@ -121,7 +121,7 @@ src_prepare() {
        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-r1.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-r1.patch b/www-client/chromium/files/chromium-drop_sse2-r1.patch
new file mode 100644 (file)
index 0000000..c23576d
--- /dev/null
+++ b/www-client/chromium/files/chromium-drop_sse2-r1.patch
@@ -0,0 +1,45 @@
+--- 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': [