diff options
author | Eric Hameleers <alien@slackware.com> | 2015-12-26 22:41:27 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2015-12-26 22:41:27 +0000 |
commit | 7cea90d4b9b7f2a987cfcdb7deb35751f8672559 (patch) | |
tree | 3b15f960d3007a70c9aa99d1197f8fb430f28af2 /chromium-dev/build | |
parent | 7904c47dd3dc29f9374697f8c0e104a1bb9e6613 (diff) | |
download | asb-7cea90d4b9b7f2a987cfcdb7deb35751f8672559.tar.gz asb-7cea90d4b9b7f2a987cfcdb7deb35751f8672559.tar.xz |
chromium-dev: rebased the chromium_vaapi.patch against 49.0.2593.0.
Diffstat (limited to 'chromium-dev/build')
-rw-r--r-- | chromium-dev/build/patches/chromium_vaapi.patch | 177 |
1 files changed, 84 insertions, 93 deletions
diff --git a/chromium-dev/build/patches/chromium_vaapi.patch b/chromium-dev/build/patches/chromium_vaapi.patch index 0547646f..fe7e161e 100644 --- a/chromium-dev/build/patches/chromium_vaapi.patch +++ b/chromium-dev/build/patches/chromium_vaapi.patch @@ -1,28 +1,19 @@ -Description: -Enables using VA-API hardware acceleration in Linux. The patch for bpf_gpu_policy_linux.cc initially came from https://codereview.chromium.org/15955009/diff/92001/content/common/sandbox_linux/bpf_gpu_policy_linux.cc - -Taken from: -https://code.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.dev -And rebased against chromium-dev 48.0.2535.0 sources. - --------- - -diff -uarN chromium-48.0.2535.0.orig/chrome/browser/about_flags.cc chromium-48.0.2535.0/chrome/browser/about_flags.cc ---- chromium-48.0.2535.0.orig/chrome/browser/about_flags.cc 2015-10-14 09:01:19.000000000 +0200 -+++ chromium-48.0.2535.0/chrome/browser/about_flags.cc 2015-10-18 13:19:06.991657439 +0200 -@@ -1007,7 +1007,7 @@ +diff -uarN chromium-49.0.2593.0.orig/chrome/browser/about_flags.cc chromium-49.0.2593.0/chrome/browser/about_flags.cc +--- chromium-49.0.2593.0.orig/chrome/browser/about_flags.cc 2015-12-16 12:02:47.000000000 +0100 ++++ chromium-49.0.2593.0/chrome/browser/about_flags.cc 2015-12-26 17:02:31.507599902 +0100 +@@ -903,7 +903,7 @@ "disable-accelerated-video-decode", - IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME, - IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION, + IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME, + IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION, - kOsMac | kOsWin | kOsCrOS, + kOsAll, - SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, #if defined(USE_ASH) -diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/client/command_buffer_proxy_impl.cc chromium-48.0.2535.0/content/common/gpu/client/command_buffer_proxy_impl.cc ---- chromium-48.0.2535.0.orig/content/common/gpu/client/command_buffer_proxy_impl.cc 2015-10-14 09:01:20.000000000 +0200 -+++ chromium-48.0.2535.0/content/common/gpu/client/command_buffer_proxy_impl.cc 2015-10-18 13:19:07.023662747 +0200 -@@ -614,8 +614,10 @@ +diff -uarN chromium-49.0.2593.0.orig/content/common/gpu/client/command_buffer_proxy_impl.cc chromium-49.0.2593.0/content/common/gpu/client/command_buffer_proxy_impl.cc +--- chromium-49.0.2593.0.orig/content/common/gpu/client/command_buffer_proxy_impl.cc 2015-12-16 03:04:09.000000000 +0100 ++++ chromium-49.0.2593.0/content/common/gpu/client/command_buffer_proxy_impl.cc 2015-12-26 16:58:24.349586035 +0100 +@@ -676,8 +676,10 @@ scoped_ptr<media::VideoDecodeAccelerator> CommandBufferProxyImpl::CreateVideoDecoder() { @@ -33,19 +24,28 @@ diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/client/command_buffer_pr return scoped_ptr<media::VideoDecodeAccelerator>( new GpuVideoDecodeAcceleratorHost(channel_, this)); } -diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-48.0.2535.0/content/common/gpu/media/gpu_video_decode_accelerator.cc ---- chromium-48.0.2535.0.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc 2015-10-14 09:01:20.000000000 +0200 -+++ chromium-48.0.2535.0/content/common/gpu/media/gpu_video_decode_accelerator.cc 2015-10-18 13:19:06.911644181 +0200 +diff -uarN chromium-49.0.2593.0.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc chromium-49.0.2593.0/content/common/gpu/media/gpu_video_decode_accelerator.cc +--- chromium-49.0.2593.0.orig/content/common/gpu/media/gpu_video_decode_accelerator.cc 2015-12-16 03:04:09.000000000 +0100 ++++ chromium-49.0.2593.0/content/common/gpu/media/gpu_video_decode_accelerator.cc 2015-12-26 17:21:48.852643626 +0100 @@ -33,7 +33,7 @@ - #include "content/common/gpu/media/dxva_video_decode_accelerator.h" + #include "content/common/gpu/media/dxva_video_decode_accelerator_win.h" #elif defined(OS_MACOSX) - #include "content/common/gpu/media/vt_video_decode_accelerator.h" + #include "content/common/gpu/media/vt_video_decode_accelerator_mac.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" -@@ -252,6 +252,8 @@ +@@ -163,7 +163,7 @@ + #if defined(OS_WIN) + capabilities.supported_profiles = + DXVAVideoDecodeAccelerator::GetSupportedProfiles(); +-#elif defined(OS_CHROMEOS) ++#elif defined(OS_CHROMEOS) || defined(OS_LINUX) + media::VideoDecodeAccelerator::SupportedProfiles vda_profiles; + #if defined(USE_V4L2_CODEC) + vda_profiles = V4L2VideoDecodeAccelerator::GetSupportedProfiles(); +@@ -345,6 +345,8 @@ } #endif @@ -54,14 +54,14 @@ diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/gpu_video_decode_a // Array of Create..VDA() function pointers, maybe applicable to the current // platform. This list is ordered by priority of use and it should be the // same as the order of querying supported profiles of VDAs. -@@ -265,11 +267,14 @@ +@@ -358,11 +360,14 @@ &GpuVideoDecodeAccelerator::CreateAndroidVDA}; for (const auto& create_vda_function : create_vda_fps) { + VLOG(1) << "Testing create_vda_function."; video_decode_accelerator_ = (this->*create_vda_function)(); if (!video_decode_accelerator_ || - !video_decode_accelerator_->Initialize(profile, this)) + !video_decode_accelerator_->Initialize(config, this)) continue; + VLOG(1) << "Initialization successful."; @@ -69,7 +69,7 @@ diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/gpu_video_decode_a if (video_decode_accelerator_->CanDecodeOnIOThread()) { filter_ = new MessageFilter(this, host_route_id_); stub_->channel()->AddFilter(filter_.get()); -@@ -347,7 +352,9 @@ +@@ -443,7 +448,9 @@ scoped_ptr<media::VideoDecodeAccelerator> GpuVideoDecodeAccelerator::CreateVaapiVDA() { scoped_ptr<media::VideoDecodeAccelerator> decoder; @@ -80,19 +80,10 @@ diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/gpu_video_decode_a decoder.reset(new VaapiVideoDecodeAccelerator( make_context_current_, base::Bind(&GpuVideoDecodeAccelerator::BindImage, base::Unretained(this)))); -@@ -401,7 +408,7 @@ - // can be initialized by corresponding VDA successfully. - #if defined(OS_WIN) - profiles = DXVAVideoDecodeAccelerator::GetSupportedProfiles(); --#elif defined(OS_CHROMEOS) -+#elif defined(OS_CHROMEOS) || defined(OS_LINUX) - media::VideoDecodeAccelerator::SupportedProfiles vda_profiles; - #if defined(USE_V4L2_CODEC) - vda_profiles = V4L2VideoDecodeAccelerator::GetSupportedProfiles(); -diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc chromium-48.0.2535.0/content/common/gpu/media/vaapi_video_decode_accelerator.cc ---- chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc 2015-10-14 09:01:20.000000000 +0200 -+++ chromium-48.0.2535.0/content/common/gpu/media/vaapi_video_decode_accelerator.cc 2015-10-18 13:19:07.006659929 +0200 -@@ -324,17 +324,17 @@ +diff -uarN chromium-49.0.2593.0.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc chromium-49.0.2593.0/content/common/gpu/media/vaapi_video_decode_accelerator.cc +--- chromium-49.0.2593.0.orig/content/common/gpu/media/vaapi_video_decode_accelerator.cc 2015-12-16 03:04:09.000000000 +0100 ++++ chromium-49.0.2593.0/content/common/gpu/media/vaapi_video_decode_accelerator.cc 2015-12-26 16:58:24.360587861 +0100 +@@ -332,17 +332,17 @@ base::AutoLock auto_lock(lock_); DCHECK_EQ(state_, kUninitialized); @@ -113,7 +104,7 @@ diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_video_decode << "EGLGLES2."; return false; } -@@ -344,7 +344,7 @@ +@@ -352,7 +352,7 @@ VaapiWrapper::kDecode, profile, base::Bind(&ReportToUMA, VAAPI_ERROR)); if (!vaapi_wrapper_.get()) { @@ -122,7 +113,7 @@ diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_video_decode return false; } -@@ -361,7 +361,7 @@ +@@ -369,7 +369,7 @@ vp9_accelerator_.reset(new VaapiVP9Accelerator(this, vaapi_wrapper_.get())); decoder_.reset(new VP9Decoder(vp9_accelerator_.get())); } else { @@ -131,10 +122,10 @@ diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_video_decode return false; } -diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-48.0.2535.0/content/common/gpu/media/vaapi_wrapper.cc ---- chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_wrapper.cc 2015-10-14 09:01:20.000000000 +0200 -+++ chromium-48.0.2535.0/content/common/gpu/media/vaapi_wrapper.cc 2015-10-18 13:19:07.004659596 +0200 -@@ -147,7 +147,7 @@ +diff -uarN chromium-49.0.2593.0.orig/content/common/gpu/media/vaapi_wrapper.cc chromium-49.0.2593.0/content/common/gpu/media/vaapi_wrapper.cc +--- chromium-49.0.2593.0.orig/content/common/gpu/media/vaapi_wrapper.cc 2015-12-16 03:04:09.000000000 +0100 ++++ chromium-49.0.2593.0/content/common/gpu/media/vaapi_wrapper.cc 2015-12-26 16:58:24.361588027 +0100 +@@ -183,7 +183,7 @@ VAProfile va_profile, const base::Closure& report_error_to_uma_cb) { if (!profile_infos_.Get().IsProfileSupported(mode, va_profile)) { @@ -143,7 +134,7 @@ diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_wrapper.cc c return nullptr; } -@@ -306,15 +306,17 @@ +@@ -342,15 +342,17 @@ bool VaapiWrapper::VaInitialize(const base::Closure& report_error_to_uma_cb) { static bool vaapi_functions_initialized = PostSandboxInitialization(); if (!vaapi_functions_initialized) { @@ -166,7 +157,7 @@ diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_wrapper.cc c else DVLOG(1) << kErrorMsg; return false; -@@ -385,7 +387,7 @@ +@@ -421,7 +423,7 @@ if (std::find(supported_entrypoints.begin(), supported_entrypoints.end(), entrypoint) == supported_entrypoints.end()) { @@ -175,7 +166,7 @@ diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_wrapper.cc c return false; } return true; -@@ -409,8 +411,8 @@ +@@ -445,8 +447,8 @@ if (attribs[i].type != required_attribs[i].type || (attribs[i].value & required_attribs[i].value) != required_attribs[i].value) { @@ -186,9 +177,9 @@ diff -uarN chromium-48.0.2535.0.orig/content/common/gpu/media/vaapi_wrapper.cc c return false; } } -diff -uarN chromium-48.0.2535.0.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-48.0.2535.0/content/common/sandbox_linux/bpf_gpu_policy_linux.cc ---- chromium-48.0.2535.0.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc 2015-10-14 09:01:20.000000000 +0200 -+++ chromium-48.0.2535.0/content/common/sandbox_linux/bpf_gpu_policy_linux.cc 2015-10-18 13:29:07.942272472 +0200 +diff -uarN chromium-49.0.2593.0.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc chromium-49.0.2593.0/content/common/sandbox_linux/bpf_gpu_policy_linux.cc +--- chromium-49.0.2593.0.orig/content/common/sandbox_linux/bpf_gpu_policy_linux.cc 2015-12-16 03:04:09.000000000 +0100 ++++ chromium-49.0.2593.0/content/common/sandbox_linux/bpf_gpu_policy_linux.cc 2015-12-26 16:58:24.367589023 +0100 @@ -21,6 +21,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -288,10 +279,10 @@ diff -uarN chromium-48.0.2535.0.orig/content/common/sandbox_linux/bpf_gpu_policy return true; } -diff -uarN chromium-48.0.2535.0.orig/content/content_common.gypi chromium-48.0.2535.0/content/content_common.gypi ---- chromium-48.0.2535.0.orig/content/content_common.gypi 2015-10-14 09:01:21.000000000 +0200 -+++ chromium-48.0.2535.0/content/content_common.gypi 2015-10-18 13:19:06.929647164 +0200 -@@ -860,7 +860,7 @@ +diff -uarN chromium-49.0.2593.0.orig/content/content_common.gypi chromium-49.0.2593.0/content/content_common.gypi +--- chromium-49.0.2593.0.orig/content/content_common.gypi 2015-12-16 03:04:09.000000000 +0100 ++++ chromium-49.0.2593.0/content/content_common.gypi 2015-12-26 16:58:24.370589521 +0100 +@@ -871,7 +871,7 @@ }, ], }], @@ -300,7 +291,7 @@ diff -uarN chromium-48.0.2535.0.orig/content/content_common.gypi chromium-48.0.2 'sources': [ 'common/gpu/media/accelerated_video_decoder.h', 'common/gpu/media/h264_decoder.cc', -@@ -916,7 +916,7 @@ +@@ -927,7 +927,7 @@ 'common/gpu/media/tegra_v4l2_device.h', ], }], @@ -309,9 +300,9 @@ diff -uarN chromium-48.0.2535.0.orig/content/content_common.gypi chromium-48.0.2 'dependencies': [ '../media/media.gyp:media', '../third_party/libyuv/libyuv.gyp:libyuv', -diff -uarN chromium-48.0.2535.0.orig/content/content_gpu.gypi chromium-48.0.2535.0/content/content_gpu.gypi ---- chromium-48.0.2535.0.orig/content/content_gpu.gypi 2015-10-14 09:01:21.000000000 +0200 -+++ chromium-48.0.2535.0/content/content_gpu.gypi 2015-10-18 13:19:06.940648986 +0200 +diff -uarN chromium-49.0.2593.0.orig/content/content_gpu.gypi chromium-49.0.2593.0/content/content_gpu.gypi +--- chromium-49.0.2593.0.orig/content/content_gpu.gypi 2015-12-16 03:04:09.000000000 +0100 ++++ chromium-49.0.2593.0/content/content_gpu.gypi 2015-12-26 16:58:24.370589521 +0100 @@ -38,7 +38,7 @@ ], }, @@ -321,10 +312,10 @@ diff -uarN chromium-48.0.2535.0.orig/content/content_gpu.gypi chromium-48.0.2535 'include_dirs': [ '<(DEPTH)/third_party/libva', ], -diff -uarN chromium-48.0.2535.0.orig/content/content_tests.gypi chromium-48.0.2535.0/content/content_tests.gypi ---- chromium-48.0.2535.0.orig/content/content_tests.gypi 2015-10-14 09:01:21.000000000 +0200 -+++ chromium-48.0.2535.0/content/content_tests.gypi 2015-10-18 13:19:06.941649152 +0200 -@@ -1743,7 +1743,7 @@ +diff -uarN chromium-49.0.2593.0.orig/content/content_tests.gypi chromium-49.0.2593.0/content/content_tests.gypi +--- chromium-49.0.2593.0.orig/content/content_tests.gypi 2015-12-16 03:04:09.000000000 +0100 ++++ chromium-49.0.2593.0/content/content_tests.gypi 2015-12-26 16:58:24.374590185 +0100 +@@ -1747,7 +1747,7 @@ }, ] }], @@ -333,10 +324,10 @@ diff -uarN chromium-48.0.2535.0.orig/content/content_tests.gypi chromium-48.0.25 'targets': [ { 'target_name': 'vaapi_jpeg_decoder_unittest', -diff -uarN chromium-48.0.2535.0.orig/content/gpu/gpu_main.cc chromium-48.0.2535.0/content/gpu/gpu_main.cc ---- chromium-48.0.2535.0.orig/content/gpu/gpu_main.cc 2015-10-14 09:01:21.000000000 +0200 -+++ chromium-48.0.2535.0/content/gpu/gpu_main.cc 2015-10-18 13:19:07.016661587 +0200 -@@ -66,7 +66,7 @@ +diff -uarN chromium-49.0.2593.0.orig/content/gpu/gpu_main.cc chromium-49.0.2593.0/content/gpu/gpu_main.cc +--- chromium-49.0.2593.0.orig/content/gpu/gpu_main.cc 2015-12-16 03:04:09.000000000 +0100 ++++ chromium-49.0.2593.0/content/gpu/gpu_main.cc 2015-12-26 16:58:24.375590351 +0100 +@@ -73,7 +73,7 @@ #include "content/common/sandbox_mac.h" #endif @@ -345,7 +336,7 @@ diff -uarN chromium-48.0.2535.0.orig/content/gpu/gpu_main.cc chromium-48.0.2535. #include "content/common/gpu/media/vaapi_wrapper.h" #endif -@@ -231,7 +231,7 @@ +@@ -244,7 +244,7 @@ GetGpuInfoFromCommandLine(gpu_info, command_line); gpu_info.in_process_gpu = false; @@ -354,10 +345,10 @@ diff -uarN chromium-48.0.2535.0.orig/content/gpu/gpu_main.cc chromium-48.0.2535. VaapiWrapper::PreSandboxInitialization(); #endif -diff -uarN chromium-48.0.2535.0.orig/content/public/common/content_switches.cc chromium-48.0.2535.0/content/public/common/content_switches.cc ---- chromium-48.0.2535.0.orig/content/public/common/content_switches.cc 2015-10-14 09:01:21.000000000 +0200 -+++ chromium-48.0.2535.0/content/public/common/content_switches.cc 2015-10-18 13:19:06.948650315 +0200 -@@ -920,7 +920,9 @@ +diff -uarN chromium-49.0.2593.0.orig/content/public/common/content_switches.cc chromium-49.0.2593.0/content/public/common/content_switches.cc +--- chromium-49.0.2593.0.orig/content/public/common/content_switches.cc 2015-12-16 03:04:09.000000000 +0100 ++++ chromium-49.0.2593.0/content/public/common/content_switches.cc 2015-12-26 16:58:24.382591513 +0100 +@@ -936,7 +936,9 @@ #if defined(OS_CHROMEOS) // Disables panel fitting (used for mirror mode). const char kDisablePanelFitting[] = "disable-panel-fitting"; @@ -367,10 +358,10 @@ diff -uarN chromium-48.0.2535.0.orig/content/public/common/content_switches.cc c // Disables VA-API accelerated video encode. const char kDisableVaapiAcceleratedVideoEncode[] = "disable-vaapi-accelerated-video-encode"; -diff -uarN chromium-48.0.2535.0.orig/content/public/common/content_switches.h chromium-48.0.2535.0/content/public/common/content_switches.h ---- chromium-48.0.2535.0.orig/content/public/common/content_switches.h 2015-10-14 09:01:21.000000000 +0200 -+++ chromium-48.0.2535.0/content/public/common/content_switches.h 2015-10-18 13:19:06.949650480 +0200 -@@ -272,6 +272,8 @@ +diff -uarN chromium-49.0.2593.0.orig/content/public/common/content_switches.h chromium-49.0.2593.0/content/public/common/content_switches.h +--- chromium-49.0.2593.0.orig/content/public/common/content_switches.h 2015-12-16 03:04:09.000000000 +0100 ++++ chromium-49.0.2593.0/content/public/common/content_switches.h 2015-12-26 16:58:24.383591679 +0100 +@@ -276,6 +276,8 @@ #if defined(OS_CHROMEOS) CONTENT_EXPORT extern const char kDisablePanelFitting[]; @@ -379,10 +370,10 @@ diff -uarN chromium-48.0.2535.0.orig/content/public/common/content_switches.h ch CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[]; #endif -diff -uarN chromium-48.0.2535.0.orig/gpu/config/software_rendering_list_json.cc chromium-48.0.2535.0/gpu/config/software_rendering_list_json.cc ---- chromium-48.0.2535.0.orig/gpu/config/software_rendering_list_json.cc 2015-10-14 09:01:21.000000000 +0200 -+++ chromium-48.0.2535.0/gpu/config/software_rendering_list_json.cc 2015-10-18 13:19:06.966653298 +0200 -@@ -481,17 +481,6 @@ +diff -uarN chromium-49.0.2593.0.orig/gpu/config/software_rendering_list_json.cc chromium-49.0.2593.0/gpu/config/software_rendering_list_json.cc +--- chromium-49.0.2593.0.orig/gpu/config/software_rendering_list_json.cc 2015-12-16 03:04:10.000000000 +0100 ++++ chromium-49.0.2593.0/gpu/config/software_rendering_list_json.cc 2015-12-26 21:25:16.150170402 +0100 +@@ -485,17 +485,6 @@ ] }, { @@ -400,10 +391,10 @@ diff -uarN chromium-48.0.2535.0.orig/gpu/config/software_rendering_list_json.cc "id": 49, "description": "NVidia GeForce GT 650M can cause the system to hang with flash 3D", "cr_bugs": [140175], -@@ -1039,6 +1028,11 @@ - "op": ">=", - "value": "3.0" - } +@@ -1052,6 +1041,11 @@ + "type": "android" + }, + "gl_renderer": ".*Google.*" + }, + { + "os": { @@ -412,10 +403,10 @@ diff -uarN chromium-48.0.2535.0.orig/gpu/config/software_rendering_list_json.cc } ], "features": [ -diff -uarN chromium-48.0.2535.0.orig/media/media.gyp chromium-48.0.2535.0/media/media.gyp ---- chromium-48.0.2535.0.orig/media/media.gyp 2015-10-14 09:01:21.000000000 +0200 -+++ chromium-48.0.2535.0/media/media.gyp 2015-10-18 13:19:06.950650645 +0200 -@@ -759,7 +759,7 @@ +diff -uarN chromium-49.0.2593.0.orig/media/media.gyp chromium-49.0.2593.0/media/media.gyp +--- chromium-49.0.2593.0.orig/media/media.gyp 2015-12-16 12:02:47.000000000 +0100 ++++ chromium-49.0.2593.0/media/media.gyp 2015-12-26 16:58:24.406595496 +0100 +@@ -766,7 +766,7 @@ ], }], # For VaapiVideoEncodeAccelerator. @@ -424,8 +415,8 @@ diff -uarN chromium-48.0.2535.0.orig/media/media.gyp chromium-48.0.2535.0/media/ 'sources': [ 'filters/h264_bitstream_buffer.cc', 'filters/h264_bitstream_buffer.h', -@@ -1379,7 +1379,7 @@ - 'player_android', +@@ -1398,7 +1398,7 @@ + 'cdm/cdm_adapter_unittest.cc', ], }], - ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { |