[Pkg-chromium-commit] [pkg-chromium] 01/02: refresh patches for chromium 47
Michael Gilbert
mgilbert at moszumanska.debian.org
Tue Dec 8 01:51:48 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 e3327a0fcec14e9da47f10614f6898c180dcc2ee
Author: Michael Gilbert <mgilbert at debian.org>
Date: Tue Dec 8 01:50:56 2015 +0000
refresh patches for chromium 47
---
debian/patches/chromedriver-revision.patch | 2 +-
.../patches/disable/default-browser-warning.patch | 2 +-
debian/patches/disable/google-api-warning.patch | 2 +-
debian/patches/gpu-timeout.patch | 15 ++
debian/patches/manpage.patch | 2 +-
debian/patches/series | 3 +
debian/patches/system/clang.patch | 2 +-
debian/patches/system/ffmpeg.patch | 24 +-
debian/patches/system/nspr.patch | 2 +-
debian/patches/system/vaapi.patch | 259 +++++++++++++++++++++
10 files changed, 295 insertions(+), 18 deletions(-)
diff --git a/debian/patches/chromedriver-revision.patch b/debian/patches/chromedriver-revision.patch
index 9f5d7bf..0ef12c9 100644
--- a/debian/patches/chromedriver-revision.patch
+++ b/debian/patches/chromedriver-revision.patch
@@ -3,7 +3,7 @@ description: set chromedriver version as undefined
--- a/chrome/test/chromedriver/embed_version_in_cpp.py
+++ b/chrome/test/chromedriver/embed_version_in_cpp.py
@@ -26,7 +26,7 @@ def main():
- options, args = parser.parse_args()
+ options, _ = parser.parse_args()
version = open(options.version_file, 'r').read().strip()
- revision = lastchange.FetchVersionInfo(None).revision
diff --git a/debian/patches/disable/default-browser-warning.patch b/debian/patches/disable/default-browser-warning.patch
index 5423429..328a2a3 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
-@@ -817,7 +817,7 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -819,7 +819,7 @@ void StartupBrowserCreatorImpl::AddInfoB
browser->tab_strip_model()->GetActiveWebContents()));
#if !defined(OS_CHROMEOS)
diff --git a/debian/patches/disable/google-api-warning.patch b/debian/patches/disable/google-api-warning.patch
index 893347a..b5a0ffd 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
-@@ -813,8 +813,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -815,8 +815,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
new file mode 100644
index 0000000..5a72d4d
--- /dev/null
+++ b/debian/patches/gpu-timeout.patch
@@ -0,0 +1,15 @@
+description: 10 seconds may not be enough, so don't kill the gpu process until 20.
+author: Chad MILLER <chad.miller at canonical.com>
+bug-debian: http://bugs.debian.org/781940
+
+--- a/content/gpu/gpu_main.cc
++++ b/content/gpu/gpu_main.cc
+@@ -78,7 +78,7 @@
+ #if defined(CYGPROFILE_INSTRUMENTATION)
+ const int kGpuTimeout = 30000;
+ #else
+-const int kGpuTimeout = 10000;
++const int kGpuTimeout = 20000;
+ #endif
+
+ namespace content {
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
index 499fc88..da4008d 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
-@@ -137,7 +137,7 @@
+@@ -128,7 +128,7 @@
}, { # else branding!="Chrome"
'variables': {
'name': 'Chromium',
diff --git a/debian/patches/series b/debian/patches/series
index d035781..50c596e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,10 +7,13 @@ disable/external-components.patch
disable/default-browser-warning.patch
ps-print.patch
+gpu-timeout.patch
master-preferences.patch
chromedriver-revision.patch
system/nspr.patch
system/clang.patch
+system/vaapi.patch
system/ffmpeg.patch
+
webui.patch
diff --git a/debian/patches/system/clang.patch b/debian/patches/system/clang.patch
index 90a1fdd..cc4c3bf 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
-@@ -5986,8 +5986,8 @@
+@@ -5954,8 +5954,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 6c69ffa..adb366d 100644
--- a/debian/patches/system/ffmpeg.patch
+++ b/debian/patches/system/ffmpeg.patch
@@ -30,7 +30,7 @@ Last-Update: <2015-07-26>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -944,24 +944,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -1013,24 +1013,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());
@@ -57,7 +57,7 @@ Last-Update: <2015-07-26>
AudioDecoderConfig audio_config;
--- a/build/all.gyp
+++ b/build/all.gyp
-@@ -136,7 +136,7 @@
+@@ -135,7 +135,7 @@
'../third_party/WebKit/public/all.gyp:*',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
'../third_party/codesighs/codesighs.gyp:*',
@@ -77,7 +77,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',
-@@ -221,7 +221,7 @@
+@@ -223,7 +223,7 @@
'<(DEPTH)/net/net.gyp:net_test_support',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -86,7 +86,7 @@ Last-Update: <2015-07-26>
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
-@@ -244,7 +244,7 @@
+@@ -246,7 +246,7 @@
'<(DEPTH)/net/net.gyp:net_test_support',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -95,7 +95,7 @@ Last-Update: <2015-07-26>
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
-@@ -357,7 +357,7 @@
+@@ -359,7 +359,7 @@
'<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -106,7 +106,7 @@ Last-Update: <2015-07-26>
'sender/h264_vt_encoder_unittest.cc',
--- a/media/media.gyp
+++ b/media/media.gyp
-@@ -635,7 +635,7 @@
+@@ -642,7 +642,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -115,7 +115,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
# Exclude the sources that depend on ffmpeg.
-@@ -1306,7 +1306,7 @@
+@@ -1330,7 +1330,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -124,7 +124,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
'sources!': [
-@@ -1449,7 +1449,7 @@
+@@ -1471,7 +1471,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -133,7 +133,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
'sources!': [
-@@ -1914,7 +1914,7 @@
+@@ -1940,7 +1940,7 @@
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
@@ -155,7 +155,7 @@ Last-Update: <2015-07-26>
'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 @@
+@@ -383,7 +383,7 @@
],
},
'dependencies': [
@@ -164,7 +164,7 @@ Last-Update: <2015-07-26>
],
}],
['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', {
-@@ -397,7 +397,7 @@
+@@ -399,7 +399,7 @@
# Windows shared builder needs extra help for linkage
['OS=="win" and "WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', {
'export_dependent_settings': [
@@ -186,7 +186,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
-@@ -1581,7 +1581,7 @@
+@@ -1619,7 +1619,7 @@
}, {
'dependencies': [
# Runtime dependencis.
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index 7b4f54e..e3ea844 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
-@@ -621,8 +621,6 @@
+@@ -622,8 +622,6 @@
'third_party/dmg_fp/g_fmt.cc',
'third_party/icu/icu_utf.cc',
'third_party/icu/icu_utf.h',
diff --git a/debian/patches/system/vaapi.patch b/debian/patches/system/vaapi.patch
new file mode 100644
index 0000000..2e54280
--- /dev/null
+++ b/debian/patches/system/vaapi.patch
@@ -0,0 +1,259 @@
+description: enable VA-API hardware acceleration
+origin: http://codereview.chromium.org/15955009/diff/92001/content/common/sandbox_linux/bpf_gpu_policy_linux.cc.
+bug-debian: http://bugs.debian.org/793815
+
+--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
++++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
+@@ -33,7 +33,7 @@
+ #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
+ #elif defined(OS_MACOSX)
+ #include "content/common/gpu/media/vt_video_decode_accelerator.h"
+-#elif defined(OS_CHROMEOS)
++#elif defined(OS_CHROMEOS) || defined(OS_LINUX)
+ #if defined(USE_V4L2_CODEC)
+ #include "content/common/gpu/media/v4l2_device.h"
+ #include "content/common/gpu/media/v4l2_slice_video_decode_accelerator.h"
+@@ -347,7 +347,7 @@ void GpuVideoDecodeAccelerator::BindImag
+ scoped_ptr<media::VideoDecodeAccelerator>
+ GpuVideoDecodeAccelerator::CreateVaapiVDA() {
+ scoped_ptr<media::VideoDecodeAccelerator> decoder;
+-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
++#if (defined(OS_CHROMEOS) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_FAMILY)
+ decoder.reset(new VaapiVideoDecodeAccelerator(
+ make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage,
+ base::Unretained(this))));
+--- a/content/content_common.gypi
++++ b/content/content_common.gypi
+@@ -862,7 +862,7 @@
+ },
+ ],
+ }],
+- ['chromeos==1', {
++ ['chromeos==1 or desktop_linux==1', {
+ 'sources': [
+ 'common/gpu/media/accelerated_video_decoder.h',
+ 'common/gpu/media/h264_decoder.cc',
+@@ -918,7 +918,7 @@
+ 'common/gpu/media/tegra_v4l2_device.h',
+ ],
+ }],
+- ['target_arch != "arm" and chromeos == 1', {
++ ['target_arch != "arm" and (chromeos == 1 or desktop_linux == 1)', {
+ 'dependencies': [
+ '../media/media.gyp:media',
+ '../third_party/libyuv/libyuv.gyp:libyuv',
+--- a/content/content_gpu.gypi
++++ b/content/content_gpu.gypi
+@@ -36,7 +36,7 @@
+ ],
+ },
+ }],
+- ['target_arch!="arm" and chromeos == 1', {
++ ['target_arch!="arm" and (chromeos == 1 or desktop_linux == 1)', {
+ 'include_dirs': [
+ '<(DEPTH)/third_party/libva',
+ ],
+--- a/content/content_tests.gypi
++++ b/content/content_tests.gypi
+@@ -1743,7 +1743,7 @@
+ },
+ ]
+ }],
+- ['chromeos==1 and target_arch != "arm"', {
++ ['(chromeos==1 or desktop_linux==1) and target_arch != "arm"', {
+ 'targets': [
+ {
+ 'target_name': 'vaapi_jpeg_decoder_unittest',
+--- a/content/public/common/content_switches.cc
++++ b/content/public/common/content_switches.cc
+@@ -905,7 +905,7 @@ const char kEnableAggressiveDOMStorageFl
+ // Disable web audio API.
+ const char kDisableWebAudio[] = "disable-webaudio";
+
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+ // Disables panel fitting (used for mirror mode).
+ const char kDisablePanelFitting[] = "disable-panel-fitting";
+
+--- a/content/public/common/content_switches.h
++++ b/content/public/common/content_switches.h
+@@ -267,7 +267,7 @@ CONTENT_EXPORT extern const char kRender
+
+ CONTENT_EXPORT extern const char kDisableWebAudio[];
+
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+ CONTENT_EXPORT extern const char kDisablePanelFitting[];
+ CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
+ #endif
+--- a/media/media.gyp
++++ b/media/media.gyp
+@@ -761,7 +761,7 @@
+ ],
+ }],
+ # For VaapiVideoEncodeAccelerator.
+- ['target_arch != "arm" and chromeos == 1', {
++ ['target_arch != "arm" and (chromeos == 1 or desktop_linux == 1)', {
+ 'sources': [
+ 'filters/h264_bitstream_buffer.cc',
+ 'filters/h264_bitstream_buffer.h',
+--- a/gpu/config/software_rendering_list_json.cc
++++ b/gpu/config/software_rendering_list_json.cc
+@@ -481,17 +481,6 @@ const char kSoftwareRenderingListJson[]
+ ]
+ },
+ {
+- "id": 48,
+- "description": "Accelerated video decode is unavailable on Linux",
+- "cr_bugs": [137247],
+- "os": {
+- "type": "linux"
+- },
+- "features": [
+- "accelerated_video_decode"
+- ]
+- },
+- {
+ "id": 49,
+ "description": "NVidia GeForce GT 650M can cause the system to hang with flash 3D",
+ "cr_bugs": [140175],
+@@ -1039,6 +1028,11 @@ LONG_STRING_CONST(
+ "op": ">=",
+ "value": "3.0"
+ }
++ },
++ {
++ "os": {
++ "type": "linux"
++ }
+ }
+ ],
+ "features": [
+--- a/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
++++ b/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
+@@ -21,6 +21,8 @@
+ #include "base/logging.h"
+ #include "base/memory/scoped_ptr.h"
+ #include "build/build_config.h"
++// Auto-generated for dlopen libva libraries
++#include "content/common/gpu/media/va_stubs.h"
+ #include "content/common/sandbox_linux/sandbox_bpf_base_policy_linux.h"
+ #include "content/common/sandbox_linux/sandbox_seccomp_bpf_linux.h"
+ #include "content/common/set_process_title.h"
+@@ -32,6 +34,9 @@
+ #include "sandbox/linux/syscall_broker/broker_process.h"
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+
++#include <va/va.h>
++#include <va/va_x11.h>
++
+ using sandbox::arch_seccomp_data;
+ using sandbox::bpf_dsl::Allow;
+ using sandbox::bpf_dsl::ResultExpr;
+@@ -40,6 +45,11 @@ using sandbox::syscall_broker::BrokerFil
+ using sandbox::syscall_broker::BrokerProcess;
+ using sandbox::SyscallSets;
+
++using content_common_gpu_media::kModuleVa;
++using content_common_gpu_media::kModuleVa_x11;
++using content_common_gpu_media::InitializeStubs;
++using content_common_gpu_media::StubPathMap;
++
+ namespace content {
+
+ namespace {
+@@ -94,7 +104,7 @@ inline bool UseLibV4L2() {
+
+ bool IsAcceleratedVaapiVideoEncodeEnabled() {
+ bool accelerated_encode_enabled = false;
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
+ accelerated_encode_enabled =
+@@ -299,25 +309,27 @@ bool GpuProcessPolicy::PreSandboxHook()
+ // inside the sandbox, so preload them now.
+ if (IsAcceleratedVaapiVideoEncodeEnabled() ||
+ IsAcceleratedVideoDecodeEnabled()) {
+- const char* I965DrvVideoPath = NULL;
+- const char* I965HybridDrvVideoPath = NULL;
++ VLOG(1) << "Attempting hardware accelerated video.";
++ StubPathMap paths;
++ paths[kModuleVa].push_back("libva.so.1");
++ paths[kModuleVa].push_back("libva-x11.so.1");
++ if (!InitializeStubs(paths)) {
++ VLOG(1) << "Failed to initialize stubs.";
++ return false;
++ }
+
+- if (IsArchitectureX86_64()) {
+- I965DrvVideoPath = "/usr/lib64/va/drivers/i965_drv_video.so";
+- I965HybridDrvVideoPath = "/usr/lib64/va/drivers/hybrid_drv_video.so";
+- } else if (IsArchitectureI386()) {
+- I965DrvVideoPath = "/usr/lib/va/drivers/i965_drv_video.so";
++ Display* x_display = XOpenDisplay(NULL);
++ VADisplay va_display = vaGetDisplay(x_display);
++ if (!vaDisplayIsValid(va_display)) {
++ VLOG(1) << "Failed in vaGetDisplay().";
++ return false;
+ }
+
+- dlopen(I965DrvVideoPath, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
+- if (I965HybridDrvVideoPath)
+- dlopen(I965HybridDrvVideoPath, RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
+- dlopen("libva.so.1", RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
+-#if defined(USE_OZONE)
+- dlopen("libva-drm.so.1", RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
+-#elif defined(USE_X11)
+- dlopen("libva-x11.so.1", RTLD_NOW|RTLD_GLOBAL|RTLD_NODELETE);
+-#endif
++ int major_version, minor_version;
++ if (vaInitialize(va_display, &major_version, &minor_version) != VA_STATUS_SUCCESS) {
++ VLOG(1) << "Failed in vaInitialize().";
++ return false;
++ }
+ }
+ }
+
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -1003,7 +1003,7 @@ const Experiment kExperiments[] = {
+ "disable-accelerated-video-decode",
+ IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
+ IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
+- kOsMac | kOsWin | kOsCrOS,
++ kOsAll,
+ SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
+ },
+ #if defined(USE_ASH)
+--- a/content/common/gpu/media/vaapi_wrapper.cc
++++ b/content/common/gpu/media/vaapi_wrapper.cc
+@@ -147,7 +147,7 @@ scoped_ptr<VaapiWrapper> VaapiWrapper::C
+ VAProfile va_profile,
+ const base::Closure& report_error_to_uma_cb) {
+ if (!profile_infos_.Get().IsProfileSupported(mode, va_profile)) {
+- DVLOG(1) << "Unsupported va_profile: " << va_profile;
++ VLOG(1) << "Unsupported va_profile: " << va_profile;
+ return nullptr;
+ }
+
+@@ -385,7 +385,7 @@ bool VaapiWrapper::IsEntrypointSupported
+ if (std::find(supported_entrypoints.begin(),
+ supported_entrypoints.end(),
+ entrypoint) == supported_entrypoints.end()) {
+- DVLOG(1) << "Unsupported entrypoint";
++ VLOG(1) << "Unsupported entrypoint";
+ return false;
+ }
+ return true;
+@@ -409,8 +409,8 @@ bool VaapiWrapper::AreAttribsSupported_L
+ if (attribs[i].type != required_attribs[i].type ||
+ (attribs[i].value & required_attribs[i].value) !=
+ required_attribs[i].value) {
+- DVLOG(1) << "Unsupported value " << required_attribs[i].value
+- << " for attribute type " << required_attribs[i].type;
++ VLOG(1) << "Unsupported value " << required_attribs[i].value
++ << " for attribute type " << required_attribs[i].type;
+ return false;
+ }
+ }
--
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