[Pkg-chromium-commit] [pkg-chromium] 01/02: refresh patches for chromium 38
Michael Gilbert
mgilbert at moszumanska.debian.org
Thu Jan 21 23:28:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit f55456a6aa94a81b246fc852c33abbbe5ba2d6aa
Author: Michael Gilbert <mgilbert at debian.org>
Date: Thu Jan 21 23:27:39 2016 +0000
refresh patches for chromium 38
---
.../patches/disable/default-browser-warning.patch | 2 +-
debian/patches/disable/external-components.patch | 2 +-
debian/patches/disable/google-api-warning.patch | 2 +-
debian/patches/gpu-timeout.patch | 2 +-
debian/patches/manpage.patch | 2 +-
debian/patches/series | 2 +-
debian/patches/system/clang.patch | 2 +-
debian/patches/system/ffmpeg.patch | 39 ++++++++--------------
debian/patches/system/nspr.patch | 2 +-
9 files changed, 21 insertions(+), 34 deletions(-)
diff --git a/debian/patches/disable/default-browser-warning.patch b/debian/patches/disable/default-browser-warning.patch
index 328a2a3..31093ad 100644
--- a/debian/patches/disable/default-browser-warning.patch
+++ b/debian/patches/disable/default-browser-warning.patch
@@ -2,7 +2,7 @@ description: never show the default browser question
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -819,7 +819,7 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -814,7 +814,7 @@ void StartupBrowserCreatorImpl::AddInfoB
browser->tab_strip_model()->GetActiveWebContents()));
#if !defined(OS_CHROMEOS)
diff --git a/debian/patches/disable/external-components.patch b/debian/patches/disable/external-components.patch
index 4782ac5..f06b405 100644
--- a/debian/patches/disable/external-components.patch
+++ b/debian/patches/disable/external-components.patch
@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
-@@ -35,6 +35,9 @@ ExternalComponentLoader::~ExternalCompon
+@@ -38,6 +38,9 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
prefs_.reset(new base::DictionaryValue());
diff --git a/debian/patches/disable/google-api-warning.patch b/debian/patches/disable/google-api-warning.patch
index b5a0ffd..ca3944c 100644
--- a/debian/patches/disable/google-api-warning.patch
+++ b/debian/patches/disable/google-api-warning.patch
@@ -2,7 +2,7 @@ description: disable the google api key warning when those aren't found
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -815,8 +815,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -810,8 +810,6 @@ void StartupBrowserCreatorImpl::AddInfoB
if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP &&
!command_line_.HasSwitch(switches::kTestType)) {
chrome::ShowBadFlagsPrompt(browser);
diff --git a/debian/patches/gpu-timeout.patch b/debian/patches/gpu-timeout.patch
index 5a72d4d..dc34d37 100644
--- a/debian/patches/gpu-timeout.patch
+++ b/debian/patches/gpu-timeout.patch
@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/781940
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
-@@ -78,7 +78,7 @@
+@@ -84,7 +84,7 @@
#if defined(CYGPROFILE_INSTRUMENTATION)
const int kGpuTimeout = 30000;
#else
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
index da4008d..f39b7b9 100644
--- a/debian/patches/manpage.patch
+++ b/debian/patches/manpage.patch
@@ -42,7 +42,7 @@ Author: Daniel Echeverry <epsilon77 at gmail.com>
.SH ENVIRONMENT
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
-@@ -128,7 +128,7 @@
+@@ -129,7 +129,7 @@
}, { # else branding!="Chrome"
'variables': {
'name': 'Chromium',
diff --git a/debian/patches/series b/debian/patches/series
index 7252704..d6167b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,7 @@ gpu-timeout.patch
master-preferences.patch
chromedriver-revision.patch
-system/jpeg.patch
+# system/jpeg.patch
system/nspr.patch
system/clang.patch
# system/vaapi.patch
diff --git a/debian/patches/system/clang.patch b/debian/patches/system/clang.patch
index cc4c3bf..8536325 100644
--- a/debian/patches/system/clang.patch
+++ b/debian/patches/system/clang.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/build/common.gypi
+++ b/build/common.gypi
-@@ -5954,8 +5954,8 @@
+@@ -5980,8 +5980,8 @@
['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
'and OS!="win"', {
'make_global_settings': [
diff --git a/debian/patches/system/ffmpeg.patch b/debian/patches/system/ffmpeg.patch
index 6360535..d3e2be3 100644
--- a/debian/patches/system/ffmpeg.patch
+++ b/debian/patches/system/ffmpeg.patch
@@ -7,20 +7,7 @@ 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.
+@@ -36,7 +36,6 @@ extern "C" {
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@ -30,19 +17,19 @@ Last-Update: <2015-07-26>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -861,7 +861,11 @@ void FFmpegDemuxer::Initialize(DemuxerHo
+@@ -862,7 +862,11 @@ void FFmpegDemuxer::Initialize(DemuxerHo
// this does not increase the amount of data downloaded. The default value
// is 5 AV_TIME_BASE units (1 second each), which prevents some oddly muxed
// streams from being detected properly; this value was chosen arbitrarily.
+#if LIBAVCODEC_VERSION_MAJOR < 57
- format_context->max_analyze_duration2 = 60 * AV_TIME_BASE;
++ format_context->max_analyze_duration2 = 60 * AV_TIME_BASE;
+#else
-+ format_context->max_analyze_duration = 60 * AV_TIME_BASE;
+ format_context->max_analyze_duration = 60 * AV_TIME_BASE;
+#endif
// Open the AVFormatContext using our glue layer.
CHECK(blocking_thread_.Start());
-@@ -1013,24 +1017,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -1019,24 +1023,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());
@@ -89,7 +76,7 @@ Last-Update: <2015-07-26>
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
'<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
-@@ -223,7 +223,7 @@
+@@ -220,7 +220,7 @@
'<(DEPTH)/net/net.gyp:net_test_support',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -98,7 +85,7 @@ Last-Update: <2015-07-26>
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
-@@ -246,7 +246,7 @@
+@@ -243,7 +243,7 @@
'<(DEPTH)/net/net.gyp:net_test_support',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -107,7 +94,7 @@ Last-Update: <2015-07-26>
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
-@@ -359,7 +359,7 @@
+@@ -356,7 +356,7 @@
'<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -118,7 +105,7 @@ Last-Update: <2015-07-26>
'sender/h264_vt_encoder_unittest.cc',
--- a/media/media.gyp
+++ b/media/media.gyp
-@@ -642,7 +642,7 @@
+@@ -649,7 +649,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -127,7 +114,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
# Exclude the sources that depend on ffmpeg.
-@@ -1330,7 +1330,7 @@
+@@ -1334,7 +1334,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -136,7 +123,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
'sources!': [
-@@ -1471,7 +1471,7 @@
+@@ -1489,7 +1489,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -145,7 +132,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
'sources!': [
-@@ -1940,7 +1940,7 @@
+@@ -1981,7 +1981,7 @@
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
@@ -198,7 +185,7 @@ Last-Update: <2015-07-26>
['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', {
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
-@@ -1619,7 +1619,7 @@
+@@ -1609,7 +1609,7 @@
}, {
'dependencies': [
# Runtime dependencis.
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index e3ea844..1ee8084 100644
--- a/debian/patches/system/nspr.patch
+++ b/debian/patches/system/nspr.patch
@@ -2,7 +2,7 @@ Include system copy of prtime.h
--- a/base/base.gypi
+++ b/base/base.gypi
-@@ -622,8 +622,6 @@
+@@ -627,8 +627,6 @@
'third_party/dmg_fp/g_fmt.cc',
'third_party/icu/icu_utf.cc',
'third_party/icu/icu_utf.h',
--
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