Version bump for dev channel release. Remove old.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

6 files changed, 111 insertions, 250 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 858d15d84173..5628d2bf10ce 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # 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.156 2010/08/12 19:51:16 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.157 2010/08/13 16:43:20 phajdan.jr Exp $
+
+*chromium-6.0.490.1 (13 Aug 2010)
+
+  13 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-yuv-crash-r1.patch, -chromium-6.0.472.25-r1.ebuild,
+  -chromium-6.0.472.33.ebuild, +chromium-6.0.490.1.ebuild,
+  chromium-9999.ebuild:
+  Version bump for dev channel release. Remove old.
 
 *chromium-6.0.472.33-r1 (12 Aug 2010)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2afe108b1d2b..4de06651d389 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,14 +7,14 @@ AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506
 AUX chromium-make-3.82-compatibility-r0.patch 867 RMD160 d6fd01bcd32460678e1503ca9fbeb78ed16e8213 SHA1 9964cbe8063140312dd1217327f3648dfaf71284 SHA256 339f8022d0a2ff733d779ba8c4a3cf09a28633afccc0106d86289ef497f2f401
 AUX chromium-plugins-path-r0.patch 1043 RMD160 698a8562c866e046b1adf8553894ee08afb53a10 SHA1 0c41adad38478c4a12970af774e782ebb208a048 SHA256 3ba3bf1c3184fb2a0c7f493947d620fd1678efdd3661ac36be3d1cb00146d108
 AUX chromium-yuv-crash-r0.patch 2043 RMD160 df3fd74f22c412b60915634e8fbc5a68e87e0b34 SHA1 b6948f6fedba5b5ed1aad44d1186e1213b74a531 SHA256 75b32a8e4f287d417930f4856c21e1b08c53fdf501df5312c346bc70425c9e65
+AUX chromium-yuv-crash-r1.patch 2165 RMD160 913447ead01a2bbf07b3698ee2f776fb027c7ecc SHA1 ab3a4170e1b55be4c4b797d209b62e3b8165142a SHA256 d38b8956a428fe6e87b46400ea9fa39be87b1a1cd8f42cf63649ff806fd0afe6
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 DIST chromium-5.0.375.125.tar.bz2 163277364 RMD160 89a5e3656287ba89b2a24b6b9b9832a74530c8fe SHA1 7377d2acbef0b2823406c9c0a5b4e39e47aab5f3 SHA256 a3f957bfd4c7418782b0b15aca8b1ca46a2c84bb0d258965f4709fab7290fd94
-DIST chromium-6.0.472.25.tar.bz2 123670988 RMD160 58826f025c884929c0420544b9f5fdbe698994d0 SHA1 76a3447dbefd860063a79333ec270d72cab9c30f SHA256 c62e619a68d90f593ee9dae5833c027318080652f690b2102510162782a4feaa
 DIST chromium-6.0.472.33.tar.bz2 123657048 RMD160 da890414ba583c361f68cf4c0ab5a8fe2ef3bc26 SHA1 a4f4d99e6ec39de27a27d3dc437288834e98085a SHA256 c6d53111d928bdeb4f1f934ab6a1bd0da68496df483d8e499d0a9dfd0fa6c195
+DIST chromium-6.0.490.1.tar.bz2 123735576 RMD160 c40cf45a02c2e0b37adfa900341210b5d0956bf4 SHA1 9f4ce21d933bd260efee5faf0ef63bd25b1962b2 SHA256 3d3e592dba1ea77d2ca06f6fa68a374f96234ad4c684bf8047b344bd8465b969
 EBUILD chromium-5.0.375.125.ebuild 5387 RMD160 dd089fb5b4332c0503a45d260c3ae3f0a805acd7 SHA1 4f49d131c499100aa36264a20b668021a1e0eec9 SHA256 4f470d73f600a78f72221c9378b7b2fe22bb87a678f257539cc022f75436c4b0
-EBUILD chromium-6.0.472.25-r1.ebuild 6891 RMD160 e186a4e89cd916ce7c219cb656d8237a4557900d SHA1 55791fe7529e79f56fbb90383d14b2bce8d67d24 SHA256 da4ddfccfe51f6b6001c1cc115e370b2b0279e69e0f23ed8c031094b4619b03c
 EBUILD chromium-6.0.472.33-r1.ebuild 7022 RMD160 ad000d011fe6e293d989db7e3f404ea55d81dea2 SHA1 20c9d6719081dd9e948c7b301ad732a901573097 SHA256 feac2e77bd76af2328a6b5226669a54ea32a94abfd0c25d49bb7bf70f53f0052
-EBUILD chromium-6.0.472.33.ebuild 6888 RMD160 060a4c37c80e5ce257705215fba975b47d5de092 SHA1 86557d0daf05b965dc14e27e9b18754638602aa7 SHA256 bcfa873788eb08f291091928d70a3778263e036ddebfbc059eb7809808f88316
-EBUILD chromium-9999.ebuild 9011 RMD160 e300a6f2aae6c3fa0d6d09fe1479133c4c03fd99 SHA1 c8a35e6e5241710ed1c3cf50940727040c00ecec SHA256 4cf8d8cffaa96a1ea4856c1cce41d72b8411294dd97c23c3b2140eb9cc0c3b42
-MISC ChangeLog 34542 RMD160 8514a54840628a3547b84ebd9f7a6b035e014255 SHA1 4a99df2f52c841585c2b8e17bc610018bda9bef4 SHA256 850f5f9d4310d763129206846a0baa4b2b9489b30b31835c7067da936122c676
+EBUILD chromium-6.0.490.1.ebuild 6908 RMD160 8b572dbeac33e5a5bb2f19459c5d6319aa251912 SHA1 8bb48040ae22168583c8c121e5757494ebe02d99 SHA256 dacac79aac966c3b6ad2831945830ffaf590b73200d3e6f8847adfaeebb96fad
+EBUILD chromium-9999.ebuild 8901 RMD160 82d6c59c9f9662d6948871bad55d37478a6651c1 SHA1 d2e420f86d2aa45d1aedbafa8405cce62ed9cc19 SHA256 484558241b67566c55662de024e914924f4e2f32d99054dd4ec9b20f6dfc2df3
+MISC ChangeLog 34838 RMD160 0345480f1e1fdb998c3ab0f3a3f88533c2485c22 SHA1 1dccc56249d017a00581aade3d275e327a083622 SHA256 3979626b5244415c64fab6206f7b377cc16cbd0caa905e174fe93808cd35f3c7
 MISC metadata.xml 378 RMD160 3309b2d1fb60157d0da1e22070ba3c448bd46b74 SHA1 0a8d13bb94e9836a14255b724b738c5df1f8ed7e SHA256 7d02fdca1b3c68d1202c720f1987713c28e38b1f9f3e30cbc3138c000572f08e
diff --git a/www-client/chromium/chromium-6.0.472.33.ebuild b/www-client/chromium/chromium-6.0.472.33.ebuild
deleted file mode 100644
index 7f36b28454ba..000000000000
--- a/www-client/chromium/chromium-6.0.472.33.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# 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-6.0.472.33.ebuild,v 1.1 2010/08/11 21:20:29 phajdan.jr Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib pax-utils toolchain-funcs
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome sse2"
-
-RDEPEND="app-arch/bzip2
-	>=dev-libs/libevent-1.4.13
-	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
-	gnome? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/jpeg:0
-	media-libs/libpng
-	cups? ( >=net-print/cups-1.4.4 )
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	>=gnome-base/gnome-keyring-2.28.2
-	sys-devel/flex"
-RDEPEND+="
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/oxygen-molecule
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)
-	x11-apps/xmessage
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-get_chromium_home() {
-	echo "/usr/$(get_libdir)/chromium-browser"
-}
-
-remove_bundled_lib() {
-	einfo "Removing bundled library $1 ..."
-	local out
-	out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \
-		|| die "failed to remove bundled library $1"
-	if [[ -z $out ]]; then
-		die "no files matched when removing bundled library $1"
-	fi
-}
-
-src_prepare() {
-	# Fix compilation, bug #332131.
-	epatch "${FILESDIR}"/${PN}-make-3.82-compatibility-r0.patch
-
-	# Add Gentoo plugin paths.
-	epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch
-
-	remove_bundled_lib "third_party/bzip2"
-	remove_bundled_lib "third_party/codesighs"
-	remove_bundled_lib "third_party/cros"
-	remove_bundled_lib "third_party/jemalloc"
-	remove_bundled_lib "third_party/lcov"
-	remove_bundled_lib "third_party/libevent"
-	remove_bundled_lib "third_party/libjpeg"
-	remove_bundled_lib "third_party/libpng"
-	remove_bundled_lib "third_party/lzma_sdk"
-	remove_bundled_lib "third_party/molokocacao"
-	remove_bundled_lib "third_party/ocmock"
-	remove_bundled_lib "third_party/py"
-	remove_bundled_lib "third_party/pyftpdlib"
-	remove_bundled_lib "third_party/simplejson"
-	remove_bundled_lib "third_party/tlslite"
-	# TODO: also remove third_party/libxml and third_party/libxslt when
-	# http://crbug.com/29333 is fixed.
-	# TODO: also remove third_party/zlib. For now the compilation fails if we
-	# remove it (minizip-related).
-}
-
-src_configure() {
-	local myconf=""
-
-	# Make it possible to build chromium on non-sse2 systems.
-	if use sse2; then
-		myconf="${myconf} -Ddisable_sse2=0"
-	else
-		myconf="${myconf} -Ddisable_sse2=1"
-	fi
-
-	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg (http://crbug.com/50678).
-	# TODO: use_system_libxml (http://crbug.com/29333).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	# TODO: use_system_icu, use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl when we have a recent enough system NSS.
-	myconf="${myconf}
-		-Duse_system_bzip2=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_zlib=1"
-
-	# The dependency on cups is optional, see bug #324105.
-	if use cups; then
-		myconf="${myconf} -Duse_cups=1"
-	else
-		myconf="${myconf} -Duse_cups=0"
-	fi
-
-	if use gnome; then
-		myconf="${myconf} -Dlinux_link_gnome_keyring=1"
-	else
-		# TODO: we should also disable code trying to dlopen
-		# gnome-keyring in that case.
-		myconf="${myconf} -Dlinux_link_gnome_keyring=0"
-	fi
-
-	# Enable sandbox.
-	myconf="${myconf}
-		-Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=$(get_chromium_home)/chrome"
-
-	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
-	# and the performance gain isn't worth it.
-	myconf="${myconf} -Dv8_use_snapshot=0"
-
-	# Disable tcmalloc memory allocator. It causes problems,
-	# for example bug #320419.
-	myconf="${myconf} -Dlinux_use_tcmalloc=0"
-
-	# Disable gpu rendering, it is incompatible with nvidia-drivers,
-	# bug #319331.
-	myconf="${myconf} -Denable_gpu=0"
-
-	# Use target arch detection logic from bug #296917.
-	local myarch="$ABI"
-	[[ $myarch = "" ]] && myarch="$ARCH"
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf="${myconf} -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf="${myconf} -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		# TODO: check this again after
-		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
-		append-flags -fno-tree-sink
-
-		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
-	fi
-
-	# Work around a likely GCC bug, see bug #331945.
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
-		append-flags -fno-ipa-cp
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf="${myconf} -Dwerror="
-
-	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
-}
-
-src_compile() {
-	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-		rootdir="${S}" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		|| die "compilation failed"
-}
-
-src_install() {
-	dodir "$(get_chromium_home)"
-
-	exeinto "$(get_chromium_home)"
-	pax-mark m out/Release/chrome
-	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox
-	fperms 4755 "$(get_chromium_home)/chrome_sandbox"
-	doexe out/Release/xdg-settings
-	doexe "${FILESDIR}"/chromium-launcher.sh
-
-	insinto "$(get_chromium_home)"
-	doins out/Release/chrome.pak || die "installing chrome.pak failed"
-	doins out/Release/resources.pak || die "installing resources.pak failed"
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1
-	newman out/Release/chrome.1 chromium.1
-
-	doexe out/Release/ffmpegsumo_nolink || die
-	doexe out/Release/libffmpegsumo.so || die
-
-	# Install icon and desktop entry.
-	newicon out/Release/product_logo_48.png ${PN}-browser.png
-	dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium
-	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \
-		"MimeType=text/html;text/xml;application/xhtml+xml;"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-		|| die "desktop file sed failed"
-
-	# Install GNOME default application entry (bug #303100).
-	dodir /usr/share/gnome-control-center/default-apps
-	insinto /usr/share/gnome-control-center/default-apps
-	doins "${FILESDIR}"/chromium.xml
-}
diff --git a/www-client/chromium/chromium-6.0.472.25-r1.ebuild b/www-client/chromium/chromium-6.0.490.1.ebuild
index b15bdb5f0d57..e31e5b3c4e6e 100644
--- a/www-client/chromium/chromium-6.0.472.25-r1.ebuild
+++ b/www-client/chromium/chromium-6.0.490.1.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-6.0.472.25-r1.ebuild,v 1.4 2010/08/11 03:20:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.490.1.ebuild,v 1.1 2010/08/13 16:43:20 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -65,6 +65,10 @@ src_prepare() {
 	# Add Gentoo plugin paths.
 	epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch
 
+	# Fix a renderer crash, bug #331661. This is a backport
+	# of the upstream patch.
+	epatch "${FILESDIR}"/${PN}-yuv-crash-r1.patch
+
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/codesighs"
 	remove_bundled_lib "third_party/cros"
@@ -137,10 +141,6 @@ src_configure() {
 	# for example bug #320419.
 	myconf="${myconf} -Dlinux_use_tcmalloc=0"
 
-	# Disable gpu rendering, it is incompatible with nvidia-drivers,
-	# bug #319331.
-	myconf="${myconf} -Denable_gpu=0"
-
 	# Use target arch detection logic from bug #296917.
 	local myarch="$ABI"
 	[[ $myarch = "" ]] && myarch="$ARCH"
@@ -178,7 +178,6 @@ src_configure() {
 
 src_compile() {
 	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-		rootdir="${S}" \
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \
 		AR="$(tc-getAR)" \
@@ -220,7 +219,9 @@ src_install() {
 		|| die "desktop file sed failed"
 
 	# Install GNOME default application entry (bug #303100).
-	dodir /usr/share/gnome-control-center/default-apps
-	insinto /usr/share/gnome-control-center/default-apps
-	doins "${FILESDIR}"/chromium.xml
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps
+		insinto /usr/share/gnome-control-center/default-apps
+		doins "${FILESDIR}"/chromium.xml
+	fi
 }
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index b32d36d85c83..cd80f0e5d2f3 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.74 2010/08/11 03:20:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.75 2010/08/13 16:43:20 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -187,10 +187,6 @@ src_configure() {
 	# for example bug #320419.
 	myconf="${myconf} -Dlinux_use_tcmalloc=0"
 
-	# Disable gpu rendering, it is incompatible with nvidia-drivers,
-	# bug #319331.
-	myconf="${myconf} -Denable_gpu=0"
-
 	# Use target arch detection logic from bug #296917.
 	local myarch="$ABI"
 	[[ $myarch = "" ]] && myarch="$ARCH"
@@ -228,7 +224,6 @@ src_configure() {
 
 src_compile() {
 	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-		rootdir="${S}" \
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \
 		AR="$(tc-getAR)" \
@@ -273,7 +268,9 @@ src_install() {
 		|| die "desktop file sed failed"
 
 	# Install GNOME default application entry (bug #303100).
-	dodir /usr/share/gnome-control-center/default-apps
-	insinto /usr/share/gnome-control-center/default-apps
-	doins "${FILESDIR}"/chromium.xml
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps
+		insinto /usr/share/gnome-control-center/default-apps
+		doins "${FILESDIR}"/chromium.xml
+	fi
 }
diff --git a/www-client/chromium/files/chromium-yuv-crash-r1.patch b/www-client/chromium/files/chromium-yuv-crash-r1.patch
new file mode 100644
index 000000000000..94a757361e30
--- /dev/null
+++ b/www-client/chromium/files/chromium-yuv-crash-r1.patch
@@ -0,0 +1,81 @@
+--- media/base/yuv_row_posix.cc.orig	2010-08-13 06:42:21.000000000 +0200
++++ media/base/yuv_row_posix.cc	2010-08-13 06:44:49.000000000 +0200
+@@ -270,6 +270,7 @@
+                               uint8* rgb_buf,
+                               int width);
+   asm(
++  ".text\n"
+   ".global FastConvertYUVToRGB32Row\n"
+ "FastConvertYUVToRGB32Row:\n"
+   "pusha\n"
+@@ -329,6 +330,7 @@
+                         int width,
+                         int source_dx);
+   asm(
++  ".text\n"
+   ".global ScaleYUVToRGB32Row\n"
+ "ScaleYUVToRGB32Row:\n"
+   "pusha\n"
+@@ -402,6 +404,7 @@
+                               int width,
+                               int source_dx);
+   asm(
++  ".text\n"
+   ".global LinearScaleYUVToRGB32Row\n"
+ "LinearScaleYUVToRGB32Row:\n"
+   "pusha\n"
+@@ -514,7 +517,7 @@
+                                     int width,
+                                     int16 *kCoefficientsRgbY);
+   asm(
+-
++  ".text\n"
+ #if defined(OS_MACOSX)
+ "_PICConvertYUVToRGB32Row:\n"
+ #else
+@@ -588,6 +591,7 @@
+                                int16 *kCoefficientsRgbY);
+ 
+   asm(
++  ".text\n"
+ #if defined(OS_MACOSX)
+ "_PICScaleYUVToRGB32Row:\n"
+ #else
+@@ -676,6 +680,7 @@
+                                  int source_dx,
+                                  int16 *kCoefficientsRgbY);
+   asm(
++  ".text\n"
+ #if defined(OS_MACOSX)
+ "_PICLinearScaleYUVToRGB32Row:\n"
+ #else
+@@ -833,29 +838,6 @@
+                                         (packuswb(a) << 24);
+ }
+ 
+-#if TEST_MMX_YUV
+-static inline void YuvPixel(uint8 y,
+-                            uint8 u,
+-                            uint8 v,
+-                            uint8* rgb_buf) {
+-
+-  asm {
+-    movzx     eax, u
+-    movq      mm0, [kCoefficientsRgbY+2048 + 8 * eax]
+-    movzx     eax, v
+-    paddsw    mm0, [kCoefficientsRgbY+4096 + 8 * eax]
+-    movzx     eax, y
+-    movq      mm1, [kCoefficientsRgbY + 8 * eax]
+-    paddsw    mm1, mm0
+-    psraw     mm1, 6
+-    packuswb  mm1, mm1
+-    mov       eax, rgb_buf
+-    movd      [eax], mm1
+-    emms
+-  }
+-}
+-#endif
+-
+ void FastConvertYUVToRGB32Row(const uint8* y_buf,
+                               const uint8* u_buf,
+                               const uint8* v_buf,