Date: Sunday, May 30, 2010 @ 13:07:40 Author: pierre Revision: 81457 prepare chromium stable release
Modified: chromium/trunk/PKGBUILD chromium/trunk/drop_sse2.patch chromium/trunk/ffmpeg_branding_mime.patch Deleted: chromium/trunk/createSource ----------------------------+ PKGBUILD | 28 +++++++++++++-------- createSource | 55 ------------------------------------------- drop_sse2.patch | 6 ++++ ffmpeg_branding_mime.patch | 10 +++---- 4 files changed, 28 insertions(+), 71 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-05-30 17:04:38 UTC (rev 81456) +++ PKGBUILD 2010-05-30 17:07:40 UTC (rev 81457) @@ -4,7 +4,7 @@ # Maintainer: Daniel J Griffiths <[email protected]> pkgname=chromium -pkgver=5.0.396.0 +pkgver=5.0.375.55 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,20 +14,26 @@ makedepends=('python' 'perl' 'gperf' 'yasm' 'mesa') provides=('chromium-browser') conflicts=('chromium-browser') +options=('force') install='chromium.install' source=("http://build.chromium.org/buildbot/official/chromium-${pkgver}.tar.bz2"; - 'chromium.desktop' 'chromium.sh' 'ffmpeg_branding_mime.patch') -md5sums=('1ca0f15f3bbf39bc298228d9abfcbe1b' + 'chromium.desktop' 'chromium.sh' + 'ffmpeg_branding_mime.patch' 'drop_sse2.patch' 'libpng-1.4.patch') +md5sums=('a5ee0492b518bdbb29a51d3d17b818a7' '897de25e9c25a01f8b1b67abe554a6b7' '096a46ef386817988250d2d7bddd1b34' - 'ae9e26e6c2d164e6af0e513dae2273a3') + 'ae1b32473c74b39e3f64b32d71574170' + '4fc27c2df43d5df342b26290928b009d' + 'bb75bfdfe85db26639abbea9054b85f9') build() { cd ${srcdir}/chromium-${pkgver} ### Patch - + export CFLAGS="${CFLAGS/-O2/-O3} -fno-ipa-cp" patch -p1 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1 + patch -p1 -i ${srcdir}/drop_sse2.patch || return 1 + patch -p1 -i ${srcdir}/libpng-1.4.patch || return 1 ### Configure @@ -36,7 +42,7 @@ # see https://bugzilla.mozilla.org/show_bug.cgi?id=547312 build/gyp_chromium -f make build/all.gyp --depth=. \ - -Dgcc_version=45 \ + -Dgcc_version=44 \ -Dno_strict_aliasing=1 \ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ @@ -52,8 +58,7 @@ -Duse_system_ffmpeg=0 \ -Duse_system_yasm=1 \ -Duse_system_libevent=1 \ - -Duse_system_ssl=0 -#-Ddisable_sse2=1 + -Duse_system_ssl=0 ### Build @@ -74,9 +79,10 @@ 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/ +# these links are only needed when building with system ffmpeg +# 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/ Deleted: createSource =================================================================== --- createSource 2010-05-30 17:04:38 UTC (rev 81456) +++ createSource 2010-05-30 17:07:40 UTC (rev 81457) @@ -1,55 +0,0 @@ -#!/bin/bash - -. PKGBUILD - -# see http://src.chromium.org/svn/trunk/src/tools/export_tarball/export_tarball.py -nonessential_dirs=( - 'src/chrome/test/data' - 'src/chrome/tools/test/reference_build' - 'src/gears/binaries' - 'src/net/data/cache_tests' - 'src/o3d/documentation' - 'src/o3d/samples' - 'src/third_party/lighttpd' - 'src/third_party/WebKit/LayoutTests' - 'src/webkit/data/layout_tests' - 'src/webkit/tools/test/reference_build' -) - -current=$(pwd) -tmp=$(mktemp -d) -mkdir -p $tmp/chromium-$pkgver -cd $tmp/chromium-$pkgver - -# this should be updated to a more recent revision on major updates -svn co -r43113 -q http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools - -export PATH=./depot_tools/:$PATH -chmod +x ./depot_tools/gclient.py -gclient.py config http://src.chromium.org/svn/releases/$pkgver -sed -e '15i\ "src/third_party/WebKit/LayoutTests": None,' \ - -e '15i\ "src/chrome/tools/test/reference_build": None,' \ - -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/ia32": None,' \ - -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg": None,' \ - -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/x64": None,' \ - -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg": None,' \ - -i .gclient -gclient.py sync --force --nohooks - -svnversion src > src/build/LASTCHANGE.in - -for i in ${nonessential_di...@]}; do - [ -d "$i" ] && rm -rf "$i" -done - -find . -name '.svn' -type d -exec rm -rf {} \; -find . -iname '*.dll' -delete -find . -iname '*.exe' -delete -find . -iname '*.o' -delete -find . -iname '*.nexe' -delete - -cd .. -bsdtar cJvf $current/chromium-$pkgver.tar.xz chromium-$pkgver -cd $current - -rm -rf $tmp Modified: drop_sse2.patch =================================================================== --- drop_sse2.patch 2010-05-30 17:04:38 UTC (rev 81456) +++ drop_sse2.patch 2010-05-30 17:07:40 UTC (rev 81457) @@ -16,3 +16,9 @@ # -mmmx allows mmintrin.h to be used for mmx intrinsics. # video playback is mmx and sse2 optimized. 'cflags': [ + + '-m32', +- '-mmmx', + ], + 'ldflags': [ + '-m32', Modified: ffmpeg_branding_mime.patch =================================================================== --- ffmpeg_branding_mime.patch 2010-05-30 17:04:38 UTC (rev 81456) +++ ffmpeg_branding_mime.patch 2010-05-30 17:07:40 UTC (rev 81457) @@ -1,6 +1,6 @@ ---- src/net/base/mime_util.cc 2010-02-11 20:07:33.939537145 +0100 -+++ src/net/base/mime_util.cc 2010-02-11 20:07:33.955373468 +0100 -@@ -188,7 +188,6 @@ +--- src/net/base/mime_util.cc 2010-05-28 16:39:20.000000000 +0200 ++++ src/net/base/mime_util.cc 2010-05-28 17:14:08.047881145 +0200 +@@ -189,7 +189,6 @@ "audio/ogg", "application/ogg", @@ -8,7 +8,7 @@ // MPEG-4. "video/mp4", "video/x-m4v", -@@ -199,7 +198,6 @@ +@@ -200,7 +199,6 @@ "audio/mp3", "audio/x-mp3", "audio/mpeg", @@ -16,7 +16,7 @@ }; // List of supported codecs when passed in with <source type="...">. -@@ -207,10 +205,8 @@ +@@ -208,10 +206,8 @@ // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support // for more information. static const char* const supported_media_codecs[] = {
