rootdir parameter finally fixed in compilation, YUV amd64 assembly and other fixes. Next bumps will follow official releases, from http://src.chromium.org/viewvc/chrome/releases/

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

4 files changed, 154 insertions, 20 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 43a559b62d1a..f3a0b4a22dbd 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.13 2009/10/05 09:38:28 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.14 2009/10/13 22:55:29 voyageur Exp $
+
+*chromium-4.0.222.6_p28888 (13 Oct 2009)
+
+  13 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +chromium-4.0.222.6_p28888.ebuild, chromium-9999.ebuild:
+  rootdir parameter finally fixed in compilation, YUV amd64 assembly and
+  other fixes. Next bumps will follow official releases, from
+  http://src.chromium.org/viewvc/chrome/releases/
+
+*chromium-4.0.222.6_p28807 (13 Oct 2009)
+
+  13 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +chromium-4.0.222.6_p28807.ebuild:
+  Version bump, includes 64 bit linux yuv (faster media)
 
 *chromium-4.0.221.5_p27967 (05 Oct 2009)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 51dee2284602..5b1121980cb8 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,8 +3,10 @@ AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA
 AUX chromium-use_system_libevent.patch 7037 RMD160 97bbc89c749dea1cf8fc555dd055536745013d1c SHA1 54380af0c7a49c0c56c7d0b8c1970b3dffa7aa05 SHA256 cbac7bfab545fab11f1fef00437588bbd643f243168d160c8071422f1e37feeb
 DIST chromium-4.0.219.4_p27359.tar.bz2 124727820 RMD160 c504b1c76703f006afc70432934d42ffc2c02fa6 SHA1 070859cf677c6d249455206d19eaf85cad7924cd SHA256 380d792ed4db3a43e151834e583f144263166e4ad09a2cfa00ad22a6a552e4c0
 DIST chromium-4.0.221.5_p27967.tar.bz2 130816527 RMD160 a9ff7d1ebd786cb062d3ee96be2f47c319bac744 SHA1 02f608abf24816733aff1aba350ee7c858c90ae8 SHA256 5757866a498c7225cb65ba1df14f4d2a7d8819e05ecc191965282ef4cef472b7
+DIST chromium-4.0.222.6_p28888.tar.bz2 130837077 RMD160 8a1626c65f206fff2cf9e6946e8bf0f020023edb SHA1 b5978898b0a0e94f3d453fdeb5262afb136d4273 SHA256 91f3b09c7628da75d44aca8adbdbeb7f38d65f4ce6a8d13957fac9e600213bb6
 EBUILD chromium-4.0.219.4_p27359.ebuild 4330 RMD160 6121148ae5a7f7ed875b0b3d511fc684390d90e5 SHA1 b674f50c891069dfc9035933c1b183768234e8d2 SHA256 656b8fbb1f7a067788019cbb68e90ed18f1f9dd1ef7ac59a6f6db4abb6551155
 EBUILD chromium-4.0.221.5_p27967.ebuild 4443 RMD160 8a87aecaf5119a575b217ffa65f7bf36601f4798 SHA1 a0ec0d099149f6d4541ac7041c046b2f3660eee9 SHA256 76b9e4d325943fda7c2db264379201acb42e90434fddcaaf2a28c513ff25d2e3
-EBUILD chromium-9999.ebuild 6038 RMD160 0b860ff0ef81908dd5639c747bbb8fd50207ea0c SHA1 636b9696628aa15bdd3ab86af465008aa935278e SHA256 b1e266b91cd88e9a8f704134561a9fa2c9fbd6855b5b401253c7a7e9236f50b1
-MISC ChangeLog 2889 RMD160 8ed748d26d3fad02faa62671dc4930d51a70c26c SHA1 89f4a7e8b6d0ab84daf093fad06244d5d582c32a SHA256 ae6bf2662def2dffb2fc34cb25f4f67d44f3ce7ba36ef963bea307d32f2e9ec6
+EBUILD chromium-4.0.222.6_p28888.ebuild 4059 RMD160 16a07c34ffc3aa241b794db9e459038c95b6510c SHA1 4477783447713cddab5c5640dcac99a1a3452d84 SHA256 f6c0089c1e69e35f79c396654dc5993bcf7e68fba1d4c5dd9bb4f9f6a197047d
+EBUILD chromium-9999.ebuild 5598 RMD160 ec626c75296d0c4e1fc1dbaf6b785e61c8364b24 SHA1 ff9ec2fa0560098195eafa29c342553cbca3df24 SHA256 a3949fd62aca8b156f9c7d19deced00b017d12f65487b5a275f8a7c3f88ccbbf
+MISC ChangeLog 3423 RMD160 b5eaf5784f58ad1e795e477d78056c95270e1862 SHA1 bfe108e42c1e1701af3f9e65802c7f88a738eeb2 SHA256 17c266f1384904feb150821d857bd6b4b0001098a471d3e42f6a4fef66e6fee7
 MISC metadata.xml 365 RMD160 82a744318b3662d5cca5d912b98551f9fb193235 SHA1 2bbbeed534cb3b497e11df6be9f1e27a3c6abc44 SHA256 7547574cd9d8ae8c392a7e88180cb035c879d035250808d2939256617ce3d601
diff --git a/www-client/chromium/chromium-4.0.222.6_p28888.ebuild b/www-client/chromium/chromium-4.0.222.6_p28888.ebuild
new file mode 100644
index 000000000000..d3fbe1039a70
--- /dev/null
+++ b/www-client/chromium/chromium-4.0.222.6_p28888.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.222.6_p28888.ebuild,v 1.1 2009/10/13 22:55:29 voyageur Exp $
+
+EAPI="2"
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+#SRC_URI="http://build.chromium.org/buildbot/archives/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/bzip2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/nss-3.12.2
+	>=gnome-base/gconf-2.24.0
+	media-fonts/corefonts
+	>=media-libs/alsa-lib-1.0.19
+	media-libs/jpeg
+	media-libs/libpng
+	>=media-video/ffmpeg-0.5_p19787
+	>=x11-libs/gtk+-2.14.7"
+#	sys-libs/zlib
+#	>=dev-libs/libevent-1.4.13
+#	dev-db/sqlite:3
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.3
+	>=dev-util/pkgconfig-0.23"
+
+export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
+src_prepare() {
+	# 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
+	# Add configuration flag to use system libevent
+	epatch "${FILESDIR}"/${PN}-use_system_libevent.patch
+
+	# Display correct svn revision in about box (if not a release)
+	if [[ "${PV}" =~ "_p" ]]; then
+		echo "${PV/[0-9.]*\_p}" > build/LASTCHANGE.in || die "setting revision failed"
+	fi
+}
+
+src_configure() {
+	# CFLAGS/LDFLAGS
+	mkdir -p "${S}"/.gyp
+	cat << EOF > "${S}"/.gyp/include.gypi
+{
+	'target_defaults': {
+		'cflags': [ '${CFLAGS// /','}' ],
+		'ldflags': [ '${LDFLAGS// /','}' ],
+	},
+}
+EOF
+	export HOME="${S}"
+
+	# Configuration options (system libraries)
+	local myconf="-Duse_system_bzip2=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1 -Dlinux_use_tcmalloc=1"
+	# -Duse_system_zlib=1: needs mozzconf.h and some MOZ_Z_* functions
+	# -Duse_system_libevent=1: http://crbug.com/22140
+	# -Duse_system_sqlite=1 : http://crbug.com/22208
+	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
+
+	# Sandbox paths
+	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+
+	if use amd64; then
+		myconf="${myconf} -Dtarget_arch=x64"
+	fi
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
+		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
+	fi
+
+	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() {
+	# Chromium does not have "install" target in the build system.
+
+	dodir ${CHROMIUM_HOME}
+
+	exeinto ${CHROMIUM_HOME}
+	doexe out/Release/chrome
+	doexe out/Release/chrome_sandbox
+	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
+	doexe out/Release/xdg-settings
+	doexe "${FILESDIR}"/chromium-launcher.sh
+
+	insinto ${CHROMIUM_HOME}
+	doins out/Release/chrome.pak
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+	doins -r out/Release/themes
+
+	newman out/Release/chromium-browser.1 chrome.1
+
+	# Chromium looks for these in its folder
+	# See media_posix.cc and base_paths_linux.cc
+	dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
+	dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
+	dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
+
+	# Plugins symlink
+	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+
+	newicon out/Release/product_logo_48.png ${PN}-browser.png
+	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
+	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
+	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
+		|| die "desktop file sed failed"
+}
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index d4efa0544f41..67266fde7af5 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.2 2009/10/02 14:29:23 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.3 2009/10/13 22:55:29 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs subversion
@@ -26,8 +26,8 @@ RDEPEND="app-arch/bzip2
 	media-libs/jpeg
 	media-libs/libpng
 	>=media-video/ffmpeg-0.5_p19787
-	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7"
+#	sys-libs/zlib
 #	>=dev-libs/libevent-1.4.13
 #	dev-db/sqlite:3
 DEPEND="${RDEPEND}
@@ -80,15 +80,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Needed until we add back "rootdir=${S}", see below
-	for i in app webkit third_party/ffmpeg build/util \
-		base chrome v8/tools/gyp \
-		native_client/src/trusted/validator_*/ \
-		native_client/src/trusted/service_runtime/arch/*/
-	do
-		ln -s "${S}"/out ${i}/out
-	done
-
 	# 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
@@ -111,7 +102,8 @@ EOF
 	export HOME="${S}"
 
 	# Configuration options (system libraries)
-	local myconf="-Duse_system_bzip2=1 -Duse_system_zlib=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1 -Dlinux_use_tcmalloc=1"
+	local myconf="-Duse_system_bzip2=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1 -Dlinux_use_tcmalloc=1"
+	# -Duse_system_zlib=1: needs mozzconf.h and some MOZ_Z_* functions
 	# -Duse_system_libevent=1: http://crbug.com/22140
 	# -Duse_system_sqlite=1 : http://crbug.com/22208
 	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
@@ -130,12 +122,8 @@ EOF
 }
 
 src_compile() {
-	# Broken for "Argument list too long":
-	# http://code.google.com/p/chromium/issues/detail?id=19854
-	# http://code.google.com/p/gyp/issues/detail?id=71
-	# When this is fixed, remove the src_prepare symlinks
-	# and add back "rootdir=${S}"
 	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
+		rootdir="${S}" \
 		CC=$(tc-getCC) \
 		CXX=$(tc-getCXX) \
 		AR=$(tc-getAR) \