[Pkg-chromium-commit] [pkg-chromium] 01/01: release 44.0.2403.157-1
Michael Gilbert
mgilbert at moszumanska.debian.org
Mon Aug 24 04:41:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit d737a0038f78c646a341bbe5f4f9517ed5e32d20
Author: Michael Gilbert <mgilbert at debian.org>
Date: Mon Aug 24 00:40:25 2015 -0400
release 44.0.2403.157-1
---
debian/changelog | 9 +
debian/chromium.lintian-overrides | 2 -
debian/control | 3 +
debian/patches/series | 3 +-
debian/patches/{ => system}/clang.patch | 0
debian/patches/system/ffmpeg.patch | 197 ++++++++++
debian/patches/system/icu.patch | 650 --------------------------------
debian/rules | 2 +-
8 files changed, 212 insertions(+), 654 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 63b9998..747dd04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+chromium-browser (44.0.2403.157-1) unstable; urgency=medium
+
+ * New upstream stable release:
+ - GPU process race condition fixed (closes: #794472).
+ * Use system ffmpeg (closes: #763632):
+ - Thanks to Andreas Cadhalpun.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 23 Aug 2015 22:43:20 +0000
+
chromium-browser (44.0.2403.107-2) unstable; urgency=medium
* More updates to debian/copyright.
diff --git a/debian/chromium.lintian-overrides b/debian/chromium.lintian-overrides
index 097f1d3..d1c61a2 100644
--- a/debian/chromium.lintian-overrides
+++ b/debian/chromium.lintian-overrides
@@ -1,8 +1,6 @@
# sandbox is intentionally suid
setuid-binary usr/lib/chromium/chrome-sandbox 4755 root/root
# currently unavoidable embedded libraries
-embedded-library usr/lib/chromium/chromium: libavcodec
-embedded-library usr/lib/chromium/chromium: libavutil
embedded-library usr/lib/chromium/chromium: sqlite
embedded-library usr/lib/chromium/chromium: libpng
# temporarily accepting these code copies
diff --git a/debian/control b/debian/control
index 88b5062..a350e62 100644
--- a/debian/control
+++ b/debian/control
@@ -62,6 +62,9 @@ Build-Depends:
libpam0g-dev,
libsnappy-dev,
libgconf2-dev,
+ libavutil-dev,
+ libavcodec-dev,
+ libavformat-dev,
libasound2-dev,
libjsoncpp-dev,
libspeechd-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 79ec5c2..fd9b991 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
manpage.patch
-clang.patch
disable/promo.patch
disable/google-api-warning.patch
@@ -13,3 +12,5 @@ chromedriver-revision.patch
system/nspr.patch
system/speex.patch
+system/clang.patch
+system/ffmpeg.patch
diff --git a/debian/patches/clang.patch b/debian/patches/system/clang.patch
similarity index 100%
rename from debian/patches/clang.patch
rename to debian/patches/system/clang.patch
diff --git a/debian/patches/system/ffmpeg.patch b/debian/patches/system/ffmpeg.patch
new file mode 100644
index 0000000..4f42510
--- /dev/null
+++ b/debian/patches/system/ffmpeg.patch
@@ -0,0 +1,197 @@
+Description: Don't change the FFmpeg ABI in chromium ...
+ ... because it breaks ABI compatibility with the system FFmpeg.
+ And don't use private API, which can change at any time.
+
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Last-Update: <2015-07-26>
+
+--- a/media/ffmpeg/ffmpeg_common.h
++++ b/media/ffmpeg/ffmpeg_common.h
+@@ -19,20 +19,12 @@
+
+ // Include FFmpeg header files.
+ extern "C" {
+-// Disable deprecated features which result in spammy compile warnings. This
+-// list of defines must mirror those in the 'defines' section of the ffmpeg.gyp
+-// file or the headers below will generate different structures.
+-#define FF_API_PIX_FMT_DESC 0
+-#define FF_API_OLD_DECODE_AUDIO 0
+-#define FF_API_DESTRUCT_PACKET 0
+-#define FF_API_GET_BUFFER 0
+
+ // Temporarily disable possible loss of data warning.
+ // TODO(scherkus): fix and upstream the compiler warnings.
+ MSVC_PUSH_DISABLE_WARNING(4244);
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+-#include <libavformat/internal.h>
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
+ #include <libavutil/imgutils.h>
+--- a/media/filters/ffmpeg_demuxer.cc
++++ b/media/filters/ffmpeg_demuxer.cc
+@@ -834,24 +834,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+ // If no estimate is found, the stream entry will be kInfiniteDuration().
+ std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
+ kInfiniteDuration());
+- const AVFormatInternal* internal = format_context->internal;
+- if (internal && internal->packet_buffer &&
+- format_context->start_time != static_cast<int64>(AV_NOPTS_VALUE)) {
+- struct AVPacketList* packet_buffer = internal->packet_buffer;
+- while (packet_buffer != internal->packet_buffer_end) {
+- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
+- start_time_estimates.size());
+- const AVStream* stream =
+- format_context->streams[packet_buffer->pkt.stream_index];
+- if (packet_buffer->pkt.pts != static_cast<int64>(AV_NOPTS_VALUE)) {
+- const base::TimeDelta packet_pts =
+- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
+- if (packet_pts < start_time_estimates[stream->index])
+- start_time_estimates[stream->index] = packet_pts;
+- }
+- packet_buffer = packet_buffer->next;
+- }
+- }
+
+ AVStream* audio_stream = NULL;
+ AudioDecoderConfig audio_config;
+--- a/build/all.gyp
++++ b/build/all.gyp
+@@ -136,7 +136,7 @@
+ '../third_party/WebKit/public/all.gyp:*',
+ '../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
+ '../third_party/codesighs/codesighs.gyp:*',
+- '../third_party/ffmpeg/ffmpeg.gyp:*',
++ '../build/linux/unbundle/ffmpeg.gyp:*',
+ '../third_party/iccjpeg/iccjpeg.gyp:*',
+ '../third_party/libpng/libpng.gyp:*',
+ '../third_party/libusb/libusb.gyp:*',
+--- a/media/cast/cast_testing.gypi
++++ b/media/cast/cast_testing.gypi
+@@ -15,7 +15,7 @@
+ 'cast_net',
+ 'cast_receiver',
+ '<(DEPTH)/testing/gtest.gyp:gtest',
+- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
+ '<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
+ '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+@@ -220,7 +220,7 @@
+ '<(DEPTH)/net/net.gyp:net_test_support',
+ '<(DEPTH)/media/media.gyp:media',
+ '<(DEPTH)/testing/gtest.gyp:gtest',
+- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ '<(DEPTH)/third_party/opus/opus.gyp:opus',
+ '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+ ],
+@@ -243,7 +243,7 @@
+ '<(DEPTH)/net/net.gyp:net_test_support',
+ '<(DEPTH)/media/media.gyp:media',
+ '<(DEPTH)/testing/gtest.gyp:gtest',
+- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ '<(DEPTH)/third_party/opus/opus.gyp:opus',
+ '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+ ],
+@@ -356,7 +356,7 @@
+ '<(DEPTH)/base/base.gyp:test_support_base',
+ '<(DEPTH)/testing/gmock.gyp:gmock',
+ '<(DEPTH)/testing/gtest.gyp:gtest',
+- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ ],
+ 'sources': [
+ 'sender/h264_vt_encoder_unittest.cc',
+--- a/media/media.gyp
++++ b/media/media.gyp
+@@ -610,7 +610,7 @@
+ }],
+ ['media_use_ffmpeg==1', {
+ 'dependencies': [
+- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ ],
+ }, { # media_use_ffmpeg==0
+ # Exclude the sources that depend on ffmpeg.
+@@ -1226,7 +1226,7 @@
+ }],
+ ['media_use_ffmpeg==1', {
+ 'dependencies': [
+- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ ],
+ }, { # media_use_ffmpeg== 0
+ 'sources!': [
+@@ -1351,7 +1351,7 @@
+ }],
+ ['media_use_ffmpeg==1', {
+ 'dependencies': [
+- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ ],
+ }, { # media_use_ffmpeg==0
+ 'sources!': [
+@@ -1822,7 +1822,7 @@
+ '../base/base.gyp:test_support_base',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ '../ui/gfx/gfx.gyp:gfx_geometry',
+ 'media',
+ 'media_test_support',
+--- a/media/media_cdm.gypi
++++ b/media/media_cdm.gypi
+@@ -42,7 +42,7 @@
+ ['use_ffmpeg == 1' , {
+ 'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
+ 'dependencies': [
+- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ ],
+ 'sources': [
+ 'cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc',
+--- a/third_party/WebKit/Source/core/core.gyp
++++ b/third_party/WebKit/Source/core/core.gyp
+@@ -381,7 +381,7 @@
+ ],
+ },
+ 'dependencies': [
+- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ ],
+ }],
+ ['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', {
+@@ -397,7 +397,7 @@
+ # Windows shared builder needs extra help for linkage
+ ['OS=="win" and "WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', {
+ 'export_dependent_settings': [
+- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ ],
+ }],
+ ],
+--- a/third_party/WebKit/Source/platform/blink_platform.gyp
++++ b/third_party/WebKit/Source/platform/blink_platform.gyp
+@@ -401,7 +401,7 @@
+ '<(DEPTH)/third_party/ffmpeg',
+ ],
+ 'dependencies': [
+- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ ],
+ }],
+ ['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', {
+--- a/content/content_tests.gypi
++++ b/content/content_tests.gypi
+@@ -1530,7 +1530,7 @@
+ }, {
+ 'dependencies': [
+ # Runtime dependencis.
+- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
++ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
+ '../third_party/mesa/mesa.gyp:osmesa',
+ ],
+ }],
diff --git a/debian/patches/system/icu.patch b/debian/patches/system/icu.patch
deleted file mode 100644
index 9f0cc0e..0000000
--- a/debian/patches/system/icu.patch
+++ /dev/null
@@ -1,650 +0,0 @@
---- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h
-+++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h
-@@ -10,7 +10,7 @@
- #include "base/string16.h"
- #include "chrome/browser/chromeos/cros_settings_provider.h"
- #include "chrome/browser/chromeos/system_access.h"
--#include "third_party/icu/public/i18n/unicode/timezone.h"
-+#include <unicode/timezone.h>
-
- class Value;
- class ListValue;
---- a/app/app_base.gypi
-+++ b/app/app_base.gypi
-@@ -17,8 +17,7 @@
- '../ui/ui.gyp:ui_gfx',
- '../net/net.gyp:net',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libpng/libpng.gyp:libpng',
- '../third_party/sqlite/sqlite.gyp:sqlite',
- '../third_party/zlib/zlib.gyp:zlib',
---- a/app/app.gyp
-+++ b/app/app.gyp
-@@ -22,8 +22,7 @@
- '../skia/skia.gyp:skia',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libpng/libpng.gyp:libpng',
- '../third_party/zlib/zlib.gyp:zlib',
- '../ui/ui.gyp:ui_base',
---- a/base/base.gyp
-+++ b/base/base.gyp
-@@ -16,8 +16,7 @@
- 'msvs_guid': '968F3222-9798-4D21-BE08-15ECB5EF2994',
- 'dependencies': [
- 'base',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'conditions': [
- ['toolkit_uses_gtk==1', {
-@@ -234,8 +233,7 @@
- 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'conditions': [
- ['toolkit_uses_gtk==1', {
---- a/build/all.gyp
-+++ b/build/all.gyp
-@@ -34,7 +34,6 @@
- '../third_party/codesighs/codesighs.gyp:*',
- '../third_party/ffmpeg/ffmpeg.gyp:*',
- '../third_party/iccjpeg/iccjpeg.gyp:*',
-- '../third_party/icu/icu.gyp:*',
- '../third_party/libpng/libpng.gyp:*',
- '../third_party/libwebp/libwebp.gyp:*',
- '../third_party/libxml/libxml.gyp:*',
---- a/build/linux/system.gyp
-+++ b/build/linux/system.gyp
-@@ -360,6 +360,26 @@
- }]]
- },
- {
-+ 'target_name': 'icu',
-+ 'type': 'settings',
-+ 'conditions': [
-+ ['_toolset=="target"', {
-+ 'direct_dependent_settings': {
-+ 'cflags': [
-+ '<!@()',
-+ ],
-+ },
-+ 'link_settings': {
-+ 'ldflags': [
-+ '<!@(icu-config --ldflags)',
-+ ],
-+ 'libraries': [
-+ '<!@(icu-config --ldflags-libsonly)',
-+ ],
-+ },
-+ }]]
-+ },
-+ {
- 'target_name': 'gnome-keyring',
- 'type': 'settings',
- 'conditions': [
---- a/build/temp_gyp/googleurl.gyp
-+++ b/build/temp_gyp/googleurl.gyp
-@@ -14,9 +14,7 @@
- 'msvs_guid': 'EF5E94AB-B646-4E5B-A058-52EF07B8351C',
- 'dependencies': [
- '../../base/base.gyp:base',
-- '../../third_party/icu/icu.gyp:icudata',
-- '../../third_party/icu/icu.gyp:icui18n',
-- '../../third_party/icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- ],
- 'sources': [
- '../../googleurl/src/gurl.cc',
-@@ -73,7 +71,7 @@
- '../../base/base.gyp:base_i18n',
- '../../base/base.gyp:test_support_base',
- '../../testing/gtest.gyp:gtest',
-- '../../third_party/icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- ],
- 'sources': [
- '../../googleurl/src/gurl_unittest.cc',
---- a/chrome/chrome_browser.gypi
-+++ b/chrome/chrome_browser.gypi
-@@ -39,8 +39,7 @@
- '../third_party/bzip2/bzip2.gyp:bzip2',
- '../third_party/expat/expat.gyp:expat',
- '../third_party/hunspell/hunspell.gyp:hunspell',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libjingle/libjingle.gyp:libjingle',
- '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
- '../third_party/libphonenumber/libphonenumber.gyp:phonenumber_proto',
---- a/chrome/chrome_common.gypi
-+++ b/chrome/chrome_common.gypi
-@@ -124,8 +124,7 @@
- '../printing/printing.gyp:printing',
- '../skia/skia.gyp:skia',
- '../third_party/bzip2/bzip2.gyp:bzip2',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libxml/libxml.gyp:libxml',
- '../third_party/sqlite/sqlite.gyp:sqlite',
- '../third_party/zlib/zlib.gyp:zlib',
-@@ -375,8 +374,7 @@
- '../gpu/gpu.gyp:gpu_ipc',
- '../net/net.gyp:net_resources',
- '../net/net.gyp:net',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'conditions': [
- ['os_posix == 1 and OS != "mac"', {
---- a/chrome/chrome.gyp
-+++ b/chrome/chrome.gyp
-@@ -427,8 +427,7 @@
- 'theme_resources',
- 'theme_resources_standard',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'include_dirs': [
- '..',
-@@ -535,7 +534,7 @@
- '../base/base.gyp:base',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../jingle/jingle.gyp:notifier',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/sqlite/sqlite.gyp:sqlite',
- 'app/policy/cloud_policy_codegen.gyp:policy',
- 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
-@@ -1335,7 +1334,7 @@
- '../third_party/bzip2/bzip2.gyp:*',
- '../third_party/codesighs/codesighs.gyp:*',
- '../third_party/iccjpeg/iccjpeg.gyp:*',
-- '../third_party/icu/icu.gyp:*',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libpng/libpng.gyp:*',
- '../third_party/libwebp/libwebp.gyp:*',
- '../third_party/libxslt/libxslt.gyp:*',
---- a/chrome/chrome_renderer.gypi
-+++ b/chrome/chrome_renderer.gypi
-@@ -21,8 +21,7 @@
- '../skia/skia.gyp:skia',
- '../third_party/cld/cld.gyp:cld',
- '../third_party/hunspell/hunspell.gyp:hunspell',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/npapi/npapi.gyp:npapi',
- '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
- '../ui/gfx/surface/surface.gyp:surface',
---- a/chrome/chrome_tests.gypi
-+++ b/chrome/chrome_tests.gypi
-@@ -437,7 +437,7 @@
- '../net/net.gyp:net_resources',
- '../net/net.gyp:net_test_support',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icui18n',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libpng/libpng.gyp:libpng',
- '../third_party/zlib/zlib.gyp:zlib',
- '../testing/gtest.gyp:gtest',
-@@ -613,8 +613,7 @@
- '../skia/skia.gyp:skia',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libxml/libxml.gyp:libxml',
- # run time dependencies
- 'default_plugin/default_plugin.gyp:default_plugin',
-@@ -790,8 +789,7 @@
- '../net/net.gyp:net',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libxml/libxml.gyp:libxml',
- ],
- 'include_dirs': [
-@@ -1051,8 +1049,7 @@
- '../net/net.gyp:net',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libxml/libxml.gyp:libxml',
- ],
- 'include_dirs': [
-@@ -1119,8 +1116,7 @@
- '../net/net.gyp:net',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'include_dirs': [
- '..',
-@@ -1192,8 +1188,7 @@
- '../skia/skia.gyp:skia',
- '../third_party/bzip2/bzip2.gyp:bzip2',
- '../third_party/cld/cld.gyp:cld',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libjingle/libjingle.gyp:libjingle',
- '../third_party/libxml/libxml.gyp:libxml',
- '../ui/gfx/gl/gl.gyp:gl',
-@@ -2232,8 +2227,7 @@
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- '../third_party/cld/cld.gyp:cld',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../v8/tools/gyp/v8.gyp:v8',
- # Runtime dependencies
- '../third_party/mesa/mesa.gyp:osmesa',
-@@ -3260,8 +3254,7 @@
- '../skia/skia.gyp:skia',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/npapi/npapi.gyp:npapi',
- '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
- ],
-@@ -3420,8 +3413,7 @@
- '../net/net.gyp:net_test_support',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- # Runtime dependencies
- '../third_party/mesa/mesa.gyp:osmesa',
- ],
---- a/chrome/default_plugin/default_plugin.gyp
-+++ b/chrome/default_plugin/default_plugin.gyp
-@@ -14,8 +14,7 @@
- ':default_plugin_resources',
- '<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/net/net.gyp:net_resources',
-- '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
-- '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-+ '<(DEPTH)/build/linux/system.gyp:icu',
- '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
- '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
- '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
---- a/chrome_frame/chrome_frame.gyp
-+++ b/chrome_frame/chrome_frame.gyp
-@@ -392,8 +392,7 @@
- '../net/net.gyp:net_test_support',
- '../skia/skia.gyp:skia',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- 'chrome_frame_npapi',
- 'chrome_frame_ie',
- 'chrome_tab_idl',
---- a/content/content_common.gypi
-+++ b/content/content_common.gypi
-@@ -11,7 +11,7 @@
- '../base/base.gyp:base',
- '../ipc/ipc.gyp:ipc',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/npapi/npapi.gyp:npapi',
- '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
- '../ui/gfx/gl/gl.gyp:gl',
---- a/content/content_renderer.gypi
-+++ b/content/content_renderer.gypi
-@@ -14,8 +14,7 @@
- '../ppapi/ppapi_internal.gyp:ppapi_proxy',
- '../skia/skia.gyp:skia',
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-- '../third_party/icu/icu.gyp:icuuc',
-- '../third_party/icu/icu.gyp:icui18n',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libjingle/libjingle.gyp:libjingle',
- '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
- '../third_party/npapi/npapi.gyp:npapi',
---- a/net/net.gyp
-+++ b/net/net.gyp
-@@ -17,8 +17,7 @@
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../crypto/crypto.gyp:crypto',
- '../sdch/sdch.gyp:sdch',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/zlib/zlib.gyp:zlib',
- 'net_resources',
- 'ssl_false_start_blacklist_process#host',
-@@ -1034,8 +1033,7 @@
- # This is needed to trigger the dll copy step on windows.
- # TODO(mark): Specifying this here shouldn't be necessary.
- 'dependencies': [
-- '../third_party/icu/icu.gyp:icudata',
-- ],
-+ '../build/linux/system.gyp:icu', ],
- },
- ],
- ],
-@@ -1063,7 +1061,7 @@
- # TODO(mark): Specifying this here shouldn't be necessary.
- [ 'OS == "win"', {
- 'dependencies': [
-- '../third_party/icu/icu.gyp:icudata',
-+ '../build/linux/system.gyp:icu',
- ],
- },
- ],
---- a/printing/printing.gyp
-+++ b/printing/printing.gyp
-@@ -16,8 +16,7 @@
- '../base/base.gyp:base_i18n',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'msvs_guid': '9E5416B9-B91B-4029-93F4-102C1AD5CAF4',
- 'include_dirs': [
---- a/skia/skia.gyp
-+++ b/skia/skia.gyp
-@@ -766,7 +766,7 @@
- '../build/linux/system.gyp:fontconfig',
- '../build/linux/system.gyp:freetype2',
- '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'cflags': [
- '-Wno-unused',
---- a/third_party/cld/cld.gyp
-+++ b/third_party/cld/cld.gyp
-@@ -8,7 +8,7 @@
- 'target_name': 'cld',
- 'type': 'static_library',
- 'dependencies': [
-- '../icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- ],
- 'include_dirs': [
- '.',
---- a/third_party/harfbuzz-ng/harfbuzz.gyp
-+++ b/third_party/harfbuzz-ng/harfbuzz.gyp
-@@ -60,7 +60,7 @@
- },
- 'dependencies': [
- '../../build/linux/system.gyp:freetype2',
-- '../../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- },
- ],
---- a/third_party/hunspell/hunspell.gyp
-+++ b/third_party/hunspell/hunspell.gyp
-@@ -10,7 +10,7 @@
- 'msvs_guid': 'D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E',
- 'dependencies': [
- '../../base/base.gyp:base',
-- '../icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- ],
- 'defines': [
- 'HUNSPELL_STATIC',
---- a/third_party/libxml/libxml.gyp
-+++ b/third_party/libxml/libxml.gyp
-@@ -163,11 +163,11 @@
- 'src/include',
- ],
- 'dependencies': [
-- '../icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- '../zlib/zlib.gyp:zlib',
- ],
- 'export_dependent_settings': [
-- '../icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- ],
- 'direct_dependent_settings': {
- 'defines': [
---- a/third_party/sqlite/sqlite.gyp
-+++ b/third_party/sqlite/sqlite.gyp
-@@ -97,8 +97,7 @@
- 'src/src',
- ],
- 'dependencies': [
-- '../icu/icu.gyp:icui18n',
-- '../icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
-@@ -131,7 +130,7 @@
- 'target_name': 'sqlite_shell',
- 'type': 'executable',
- 'dependencies': [
-- '../icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- 'sqlite',
- ],
- 'sources': [
---- a/third_party/WebKit/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
-+++ b/third_party/WebKit/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
-@@ -97,8 +97,7 @@
- 'msvs_guid': 'AA8A5A85-592B-4357-BC60-E0E91E026AF6',
- 'dependencies': [
- 'wtf_config',
-- '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
-- '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
-+ '<(chromium_src_dir)/build/linux/system.gyp:icu',
- ],
- 'include_dirs': [
- '../',
-@@ -157,8 +156,7 @@
- },
- 'export_dependent_settings': [
- 'wtf_config',
-- '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
-- '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
-+ '<(chromium_src_dir)/build/linux/system.gyp:icu',
- ],
- 'msvs_disabled_warnings': [4127, 4355, 4510, 4512, 4610, 4706],
- 'conditions': [
---- a/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp
-+++ b/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp
-@@ -607,7 +607,7 @@
- '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
- '<(chromium_src_dir)/testing/gtest.gyp:gtest',
- '<(chromium_src_dir)/testing/gmock.gyp:gmock',
-- '<(chromium_src_dir)/third_party/icu/icu.gyp:*',
-+ '<(chromium_src_dir)/build/linux/system.gyp:icu',
- '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
- '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
- '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
-@@ -936,7 +936,7 @@
- 'copy_TestNetscapePlugIn',
- 'webkit',
- '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
-- '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
-+ '<(chromium_src_dir)/build/linux/system.gyp:icu',
- '<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa',
- '<(chromium_src_dir)/webkit/support/webkit_support.gyp:blob',
- '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
---- a/ui/ui_base.gypi
-+++ b/ui/ui_base.gypi
-@@ -10,14 +10,12 @@
- 'dependencies': [
- '../base/base.gyp:base',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- 'ui_gfx',
- ],
- # Export these dependencies since text_elider.h includes ICU headers.
- 'export_dependent_settings': [
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- ],
- 'sources': [
- 'base/accessibility/accessibility_types.h',
---- a/ui/ui_gfx.gypi
-+++ b/ui/ui_gfx.gypi
-@@ -44,8 +44,7 @@
- '../base/base.gyp:base',
- '../base/base.gyp:base_i18n',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../third_party/libpng/libpng.gyp:libpng',
- '../third_party/zlib/zlib.gyp:zlib',
- 'gfx_resources',
---- a/views/views.gyp
-+++ b/views/views.gyp
-@@ -66,8 +66,7 @@
- '../app/app.gyp:app_resources',
- '../base/base.gyp:base',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../ui/base/strings/ui_strings.gyp:ui_strings',
- '../ui/gfx/compositor/compositor.gyp:compositor',
- '../ui/ui.gyp:ui_base',
-@@ -471,8 +470,7 @@
- '../skia/skia.gyp:skia',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../ui/base/strings/ui_strings.gyp:ui_strings',
- 'views',
- ],
-@@ -553,8 +551,7 @@
- '../app/app.gyp:app_resources',
- '../base/base.gyp:base',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- 'views',
- ],
- 'include_dirs': [
-@@ -639,8 +636,7 @@
- '../app/app.gyp:app_resources',
- '../base/base.gyp:base',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icui18n',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- 'views',
- ],
- 'include_dirs': [
---- a/webkit/glue/webkit_glue.gypi
-+++ b/webkit/glue/webkit_glue.gypi
-@@ -118,8 +118,7 @@
- '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
- '<(DEPTH)/printing/printing.gyp:printing',
- '<(DEPTH)/skia/skia.gyp:skia',
-- '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
-- '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-+ '<(DEPTH)/build/linux/system.gyp:icu',
- '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
- 'webkit_resources',
- 'webkit_strings',
---- a/webkit/tools/test_shell/test_shell.gypi
-+++ b/webkit/tools/test_shell/test_shell.gypi
-@@ -559,7 +559,7 @@
- 'mac_bundle': 1,
- 'msvs_guid': '0D04AEC1-6B68-492C-BCCF-808DFD69ABC6',
- 'dependencies': [
-- '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-+ '<(DEPTH)/build/linux/system.gyp:icu',
- 'npapi_test_common',
- ],
- 'sources': [
---- a/chrome/chrome_installer_util.gypi
-+++ b/chrome/chrome_installer_util.gypi
-@@ -103,8 +103,7 @@
- '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '<(DEPTH)/courgette/courgette.gyp:courgette_lib',
- '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch',
-- '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
-- '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-+ '<(DEPTH)/build/linux/system.gyp:icu',
- '<(DEPTH)/third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
- ],
- 'sources': [
---- a/ppapi/ppapi_shared.gypi
-+++ b/ppapi/ppapi_shared.gypi
-@@ -13,7 +13,7 @@
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../build/temp_gyp/googleurl.gyp:googleurl',
- '../skia/skia.gyp:skia',
-- '../third_party/icu/icu.gyp:icuuc',
-+ '../build/linux/system.gyp:icu',
- '../ui/gfx/surface/surface.gyp:surface',
- ],
- 'include_dirs': [
---- a/third_party/libphonenumber/libphonenumber.gyp
-+++ b/third_party/libphonenumber/libphonenumber.gyp
-@@ -32,8 +32,7 @@
- 'target_name': 'libphonenumber',
- 'type': 'static_library',
- 'dependencies': [
-- '../icu/icu.gyp:icui18n',
-- '../icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- '../protobuf/protobuf.gyp:protobuf_lite',
- '../../base/base.gyp:base',
- '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-@@ -118,8 +117,7 @@
- 'cpp/src/test_metadata.cc',
- ],
- 'dependencies': [
-- '../icu/icu.gyp:icui18n',
-- '../icu/icu.gyp:icuuc',
-+ '../../build/linux/system.gyp:icu',
- '../protobuf/protobuf.gyp:protobuf_lite',
- '../../base/base.gyp:base',
- '../../base/base.gyp:test_support_base',
---- a/v8/src/extensions/experimental/experimental.gyp
-+++ b/v8/src/extensions/experimental/experimental.gyp
-@@ -56,7 +56,7 @@
- '../..',
- ],
- 'dependencies': [
-- '<(icu_src_dir)/icu.gyp:*',
-+ '../../../../build/linux/system.gyp:icu',
- 'js2c_i18n#host',
- '../../../tools/gyp/v8.gyp:v8',
- ],
diff --git a/debian/rules b/debian/rules
index 2f09536..cb86461 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,6 +54,7 @@ defines+=use_system_re2=1 \
use_system_expat=1 \
use_system_libpng=1 \
use_system_libxml=1 \
+ use_system_ffmpeg=1 \
use_system_libjpeg=1 \
use_system_libwebp=1 \
use_system_libxslt=1 \
@@ -79,7 +80,6 @@ defines+=use_system_icu=0 \
# use_system_libusb=0 requires modified source that exposes libusb_interrupt_handle_event api
# use_system_libvpx=0 requires modified source that exposes different api
# use_system_sqlite=0 build fails
-# use_system_ffmpeg=0 build fails
# can't use system nss since net/third_party/nss is heavily patched
# can't use system ots (open text *summarizer*) since that's not google's ots (open text *sanitizer*)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git
More information about the Pkg-chromium-commit
mailing list