Date: Saturday, May 29, 2010 @ 22:30:49 Author: dgriffiths Revision: 81391
Modified: chromium/trunk/PKGBUILD chromium/trunk/drop_sse2.patch -----------------+ PKGBUILD | 142 ++++++++++++++++++++++++++++++------------------------ drop_sse2.patch | 6 +- 2 files changed, 83 insertions(+), 65 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-05-29 14:20:08 UTC (rev 81390) +++ PKGBUILD 2010-05-30 02:30:49 UTC (rev 81391) @@ -1,9 +1,10 @@ # $Id$ # Contributor: Pierre Schmitz <[email protected]> +# Contributor: Jan "heftig" Steffens <[email protected]> # Maintainer: Daniel J Griffiths <[email protected]> pkgname=chromium -pkgver=5.0.342.9 +pkgver=5.0.396.0 pkgrel=1 pkgdesc='The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser.' arch=('i686' 'x86_64') @@ -14,82 +15,99 @@ provides=('chromium-browser') conflicts=('chromium-browser') install='chromium.install' -source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz"; +source=("http://build.chromium.org/buildbot/official/chromium-${pkgver}.tar.bz2"; 'chromium.desktop' 'chromium.sh' 'drop_sse2.patch' 'ffmpeg_branding_mime.patch' 'libpng-1.4.patch') -md5sums=('cb96a81e31d38fad1d220216e71ffbbf' +md5sums=('1ca0f15f3bbf39bc298228d9abfcbe1b' '897de25e9c25a01f8b1b67abe554a6b7' - '93cd6f5f53b15546dc9d3de49118534c' - 'dfbc18bb26dffa2dc6d4d3a857730902' + '096a46ef386817988250d2d7bddd1b34' + '2003a31e2968768fadcea368e7b8b17a' 'ae9e26e6c2d164e6af0e513dae2273a3' 'bb75bfdfe85db26639abbea9054b85f9') build() { - cd ${srcdir}/chromium-${pkgver} + cd ${srcdir}/chromium-${pkgver} - export GYP_GENERATORS='make' - export BUILDTYPE='Release' - # we need to disable system_ssl until "next protocol negotiation" support - # is available in our nss package - # see https://bugzilla.mozilla.org/show_bug.cgi?id=547312 - export GYP_DEFINES="gcc_version=44 \ - no_strict_aliasing=1 \ - linux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ - linux_strip_binary=1 \ - release_extra_cflags='${CFLAGS}' \ - ffmpeg_branding=Chrome \ - use_system_libjpeg=1 \ - use_system_libxslt=0 \ - use_system_libxml=0 \ - use_system_bzip2=1 \ - use_system_zlib=1 \ - use_system_libpng=1 \ - use_system_ffmpeg=0 \ - use_system_yasm=1 \ - use_system_libevent=1 \ - use_system_ssl=0" +### Patch - patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1 - # i686 does not include SSE2 - # see http://code.google.com/p/chromium/issues/detail?id=9007 - patch -p0 -i ${srcdir}/drop_sse2.patch || return 1 - # see http://codereview.chromium.org/569009/show - patch -p0 -i ${srcdir}/libpng-1.4.patch || return 1 + patch -p1 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1 - export PATH=./depot_tools/:$PATH - gclient.py runhooks --force || return 1 + # i686 does not include SSE2 + # see http://code.google.com/p/chromium/issues/detail?id=9007 + # patch -p1 -i ${srcdir}/drop_sse2.patch || return 1 - cd src - make chrome chrome_sandbox || return 1 + # see http://codereview.chromium.org/569009/show + # patch -p1 -i ${srcdir}/libpng-1.4.patch || return 1 + +### Configure + + # we need to disable system_ssl until "next protocol negotiation" support + # is available in our nss package + # see https://bugzilla.mozilla.org/show_bug.cgi?id=547312 + + build/gyp_chromium -f make build/all.gyp --depth=. \ + -Dgcc_version=45 \ + -Dno_strict_aliasing=1 \ + -Dwerror= \ + -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ + -Dlinux_strip_binary=1 \ + -Drelease_extra_cflags="${CFLAGS}" \ + -Dffmpeg_branding=Chrome \ + -Duse_system_libjpeg=1 \ + -Duse_system_libxslt=0 \ + -Duse_system_libxml=0 \ + -Duse_system_bzip2=1 \ + -Duse_system_zlib=1 \ + -Duse_system_libpng=1 \ + -Duse_system_ffmpeg=0 \ + -Duse_system_yasm=1 \ + -Duse_system_libevent=1 \ + -Duse_system_ssl=0 \ + -Ddisable_sse2=1 + +### Build + + make chrome chrome_sandbox BUILDTYPE=Release || return 1 } package() { - cd ${srcdir}/chromium-${pkgver} + cd ${srcdir}/chromium-${pkgver} - install -m 0755 -D src/out/Release/chrome \ - ${pkgdir}/usr/lib/chromium/chromium - install -m 4555 -o root -g root -D src/out/Release/chrome_sandbox \ - ${pkgdir}/usr/lib/chromium/chromium-sandbox - install -m 0644 -D src/out/Release/chrome.pak \ - ${pkgdir}/usr/lib/chromium/chrome.pak - install -m 0644 -D src/out/Release/libffmpegsumo.so \ - ${pkgdir}/usr/lib/chromium/libffmpegsumo.so - cp -a src/out/Release/locales src/out/Release/resources \ - ${pkgdir}/usr/lib/chromium/ - find ${pkgdir}/usr/lib/chromium/ -name '*.d' -type f -delete - install -m 0644 -D src/out/Release/chrome.1 \ - ${pkgdir}/usr/share/man/man1/chromium.1 + install -m 0755 -D out/Release/chrome ${pkgdir}/usr/lib/chromium/chromium - install -m 0644 -D ${srcdir}/chromium.desktop \ - ${pkgdir}/usr/share/applications/chromium.desktop - for size in 16 32 48 256; do - install -m 0644 -D \ - src/chrome/app/theme/chromium/product_logo_${size}.png \ - ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png - done - install -m 0755 -D ${srcdir}/chromium.sh \ - ${pkgdir}/usr/bin/chromium + install -m 4555 -o root -g root -D out/Release/chrome_sandbox \ + ${pkgdir}/usr/lib/chromium/chromium-sandbox - install -m 0644 -D src/LICENSE \ - ${pkgdir}/usr/share/licenses/chromium/LICENSE + install -m 0644 -D out/Release/chrome.pak \ + ${pkgdir}/usr/lib/chromium/chrome.pak + + install -m 0755 -D out/Release/libffmpegsumo.so \ + ${pkgdir}/usr/lib/chromium/libffmpegsumo.so + + ln -s /usr/lib/libavcodec.so.52 ${pkgdir}/usr/lib/chromium/ + ln -s /usr/lib/libavformat.so.52 ${pkgdir}/usr/lib/chromium/ + ln -s /usr/lib/libavutil.so.50 ${pkgdir}/usr/lib/chromium/ + + cp -a out/Release/locales out/Release/resources \ + ${pkgdir}/usr/lib/chromium/ + + find ${pkgdir}/usr/lib/chromium/ -name '*.d' -type f -delete + + install -m 0644 -D out/Release/chrome.1 \ + ${pkgdir}/usr/share/man/man1/chromium.1 + + install -m 0644 -D ${srcdir}/chromium.desktop \ + ${pkgdir}/usr/share/applications/chromium.desktop + + for size in 16 22 24 32 48 64 128 256; do + install -m 0644 -D \ + chrome/app/theme/chromium/product_logo_${size}.png \ + ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png + done + + install -m 0755 -D ${srcdir}/chromium.sh ${pkgdir}/usr/bin/chromium + + install -m 0644 -D LICENSE ${pkgdir}/usr/share/licenses/chromium/LICENSE } + +# vim:set sw=2 sts=2 et: Modified: drop_sse2.patch =================================================================== --- drop_sse2.patch 2010-05-29 14:20:08 UTC (rev 81390) +++ drop_sse2.patch 2010-05-30 02:30:49 UTC (rev 81391) @@ -1,6 +1,6 @@ --- src/build/common.gypi 2010-02-11 19:30:43.000000000 +0100 +++ src/build/common.gypi 2010-02-11 21:07:58.505011143 +0100 -@@ -759,15 +759,6 @@ +@@ -881,15 +881,6 @@ # used during computation does not change depending on how the # compiler optimized the code, since the value is always kept # in its specified precision. @@ -13,6 +13,6 @@ - ], - }], - ], + # -mmmx allows mmintrin.h to be used for mmx intrinsics. + # video playback is mmx and sse2 optimized. 'cflags': [ - '-m32', - ],
