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>
Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 63 insertions, 6 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/Manifest b/www-client/chromium/Manifest
index 5cc026029a27..0e7368e22e41 100644
--- 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-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
@@ -8,10 +9,10 @@ AUX chromium-supported-media-mime-types.patch 1016 RMD160 9b3fad22b90e4bea62e343
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 DIST chromium-5.0.342.9.tar.bz2 155586284 RMD160 5ab3df8b19383c21d6279a96aa2e0c20074d58a2 SHA1 1823e1932fd68414042a3b5fc4537107ed3998bc SHA256 89a8072fc738afb7d6c5136f91deeeaa39de3d5285f3f471014af95038681903
 DIST chromium-5.0.371.0.tar.bz2 165863288 RMD160 9b0e195db6049fbca1fd9f3ebd64846bb3978984 SHA1 6f188628ff55519eea4b644afc5f7c4e24716e33 SHA256 92f21bcc8adf2e2136727188aa170530467004d073fbad8ab8e4dcb1f1ea226d
-DIST chromium-5.0.375.3.tar.bz2 311290995 RMD160 ef9b85b57827e3cf39027576fc890f700a8ccda2 SHA1 8d76584d0d0d7a2c03e30e043cc0de7ce4c8fedf SHA256 4212f5480d4f268d0297b5e3f5605bc008ffbc4c3da730afb83af0fd3965bd7c
+DIST chromium-5.0.375.9.tar.bz2 248611435 RMD160 5fdf9ed277f0464ec4b925b3047658cca4d2120a SHA1 3277a872eb8ffe04b61f301136c9600671be15e7 SHA256 13cf5a64a414c2b3cec33735efbac0c23131607fcd37d5b9bb9ec1c9ec8481bd
 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-5.0.375.9.ebuild 6545 RMD160 4a06ecd2cf3ce29d2c22420d193c2ae32c5edfa4 SHA1 4af189f6015124f79964bbd7329ea0a154b513f3 SHA256 4120a0a6ffee050319cc00d863b88fab5002c01fd4d1a16adceb713f8d771481
 EBUILD chromium-9999.ebuild 8147 RMD160 8a3afd6deb332b79e3c610798fd9e0334585ad35 SHA1 540114a4fc125c367e874a15cf9b1b347a48200e SHA256 dd918f3cb309c321f7db9280c5e87fa3f10ad0fb4f9871d47e4754121d10415f
-MISC ChangeLog 19810 RMD160 00cf668650d14579d5c190e089c54cd56dda4c5a SHA1 ec46a4abeab813c785579a51ce4b0a52f648f375 SHA256 5f8907ea887e99f66cf79e718f728b6ec228e42019336450519b35f344a15223
+MISC ChangeLog 20156 RMD160 afd26efb93d062b7d61bbe847cafcb15a7d1b77c SHA1 474ca185f3d2c9954acb6560ec41455836ea63b3 SHA256 795247ffe2fcee92b3743ae64859a9f08071dcfb889a583959383c9575e20fcd
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
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': [