diff options
author | Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-08-13 16:43:20 +0000 |
---|---|---|
committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-08-13 16:43:20 +0000 |
commit | 06355827ba1ae527a927af655baad5859aa9a559 (patch) | |
tree | 65a2e83e3773225974dd4266c3346f6d166c2f44 /www-client | |
parent | Mask www-client/chromium dev channel release. (diff) | |
download | gentoo-2-06355827ba1ae527a927af655baad5859aa9a559.tar.gz gentoo-2-06355827ba1ae527a927af655baad5859aa9a559.tar.bz2 gentoo-2-06355827ba1ae527a927af655baad5859aa9a559.zip |
Version bump for dev channel release. Remove old.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/chromium/ChangeLog | 10 | ||||
-rw-r--r-- | www-client/chromium/chromium-6.0.472.33.ebuild | 226 | ||||
-rw-r--r-- | www-client/chromium/chromium-6.0.490.1.ebuild (renamed from www-client/chromium/chromium-6.0.472.25-r1.ebuild) | 19 | ||||
-rw-r--r-- | www-client/chromium/chromium-9999.ebuild | 15 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-yuv-crash-r1.patch | 81 |
5 files changed, 106 insertions, 245 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/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, |