[arch-commits] Commit in chromium/trunk (3 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue Oct 25 19:20:12 UTC 2011
Date: Tuesday, October 25, 2011 @ 15:20:12
Author: foutrelis
Revision: 141194
upgpkg: chromium 15.0.874.102-1
New upstream release.
Added:
chromium/trunk/nacl.gypi
Modified:
chromium/trunk/PKGBUILD
Deleted:
chromium/trunk/webrtc-r240-r242-make-pulseaudio-optional.patch
-------------------------------------------------+
PKGBUILD | 15 +-
nacl.gypi | 8 +
webrtc-r240-r242-make-pulseaudio-optional.patch | 122 ----------------------
3 files changed, 15 insertions(+), 130 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-10-25 18:48:36 UTC (rev 141193)
+++ PKGBUILD 2011-10-25 19:20:12 UTC (rev 141194)
@@ -5,7 +5,7 @@
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
pkgname=chromium
-pkgver=14.0.835.202
+pkgver=15.0.874.102
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')
@@ -22,16 +22,19 @@
chromium.desktop
chromium.sh
gcc-4.6.patch
- webrtc-r240-r242-make-pulseaudio-optional.patch)
-sha1sums=('e1c2d7cacaa256b1d343ee012d07170dbb3beb2f'
+ nacl.gypi)
+sha1sums=('d8dd8c5f57099ee879e8bd3ab53419f10339762c'
'7d97535ec0ed124e95888de84b2c6a3654a27d4a'
'427ecf06cae11f28f59b1912d659ad5541391682'
'39999918746524fff30e73dc656754733df5c2c2'
- 'db66921c9801ad5930920faf87bd5c313a3fc702')
+ 'df4cee39e1d49e10f9c075f5e6e9db28e8260926')
build() {
cd "$srcdir/chromium-$pkgver"
+ # NaCL build remains faily
+ cp "$srcdir/nacl.gypi" chrome/
+
# Fix build with gcc 4.6
# http://code.google.com/p/chromium/issues/detail?id=80071
patch -Np0 -i "$srcdir/gcc-4.6.patch"
@@ -40,10 +43,6 @@
sed -i '/#include <cups\/cups.h>/ a #include <cups/ppd.h>' \
chrome/browser/ui/webui/print_preview_handler.cc
- # Make PulseAudio optional in WebRTC
- patch -d third_party/webrtc -Np1 -i \
- "$srcdir/webrtc-r240-r242-make-pulseaudio-optional.patch"
-
# Use Python 2
find . -type f -exec sed -i -r \
-e 's|/usr/bin/python$|&2|g' \
Added: nacl.gypi
===================================================================
--- nacl.gypi (rev 0)
+++ nacl.gypi 2011-10-25 19:20:12 UTC (rev 141194)
@@ -0,0 +1,8 @@
+{
+ 'targets': [
+ {
+ 'target_name': 'nacl',
+ 'type': 'static_library',
+ },
+ ],
+}
Deleted: webrtc-r240-r242-make-pulseaudio-optional.patch
===================================================================
--- webrtc-r240-r242-make-pulseaudio-optional.patch 2011-10-25 18:48:36 UTC (rev 141193)
+++ webrtc-r240-r242-make-pulseaudio-optional.patch 2011-10-25 19:20:12 UTC (rev 141194)
@@ -1,122 +0,0 @@
-Index: src/build/common.gypi
-===================================================================
---- src/build/common.gypi (revision 239)
-+++ src/build/common.gypi (revision 240)
-@@ -25,6 +25,13 @@
- 'direct_show_base_classes':
- 'C:/Program Files/Microsoft SDKs/Windows/v7.1/Samples/multimedia/directshow/baseclasses/',
- }],
-+ ['build_with_chromium==1', {
-+ # Exclude pulse audio on Chromium since its prerequisites don't
-+ # include pulse audio.
-+ 'include_pulse_audio%': 0,
-+ }, {
-+ 'include_pulse_audio%': 1,
-+ }],
- ], # conditions
- },
- 'target_defaults': {
-Index: src/modules/audio_device/main/source/audio_device.gyp
-===================================================================
---- src/modules/audio_device/main/source/audio_device.gyp (revision 239)
-+++ src/modules/audio_device/main/source/audio_device.gyp (revision 240)
-@@ -52,18 +52,12 @@
- 'Linux/alsasymboltable.h',
- 'Linux/audio_device_linux_alsa.cc',
- 'Linux/audio_device_linux_alsa.h',
-- 'Linux/audio_device_linux_pulse.cc',
-- 'Linux/audio_device_linux_pulse.h',
- 'Linux/audio_device_utility_linux.cc',
- 'Linux/audio_device_utility_linux.h',
- 'Linux/audio_mixer_manager_linux_alsa.cc',
- 'Linux/audio_mixer_manager_linux_alsa.h',
-- 'Linux/audio_mixer_manager_linux_pulse.cc',
-- 'Linux/audio_mixer_manager_linux_pulse.h',
- 'Linux/latebindingsymboltable.cc',
- 'Linux/latebindingsymboltable.h',
-- 'Linux/pulseaudiosymboltable.cc',
-- 'Linux/pulseaudiosymboltable.h',
- 'Mac/audio_device_mac.cc',
- 'Mac/audio_device_mac.h',
- 'Mac/audio_device_utility_mac.cc',
-@@ -89,16 +83,10 @@
- 'Linux/alsasymboltable.h',
- 'Linux/audio_device_linux_alsa.cc',
- 'Linux/audio_device_linux_alsa.h',
-- 'Linux/audio_device_linux_pulse.cc',
-- 'Linux/audio_device_linux_pulse.h',
- 'Linux/audio_mixer_manager_linux_alsa.cc',
- 'Linux/audio_mixer_manager_linux_alsa.h',
-- 'Linux/audio_mixer_manager_linux_pulse.cc',
-- 'Linux/audio_mixer_manager_linux_pulse.h',
- 'Linux/latebindingsymboltable.cc',
- 'Linux/latebindingsymboltable.h',
-- 'Linux/pulseaudiosymboltable.cc',
-- 'Linux/pulseaudiosymboltable.h',
- # Don't remove these, needed for dummy device
- # 'Linux/audio_device_utility_linux.cc',
- # 'Linux/audio_device_utility_linux.h',
-@@ -131,7 +119,6 @@
- }],
- ['OS=="linux"', {
- 'defines': [
-- 'LINUX_PULSE',
- 'LINUX_ALSA',
- ],
- 'include_dirs': [
-@@ -141,9 +128,28 @@
- 'libraries': [
- '-ldl',
- '-lasound',
-- '-lpulse',
- ],
- },
-+ 'conditions': [
-+ ['include_pulse_audio==1', {
-+ 'defines': [
-+ 'LINUX_PULSE',
-+ ],
-+ 'sources': [
-+ 'Linux/audio_device_linux_pulse.cc',
-+ 'Linux/audio_device_linux_pulse.h',
-+ 'Linux/audio_mixer_manager_linux_pulse.cc',
-+ 'Linux/audio_mixer_manager_linux_pulse.h',
-+ 'Linux/pulseaudiosymboltable.cc',
-+ 'Linux/pulseaudiosymboltable.h',
-+ ],
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lpulse',
-+ ],
-+ },
-+ }],
-+ ],
- }],
- ['OS=="mac"', {
- 'include_dirs': [
-Index: src/build/common.gypi
-===================================================================
---- src/build/common.gypi (revision 241)
-+++ src/build/common.gypi (revision 242)
-@@ -10,9 +10,19 @@
-
- {
- 'variables': {
-- # TODO(ajm): use webrtc_standalone to match NaCl?
-- 'build_with_chromium%': 1, # 1 to build webrtc with chromium
-+ # Putting a variables dict inside another variables dict looks kind of
-+ # weird. This is done so that 'build_with_chromium' is defined as
-+ # variable within the outer variables dict here. This is necessary
-+ # to get these variables defined for the conditions within this variables
-+ # dict that operate on these variables (e.g., for setting
-+ # 'include_pulse_audio', we need to have 'build_with_chromium' already set).
-+ 'variables': {
-+ # TODO(ajm): use webrtc_standalone to match NaCl?
-+ 'build_with_chromium%': 1, # 1 to build webrtc with chromium
-+ },
-
-+ 'build_with_chromium%': '<(build_with_chromium)',
-+
- # Selects fixed-point code where possible.
- # TODO(ajm): we'd like to set this based on the target OS/architecture.
- 'prefer_fixed_point%': 0,
More information about the arch-commits
mailing list