[arch-commits] Commit in chromium/trunk (5 files)
Pierre Schmitz
pierre at archlinux.org
Thu Sep 2 19:41:15 UTC 2010
Date: Thursday, September 2, 2010 @ 15:41:15
Author: pierre
Revision: 89633
prepare chromium 6
Added:
chromium/trunk/gyp-make.patch
Modified:
chromium/trunk/PKGBUILD
Deleted:
chromium/trunk/drop_sse2.patch
chromium/trunk/ffmpeg_branding_mime.patch
chromium/trunk/libpng-1.4.patch
----------------------------+
PKGBUILD | 23 +++++++++++------------
drop_sse2.patch | 24 ------------------------
ffmpeg_branding_mime.patch | 29 -----------------------------
gyp-make.patch | 33 +++++++++++++++++++++++++++++++++
libpng-1.4.patch | 15 ---------------
5 files changed, 44 insertions(+), 80 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-09-02 18:20:11 UTC (rev 89632)
+++ PKGBUILD 2010-09-02 19:41:15 UTC (rev 89633)
@@ -4,26 +4,24 @@
# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
pkgname=chromium
-pkgver=5.0.375.127
+pkgver=6.0.472.53
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')
url='http://www.chromium.org/'
license=('BSD')
depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libevent' 'libxss')
-makedepends=('python' 'perl' 'gperf' 'yasm' 'mesa')
+makedepends=('python' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring')
provides=('chromium-browser')
conflicts=('chromium-browser')
install=chromium.install
source=("http://build.chromium.org/buildbot/official/chromium-${pkgver}.tar.bz2"
'chromium.desktop' 'chromium.sh'
- 'ffmpeg_branding_mime.patch' 'drop_sse2.patch' 'libpng-1.4.patch')
-md5sums=('8e10809ea7f592290b033a8539babd10'
+ 'gyp-make.patch')
+md5sums=('9701952b8625d9d690c602839ca4a92c'
'897de25e9c25a01f8b1b67abe554a6b7'
'096a46ef386817988250d2d7bddd1b34'
- 'ae1b32473c74b39e3f64b32d71574170'
- '4fc27c2df43d5df342b26290928b009d'
- 'bb75bfdfe85db26639abbea9054b85f9')
+ '6ac578c512c6a75357d7532211213a92')
build() {
cd ${srcdir}/chromium-${pkgver}
@@ -32,12 +30,11 @@
# workaround for gcc 4.5
# see http://code.google.com/p/chromium/issues/detail?id=41887
export CFLAGS="${CFLAGS} -fno-ipa-cp"
- patch -p1 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1
- [ "${CARCH}" == 'i686' ] && (patch -p1 -i ${srcdir}/drop_sse2.patch || return 1)
- patch -p1 -i ${srcdir}/libpng-1.4.patch || return 1
### Configure
+ patch -p0 -i ${srcdir}/gyp-make.patch
+
# 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
@@ -50,6 +47,7 @@
-Dlinux_strip_binary=1 \
-Drelease_extra_cflags="${CFLAGS}" \
-Dffmpeg_branding=Chrome \
+ -Dproprietary_codecs=1 \
-Duse_system_libjpeg=1 \
-Duse_system_libxslt=0 \
-Duse_system_libxml=0 \
@@ -59,11 +57,12 @@
-Duse_system_ffmpeg=0 \
-Duse_system_yasm=1 \
-Duse_system_libevent=1 \
- -Duse_system_ssl=0
+ -Duse_system_ssl=0 \
+ $([ "${CARCH}" == 'i686' ] && echo '-Ddisable_sse2=1')
### Build
- make chrome chrome_sandbox BUILDTYPE=Release || return 1
+ make chrome chrome_sandbox BUILDTYPE=Release
}
package() {
Deleted: drop_sse2.patch
===================================================================
--- drop_sse2.patch 2010-09-02 18:20:11 UTC (rev 89632)
+++ drop_sse2.patch 2010-09-02 19:41:15 UTC (rev 89633)
@@ -1,24 +0,0 @@
---- src/build/common.gypi 2010-02-11 19:30:43.000000000 +0100
-+++ src/build/common.gypi 2010-02-11 21:07:58.505011143 +0100
-@@ -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.
-- 'conditions': [
-- ['branding=="Chromium"', {
-- 'cflags': [
-- '-march=pentium4',
-- '-msse2',
-- '-mfpmath=sse',
-- ],
-- }],
-- ],
- # -mmmx allows mmintrin.h to be used for mmx intrinsics.
- # video playback is mmx and sse2 optimized.
- 'cflags': [
-
- '-m32',
-- '-mmmx',
- ],
- 'ldflags': [
- '-m32',
Deleted: ffmpeg_branding_mime.patch
===================================================================
--- ffmpeg_branding_mime.patch 2010-09-02 18:20:11 UTC (rev 89632)
+++ ffmpeg_branding_mime.patch 2010-09-02 19:41:15 UTC (rev 89633)
@@ -1,29 +0,0 @@
---- 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",
-
--#if defined(GOOGLE_CHROME_BUILD)
- // MPEG-4.
- "video/mp4",
- "video/x-m4v",
-@@ -200,7 +199,6 @@
- "audio/mp3",
- "audio/x-mp3",
- "audio/mpeg",
--#endif
- };
-
- // List of supported codecs when passed in with <source type="...">.
-@@ -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[] = {
--#if defined(GOOGLE_CHROME_BUILD)
- "avc1",
- "mp4a",
--#endif
- "theora",
- "vorbis",
- };
Added: gyp-make.patch
===================================================================
--- gyp-make.patch (rev 0)
+++ gyp-make.patch 2010-09-02 19:41:15 UTC (rev 89633)
@@ -0,0 +1,33 @@
+--- tools/gyp/pylib/gyp/generator/make.py (revision 839)
++++ tools/gyp/pylib/gyp/generator/make.py (working copy)
+@@ -497,6 +497,12 @@
+ return string
+
+
++def StringToMakefileVariable(string):
++ """Convert a string to a value that is acceptable as a make variable name."""
++ # TODO: replace other metacharacters that we encounter.
++ return string.replace(' ', '_')
++
++
+ srcdir_prefix = ''
+ def Sourceify(path):
+ """Convert a path to its source directory form."""
+@@ -656,7 +662,7 @@
+ part_of_all: flag indicating this target is part of 'all'
+ """
+ for action in actions:
+- name = self.target + '_' + action['action_name']
++ name = self.target + '_' + StringToMakefileVariable(action['action_name'])
+ self.WriteLn('### Rules for action "%s":' % action['action_name'])
+ inputs = action['inputs']
+ outputs = action['outputs']
+@@ -725,7 +731,7 @@
+ part_of_all: flag indicating this target is part of 'all'
+ """
+ for rule in rules:
+- name = self.target + '_' + rule['rule_name']
++ name = self.target + '_' + StringToMakefileVariable(rule['rule_name'])
+ count = 0
+ self.WriteLn('### Generated for rule %s:' % name)
+
Deleted: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch 2010-09-02 18:20:11 UTC (rev 89632)
+++ libpng-1.4.patch 2010-09-02 19:41:15 UTC (rev 89633)
@@ -1,15 +0,0 @@
---- src/third_party/WebKit/WebCore/platform/image-encoders/skia/orig/PNGImageEncoder.cpp 2009-11-19 13:39:07.000000000 -0800
-+++ src/third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp 2009-11-19 13:39:25.000000000 -0800
-@@ -130,9 +130,9 @@
- }
-
- png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
-- png_voidp_NULL,
-- png_error_ptr_NULL,
-- png_error_ptr_NULL);
-+ NULL,
-+ NULL,
-+ NULL);
- if (!pngPtr)
- return false;
-
More information about the arch-commits
mailing list