[packages/chromium-browser/DEVEL: 1/7] up to 25.0.1364.5
glen
glen at pld-linux.org
Fri Jan 11 12:21:17 CET 2013
commit 108c5f7c457fa04739ce9ae525342e4fc27986ff
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Jan 10 19:57:10 2013 +0200
up to 25.0.1364.5
chromium-browser.spec | 35 ++++++++++++++++++++++++-----------
clean-source.sh | 9 +++++++--
nacl-verbose.patch | 12 ++++++------
pulse_fix-157876.patch | 14 --------------
system-ffmpeg.patch | 41 +++++++++++++++++++++++++++++++++++++++++
system-libpng.patch | 11 +++++++++++
system-opus.patch | 26 ++++++++++++++++++++++++++
7 files changed, 115 insertions(+), 33 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index f525a2e..60ed2b7 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -14,7 +14,7 @@
%bcond_with sse2 # use SSE2 instructions
%bcond_without system_flac # system flac
%bcond_with system_ffmpeg # system ffmpeg instead of ffmpegsumo
-%bcond_with system_harfbuzz # system harfbuzz
+%bcond_without system_harfbuzz # system harfbuzz
%bcond_without system_jsoncpp # system jsoncpp
%bcond_without system_libexif # system libexif
%bcond_without system_libmtp # system libmtp
@@ -23,7 +23,7 @@
%bcond_without system_libxnvctrl # system libxnvctrl
%bcond_without system_minizip # system minizip
%bcond_without system_opus # system opus codec support, http://www.opus-codec.org/examples/
-%bcond_with system_protobuf # system protobuf
+%bcond_without system_protobuf # system protobuf
%bcond_without system_speex # system speex
%bcond_with system_sqlite # system sqlite
%bcond_without system_libsrtp # system srtp (can be used if using bundled libjingle)
@@ -51,6 +51,8 @@
# - use_system_hunspell
# - use_system_stlport
# - other defaults: src/build/common.gypi
+# - system usb-ids stuff
+# - libpci: link, because xserver loads it anyway
# NOTES:
# - mute BEEP mixer if you do not want to hear horrible system bell when
@@ -69,11 +71,11 @@
%define gyp_rev 1014
Summary: A WebKit powered web browser
Name: chromium-browser
-Version: 24.0.1312.49
+Version: 25.0.1364.5
Release: 0.24
License: BSD, LGPL v2+ (ffmpeg)
Group: X11/Applications/Networking
-Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.gz
+Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/dev/%{name}-%{version}.tar.gz
# Source0-md5: 2995d5aa3f1ecb470e60e0984229fcce
Source1: %{name}.default
Source2: %{name}.sh
@@ -95,11 +97,13 @@ Patch10: system-libxnvctrl.patch
# https://bugs.gentoo.org/show_bug.cgi?id=393471
# libjpeg-turbo >= 1.1.90 supports that feature
Patch11: chromium-revert-jpeg-swizzle-r2.patch
+Patch12: system-ffmpeg.patch
+Patch13: system-libpng.patch
+Patch14: system-opus.patch
Patch15: nacl-build-irt.patch
Patch16: nacl-linkingfix.patch
Patch18: nacl-no-untar.patch
Patch19: system-jsoncpp.patch
-Patch22: pulse_fix-157876.patch
Patch23: no-pnacl.patch
Patch24: nacl-verbose.patch
Patch25: gnome3-volume-control.patch
@@ -260,9 +264,11 @@ cd src
%patch9 -p0
#%patch2 -p1
%{!?with_libjpegturbo:%patch11 -p0}
+%patch12 -p1
+%patch13 -p0
+%patch14 -p2
%patch16 -p1
%patch19 -p1
-%patch22 -p1
%patch25 -p1
%patch27 -p1
cd ..
@@ -303,11 +309,14 @@ sh -x clean-source.sh \
cd src
%if %{with nacl}
+rm -rf native_client/toolchain/linux_x86_newlib
if [ ! -d native_client/toolchain/linux_x86_newlib ]; then
# Make symlinks for NaCL
-install -d native_client/toolchain/linux_x86_newlib/x86_64-nacl/{bin,lib,lib32,nacl}
+install -d native_client/toolchain/linux_x86_newlib/x86_64-nacl/{bin,nacl}
-cd native_client/toolchain/linux_x86_newlib/x86_64-nacl/bin
+cd native_client/toolchain/linux_x86_newlib
+ln -s x86_64-nacl/bin bin
+cd x86_64-nacl/bin
__cc='%{__cc}'
if [ "${__cc#ccache}" != "$__cc" ]; then
echo 'exec ccache %{_bindir}/x86_64-nacl-gcc "$@"' > gcc
@@ -318,13 +327,17 @@ else
ln -s %{_bindir}/x86_64-nacl-gcc gcc
ln -s %{_bindir}/x86_64-nacl-g++ g++
fi
+ln -s gcc x86_64-nacl-gcc
+ln -s g++ x86_64-nacl-g++
+ln -s %{_bindir}/x86_64-nacl-ar .
ln -s %{_bindir}/x86_64-nacl-ar ar
ln -s %{_bindir}/x86_64-nacl-as as
+ln -s %{_bindir}/x86_64-nacl-ranlib .
ln -s %{_bindir}/x86_64-nacl-ranlib ranlib
-ln -s %{_bindir}/x86_64-nacl-strip x86-64-nacl-strip
+ln -s %{_bindir}/x86_64-nacl-strip .
ln -s %{_bindir}/x86_64-nacl-strip strip
-ln -s %{_prefix}/x86_64-nacl/lib/*.a ../lib
-ln -s %{_prefix}/x86_64-nacl/lib/32/*.a ../lib32
+ln -s %{_prefix}/x86_64-nacl/lib ../lib
+ln -s %{_prefix}/x86_64-nacl/lib32 ../lib32
ln -s %{_prefix}/x86_64-nacl/include ../nacl/include
cd ../../../../..
fi
diff --git a/clean-source.sh b/clean-source.sh
index 6e58d51..4f7b294 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -33,7 +33,7 @@ remove_nonessential_dirs() {
breakpad/src/common/android \
breakpad/src/common/mac \
breakpad/src/tools/mac \
- build/android \
+ build/android_ \
build/mac \
build/win \
chrome/android \
@@ -74,7 +74,7 @@ remove_nonessential_dirs() {
chrome/tools/build/mac \
chrome/tools/build/win \
chrome_frame \
- chromeos \
+ chromeos_ \
cloud_print/service/win \
cloud_print/virtual_driver/win \
content/app/android \
@@ -352,15 +352,19 @@ almost_strip_dirs() {
'!' -iname '*.gyp*' \
'!' -path 'tools/build/*' \
'!' -path 'tools/clang/scripts/plugin_flags.sh' \
+ '!' -path 'tools/generate_library_loader/*' \
+ '!' -path 'tools/generate_shim_headers/generate_shim_headers.py' \
'!' -path 'tools/generate_stubs/*' \
'!' -path 'tools/grit/*' \
'!' -path 'tools/gritsettings/*' \
'!' -path 'tools/gyp/*' \
'!' -path 'tools/json_comment_eater.py' \
'!' -path 'tools/json_schema_compiler/*' \
+ '!' -path 'tools/json_to_struct/*' \
'!' -path 'tools/protoc_wrapper/*' \
'!' -path 'tools/uuidgen.py' \
'!' -path 'tools/zip2msi.py' \
+ '!' -path 'tools/usb_ids/*' \
-print -delete
}
@@ -415,6 +419,7 @@ clean_third_party() {
\! -path 'third_party/v8/*' \
\! -path 'third_party/webrtc/*' \
\! -path 'third_party/widevine/*' \
+ \! -path 'third_party/usb_ids/*' \
-print -delete
rm -vf third_party/expat/files/lib/expat.h
diff --git a/nacl-verbose.patch b/nacl-verbose.patch
index a1e9725..30c9180 100644
--- a/nacl-verbose.patch
+++ b/nacl-verbose.patch
@@ -1,5 +1,5 @@
---- chromium-browser-24.0.1312.45/src/native_client/./build/untrusted.gypi~ 2013-01-02 00:58:54.000000000 +0200
-+++ chromium-browser-24.0.1312.45/src/native_client/./build/untrusted.gypi 2013-01-02 10:47:58.194832395 +0200
+--- chromium-browser-25.0.1364.5/src/native_client/build/untrusted.gypi~ 2013-01-05 22:28:19.000000000 +0200
++++ chromium-browser-25.0.1364.5/src/native_client/build/untrusted.gypi 2013-01-05 22:29:09.503508356 +0200
@@ -67,7 +67,7 @@
'build_newlib': 0,
'build_glibc': 0,
@@ -9,12 +9,12 @@
'enable_x86_32': 1,
'enable_x86_64': 1,
'extra_deps_newlib64': [],
-@@ -112,7 +112,7 @@
- 'build_newlib': 0,
+@@ -116,7 +116,7 @@
+ 'nacl_enable_arm_gcc%': 0,
'build_glibc': 0,
'disable_glibc%': 1,
- 'extra_args': [],
+ 'extra_args': ['--verbose'],
+ 'enable_x86_32': 0,
+ 'enable_x86_64': 0,
'enable_arm': 1,
- 'extra_deps_newlib_arm': [],
- 'lib_dirs_newlib_arm': [],
diff --git a/pulse_fix-157876.patch b/pulse_fix-157876.patch
deleted file mode 100644
index 4749d41..0000000
--- a/pulse_fix-157876.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-retrievad from google cache of
-http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch
-
---- chromium-build/media/audio/pulse/pulse_output.cc.orig 2012-10-26 09:44:38.509209905 -0700
-+++ chromium-build/media/audio/pulse/pulse_output.cc 2012-10-26 09:45:32.178819603 -0700
-@@ -86,7 +86,7 @@
-
- // All channel maps have the same size array of channel positions.
- for (unsigned int channel = 0; channel != CHANNELS_MAX; ++channel) {
-- int channel_position = kChannelOrderings[channel_layout][channel];
-+ int channel_position = ChannelOrder(channel_layout, static_cast<Channels>(channel));
- if (channel_position > -1) {
- channel_map.map[channel_position] = ChromiumToPAChannelPosition(
- static_cast<Channels>(channel));
diff --git a/system-ffmpeg.patch b/system-ffmpeg.patch
new file mode 100644
index 0000000..04cb6f5
--- /dev/null
+++ b/system-ffmpeg.patch
@@ -0,0 +1,41 @@
+diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
+index 17241b9..8a92312 100644
+--- a/media/filters/ffmpeg_glue.h
++++ b/media/filters/ffmpeg_glue.h
+@@ -28,9 +28,9 @@
+ #include "base/basictypes.h"
+ #include "base/memory/scoped_ptr.h"
+ #include "media/base/media_export.h"
++#include "media/ffmpeg/ffmpeg_common.h"
+
+ struct AVFormatContext;
+-struct AVIOContext;
+
+ namespace media {
+
+diff --git a/media/media.gyp b/media/media.gyp
+index df217d2..fde3830 100644
+--- a/media/media.gyp
++++ b/media/media.gyp
+@@ -363,6 +363,9 @@
+ 'dependencies': [
+ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ ],
++ 'export_dependent_settings': [
++ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ ],
+ }, { # use_ffmpeg == 0
+ # Exclude the sources that depend on ffmpeg.
+ 'sources!': [
+diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
+index 81b770c..7b6d673 100644
+--- a/webkit/media/webkit_media.gypi
++++ b/webkit/media/webkit_media.gypi
+@@ -24,6 +24,7 @@
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
+ '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
++ '<(DEPTH)/media/media.gyp:media',
+ '<(DEPTH)/media/media.gyp:shared_memory_support',
+ '<(DEPTH)/media/media.gyp:yuv_convert',
+ '<(DEPTH)/skia/skia.gyp:skia',
diff --git a/system-libpng.patch b/system-libpng.patch
new file mode 100644
index 0000000..e972cde
--- /dev/null
+++ b/system-libpng.patch
@@ -0,0 +1,11 @@
+--- build/shim_headers.gypi.orig 2012-12-20 02:51:12.000000000 +0100
++++ build/shim_headers.gypi 2012-12-20 02:51:40.000000000 +0100
+@@ -10,7 +10,7 @@
+
+ {
+ 'variables': {
+- 'shim_headers_path': '<(INTERMEDIATE_DIR)/shim_headers',
++ 'shim_headers_path': '<(SHARED_INTERMEDIATE_DIR)/shim_headers/<(_target_name)',
+ },
+ 'direct_dependent_settings': {
+ 'include_dirs+': [
diff --git a/system-opus.patch b/system-opus.patch
new file mode 100644
index 0000000..39b861e
--- /dev/null
+++ b/system-opus.patch
@@ -0,0 +1,26 @@
+--- chromium-browser-25.0.1364.5/src/media/filters/opus_audio_decoder.cc~ 2012-12-20 10:01:10.000000000 +0200
++++ chromium-browser-25.0.1364.5/src/media/filters/opus_audio_decoder.cc 2013-01-06 13:47:49.557009450 +0200
+@@ -15,8 +15,7 @@
+ #include "media/base/decoder_buffer.h"
+ #include "media/base/demuxer.h"
+ #include "media/base/pipeline.h"
+-#include "third_party/opus/src/include/opus.h"
+-#include "third_party/opus/src/include/opus_multistream.h"
++#include "third_party/opus/opus.h"
+
+ namespace media {
+
+--- chromium-browser-25.0.1364.5/src/third_party/opus/opus.h 2013-01-06 14:34:57.267997054 +0200
++++ chromium-browser-25.0.1364.5/src/third_party/opus/opus.h 2013-01-06 17:26:46.252153771 +0200
+@@ -7,6 +7,11 @@
+
++#if !defined(THIRD_PARTY_OPUS_H)
++#define THIRD_PARTY_OPUS_H
+ #if defined(USE_SYSTEM_OPUS)
+ #include <opus/opus.h>
++#include <opus/opus_multistream.h>
+ #else
+ #include "third_party/opus/src/include/opus.h"
++#include "third_party/opus/src/include/opus_multistream.h"
++#endif
+ #endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/5fa8212fbdfe540a3ca1fa039395112760e895e7
More information about the pld-cvs-commit
mailing list