From 65be571f6ac2f7942b4df9e50b24da517f829eec Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa
Date: Mon, 15 Oct 2018 20:26:10 +0000
Subject: [PATCH] google_util: Explicitly use std::initializer_list with
Hello community,
here is the log from the commit of package chromium for openSUSE:Factory checked in at 2018-12-11 15:47:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Tue Dec 11 15:47:19 2018 rev:203 rq:655692 version:71.0.3578.80
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2018-11-22 13:26:01.629968549 +0100
+++ /work/SRC/openSUSE:Factory/.chromium.new.19453/chromium.changes 2018-12-11 15:47:45.478211330 +0100
@@ -1,0 +2,52 @@
+Thu Dec 6 08:41:53 UTC 2018 - Tomáš Chvátal
+
+- Version update to 71.0.3578.80 bsc#1118529:
+ - CVE-2018-17480: Out of bounds write in V8
+ - CVE-2018-17481: Use after frees in PDFium
+ - CVE-2018-18335: Heap buffer overflow in Skia
+ - CVE-2018-18336: Use after free in PDFium
+ - CVE-2018-18337: Use after free in Blink
+ - CVE-2018-18338: Heap buffer overflow in Canvas
+ - CVE-2018-18339: Use after free in WebAudio
+ - CVE-2018-18340: Use after free in MediaRecorder
+ - CVE-2018-18341: Heap buffer overflow in Blink
+ - CVE-2018-18342: Out of bounds write in V8
+ - CVE-2018-18343: Use after free in Skia
+ - CVE-2018-18344: Inappropriate implementation in Extensions
+ - Multiple issues in SQLite via WebSQL
+ - CVE-2018-18345: Inappropriate implementation in Site Isolation
+ - CVE-2018-18346: Incorrect security UI in Blink
+ - CVE-2018-18347: Inappropriate implementation in Navigation
+ - CVE-2018-18348: Inappropriate implementation in Omnibox
+ - CVE-2018-18349: Insufficient policy enforcement in Blink
+ - CVE-2018-18350: Insufficient policy enforcement in Blink
+ - CVE-2018-18351: Insufficient policy enforcement in Navigation
+ - CVE-2018-18352: Inappropriate implementation in Media
+ - CVE-2018-18353: Inappropriate implementation in Network Authentication
+ - CVE-2018-18354: Insufficient data validation in Shell Integration
+ - CVE-2018-18355: Insufficient policy enforcement in URL Formatter
+ - CVE-2018-18356: Use after free in Skia
+ - CVE-2018-18357: Insufficient policy enforcement in URL Formatter
+ - CVE-2018-18358: Insufficient policy enforcement in Proxy.
+ - CVE-2018-18359: Out of bounds read in V8
+ - Inappropriate implementation in PDFium
+ - Use after free in Extensions
+ - Inappropriate implementation in Navigation
+ - Insufficient policy enforcement in Navigation
+ - Insufficient policy enforcement in URL Formatter
+ - Various fixes from internal audits, fuzzing and other initiatives
+- Updated/refreshed patches:
+ * fix_building_widevinecdm_with_chromium.patch
+ * chromium-vaapi.patch
+ * chromium-skia-aarch64-buildfix.patch
+ * chromium-prop-codecs.patch
+ * chromium-non-void-return.patch
+- Removed patches:
+ * chromium-gcc8-constexpr.patch
+ * chromium-libva1.patch
+ * chromium-pdfium-include.patch
+ * chromium-warnings.patch
+- Added patches:
+ * chromium-initialize-list.patch
+
+-------------------------------------------------------------------
Old:
----
chromium-70.0.3538.110.tar.xz
chromium-gcc8-constexpr.patch
chromium-libva1.patch
chromium-pdfium-include.patch
chromium-warnings.patch
New:
----
chromium-71.0.3578.80.tar.xz
chromium-initialize-list.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.XSiO30/_old 2018-12-11 15:47:58.398197088 +0100
+++ /var/tmp/diff_new_pack.XSiO30/_new 2018-12-11 15:47:58.410197075 +0100
@@ -42,7 +42,7 @@
%bcond_with system_vpx
%bcond_with clang
Name: chromium
-Version: 70.0.3538.110
+Version: 71.0.3578.80
Release: 0
Summary: Google's open source browser project
License: BSD-3-Clause AND LGPL-2.1-or-later
@@ -71,19 +71,17 @@
Patch6: chromium-non-void-return.patch
Patch7: chromium-drm.patch
Patch8: chromium-sandbox-pie.patch
-Patch9: chromium-warnings.patch
-Patch10: chromium-skia-aarch64-buildfix.patch
-Patch11: chromium-gcc8-alignof.patch
-Patch12: chromium-system-icu.patch
-Patch13: chromium-pdfium-include.patch
-Patch14: chromium-gcc8-constexpr.patch
-Patch15: chromium-system-libusb.patch
-Patch16: chromium-old-glibc.patch
-Patch17: chromium-libva1.patch
+Patch9: chromium-gcc8-alignof.patch
+Patch10: chromium-system-icu.patch
+Patch11: chromium-system-libusb.patch
+Patch12: chromium-old-glibc.patch
+Patch13: chromium-initialize-list.patch
+Patch14: chromium-skia-aarch64-buildfix.patch
# Google seem not too keen on merging this but GPU accel is quite important
# https://chromium-review.googlesource.com/c/chromium/src/+/532294
# https://github.com/saiarcot895/chromium-ubuntu-build/tree/master/debian/patc...
-# NEEDS REBASE QUITE OFTEN
+# Recreated from scratch to be smaller and use system the orginal switches
+# (default on) compared to the PR
Patch100: chromium-vaapi.patch
# Google does not care much about system libs here
# https://bugs.chromium.org/p/skia/issues/detail?id=6663
@@ -341,6 +339,7 @@
third_party/iccjpeg
third_party/inspector_protocol
third_party/jinja2
+ third_party/jsoncpp
third_party/jstemplate
third_party/khronos
third_party/leveldatabase
@@ -393,7 +392,6 @@
third_party/rnnoise
third_party/s2cellid
third_party/sfntly
- third_party/shaderc
third_party/skia
third_party/skia/third_party/gif
third_party/skia/third_party/skcms
@@ -552,7 +550,14 @@
myconf_gn+=" is_component_ffmpeg=true"
myconf_gn+=" use_cups=true"
myconf_gn+=" use_aura=true"
-myconf_gn+=" use_jumbo_build=true jumbo_file_merge_limit=8 concurrent_links=1 optimize_for_size=true"
+myconf_gn+=" use_jumbo_build=true"
+%ifarch aarch64
+# Limit number to avoid OOM errors
+myconf_gn+=" jumbo_file_merge_limit=5"
+%else
+myconf_gn+=" jumbo_file_merge_limit=12"
+%endif
+myconf_gn+=" concurrent_links=1"
myconf_gn+=" symbol_level=1"
myconf_gn+=" remove_webcore_debug_symbols=true"
myconf_gn+=" use_kerberos=true"
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.XSiO30/_old 2018-12-11 15:47:58.474197004 +0100
+++ /var/tmp/diff_new_pack.XSiO30/_new 2018-12-11 15:47:58.474197004 +0100
@@ -8,4 +8,14 @@
<size unit="G">12</size>
</memory>
</hardware>
+ <overwrite>
+ <conditions>
+ <arch>aarch64</arch>
+ </conditions>
+ <hardware>
+ <memory>
+ <size unit="G">10</size>
+ </memory>
+ </hardware>
+ </overwrite>
</constraints>
++++++ chromium-70.0.3538.110.tar.xz -> chromium-71.0.3578.80.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-70.0.3538.110.tar.xz /work/SRC/openSUSE:Factory/.chromium.new.19453/chromium-71.0.3578.80.tar.xz differ: char 26, line 1
++++++ chromium-initialize-list.patch ++++++
base::NoDestructor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Follow-up to ac53c5c53 ("Remove CR_DEFINE_STATIC_LOCAL from /components").
Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84849, having
base::NoDestructor and passing an initializer list of Us does not
work if this is not done explicitly, as GCC incorrectly fails to determine
which constructor overload to use:
../../components/google/core/common/google_util.cc: In function ‘bool google_util::{anonymous}::IsCanonicalHostGoogleHostname(base::StringPiece, google_util::SubdomainPermission)’:
../../components/google/core/common/google_util.cc:120:24: error: call of overloaded ‘NoDestructor(<brace-enclosed initializer list>)’ is ambiguous
{GOOGLE_TLD_LIST});
See also: https://chromium-review.googlesource.com/c/chromium/src/+/1170905
Bug: 819294
Change-Id: Ie1490b6646d7998d636c485769caabf56c1cf44c
Reviewed-on: https://chromium-review.googlesource.com/c/1275854
Reviewed-by: Peter Kasting
Commit-Queue: Raphael Kubo da Costa (CET)
Cr-Commit-Position: refs/heads/master@{#599733}
---
components/google/core/common/google_util.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc
index a44c84393820..7733848a0443 100644
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -117,7 +117,7 @@ bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host,
StripTrailingDot(&tld);
static base::NoDestructorstd::string> google_tlds(
- {GOOGLE_TLD_LIST});
+ std::initializer_liststd::string({GOOGLE_TLD_LIST}));
return base::ContainsKey(*google_tlds, tld.as_string());
}
@@ -132,7 +132,8 @@ bool IsGoogleSearchSubdomainUrl(const GURL& url) {
StripTrailingDot(&host);
static base::NoDestructorstd::string> google_subdomains(
- {"ipv4.google.com", "ipv6.google.com"});
+ std::initializer_liststd::string(
+ {"ipv4.google.com", "ipv6.google.com"}));
return base::ContainsKey(*google_subdomains, host.as_string());
}
--
2.19.1
++++++ chromium-non-void-return.patch ++++++
++++ 1998 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/chromium/chromium-non-void-return.patch
++++ and /work/SRC/openSUSE:Factory/.chromium.new.19453/chromium-non-void-return.patch
++++++ chromium-prop-codecs.patch ++++++
--- /var/tmp/diff_new_pack.XSiO30/_old 2018-12-11 15:47:58.606196859 +0100
+++ /var/tmp/diff_new_pack.XSiO30/_new 2018-12-11 15:47:58.610196854 +0100
@@ -1,8 +1,7 @@
-Index: chromium-70.0.3538.45/media/BUILD.gn
-===================================================================
---- chromium-70.0.3538.45.orig/media/BUILD.gn
-+++ chromium-70.0.3538.45/media/BUILD.gn
-@@ -38,12 +38,6 @@ buildflag_header("media_buildflags") {
+diff -urN chromium-62.0.3192.0.orig/media/BUILD.gn chromium-62.0.3192.0/media/BUILD.gn
+--- chromium-62.0.3192.0.orig/media/BUILD.gn 2017-08-25 11:22:39.294487172 +0200
++++ chromium-62.0.3192.0/media/BUILD.gn 2017-08-25 11:25:41.674488175 +0200
+@@ -33,12 +33,6 @@
]
}
++++++ chromium-skia-aarch64-buildfix.patch ++++++
--- /var/tmp/diff_new_pack.XSiO30/_old 2018-12-11 15:47:58.622196841 +0100
+++ /var/tmp/diff_new_pack.XSiO30/_new 2018-12-11 15:47:58.622196841 +0100
@@ -1,20 +1,20 @@
---- chromium-67.0.3396.18.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-05-09 10:34:03.160808970 +0200
-+++ chromium-67.0.3396.18/third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-05-09 10:34:37.172977879 +0200
-@@ -653,7 +653,7 @@ SI F approx_powf(F x, F y) {
+--- chromium-71.0.3578.53.orig//third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-11-22 10:52:58.556286527 +0100
++++ chromium-71.0.3578.53/third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-11-22 11:31:38.837360583 +0100
+@@ -658,7 +658,7 @@ SI F approx_powf(F x, F y) {
}
SI F from_half(U16 h) {
--#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
-+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
return vcvt_f32_f16(h);
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
-@@ -673,7 +673,7 @@ SI F from_half(U16 h) {
+@@ -678,7 +678,7 @@ SI F from_half(U16 h) {
}
SI U16 to_half(F f) {
--#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
-+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
return vcvt_f16_f32(f);
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
++++++ chromium-vaapi.patch ++++++
--- /var/tmp/diff_new_pack.XSiO30/_old 2018-12-11 15:47:58.642196819 +0100
+++ /var/tmp/diff_new_pack.XSiO30/_new 2018-12-11 15:47:58.642196819 +0100
@@ -1,8 +1,8 @@
-Index: chromium-70.0.3538.45/chrome/browser/about_flags.cc
-===================================================================
---- chromium-70.0.3538.45.orig/chrome/browser/about_flags.cc
-+++ chromium-70.0.3538.45/chrome/browser/about_flags.cc
-@@ -1775,7 +1775,7 @@ const FeatureEntry kFeatureEntries[] = {
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+index 0faee72af1c4..8592e86c2b33 100644
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -1795,7 +1795,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
flag_descriptions::kAcceleratedVideoDecodeDescription,
@@ -11,9 +11,9 @@
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
#if defined(OS_WIN)
-@@ -2457,12 +2457,12 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(features::kOpenVR)},
- #endif // ENABLE_OPENVR
+@@ -2454,12 +2454,12 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
+ #endif // ENABLE_ISOLATED_XR_SERVICE
#endif // ENABLE_VR
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
@@ -27,11 +27,11 @@
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
-Index: chromium-70.0.3538.45/chrome/browser/flag_descriptions.cc
-===================================================================
---- chromium-70.0.3538.45.orig/chrome/browser/flag_descriptions.cc
-+++ chromium-70.0.3538.45/chrome/browser/flag_descriptions.cc
-@@ -3055,7 +3055,7 @@ const char kTextSuggestionsTouchBarDescr
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+index 69887814c701..9cea71d16c57 100644
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -3010,7 +3010,7 @@ const char kTextSuggestionsTouchBarDescription[] =
// Chrome OS -------------------------------------------------------------------
@@ -40,20 +40,20 @@
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
-@@ -3590,7 +3590,7 @@ const char kZipArchiverUnpackerName[] =
- const char kZipArchiverUnpackerDescription[] =
- "Enable or disable the ability to unpack archives in incognito mode";
+@@ -3557,7 +3557,7 @@ const char kWakeOnPacketsName[] = "Wake On Packets";
+ const char kWakeOnPacketsDescription[] =
+ "Enables waking the device based on the receipt of some network packets.";
-#endif // defined(OS_CHROMEOS)
+#endif // defined(OS_CHROMEOS) || BUILDFLAG(USE_VAAPI)
// Random platform combinations -----------------------------------------------
-Index: chromium-70.0.3538.45/chrome/browser/flag_descriptions.h
-===================================================================
---- chromium-70.0.3538.45.orig/chrome/browser/flag_descriptions.h
-+++ chromium-70.0.3538.45/chrome/browser/flag_descriptions.h
-@@ -1846,13 +1846,17 @@ extern const char kPermissionPromptPersi
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+index d80c51660ae5..1eae73713506 100644
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -1827,13 +1827,17 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
#endif // defined(OS_MACOSX)
@@ -74,11 +74,11 @@
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
-Index: chromium-70.0.3538.45/components/viz/service/main/viz_main_impl.cc
-===================================================================
---- chromium-70.0.3538.45.orig/components/viz/service/main/viz_main_impl.cc
-+++ chromium-70.0.3538.45/components/viz/service/main/viz_main_impl.cc
-@@ -41,7 +41,7 @@ std::unique_ptrbase::Thread CreateAndS
+diff --git a/components/viz/service/main/viz_main_impl.cc b/components/viz/service/main/viz_main_impl.cc
+index 6f5f55de7588..62f42c240219 100644
+--- a/components/viz/service/main/viz_main_impl.cc
++++ b/components/viz/service/main/viz_main_impl.cc
+@@ -41,7 +41,7 @@ std::unique_ptrbase::Thread CreateAndStartIOThread() {
// It should be possible to use |main_task_runner_| for doing IO tasks.
base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
thread_options.priority = base::ThreadPriority::NORMAL;
@@ -87,10 +87,10 @@
// TODO(reveman): Remove this in favor of setting it explicitly for each
// type of process.
thread_options.priority = base::ThreadPriority::DISPLAY;
-Index: chromium-70.0.3538.45/content/gpu/BUILD.gn
-===================================================================
---- chromium-70.0.3538.45.orig/content/gpu/BUILD.gn
-+++ chromium-70.0.3538.45/content/gpu/BUILD.gn
+diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
+index 8974e441d1ba..af7c57f3963c 100644
+--- a/content/gpu/BUILD.gn
++++ b/content/gpu/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//gpu/vulkan/features.gni")
@@ -99,7 +99,7 @@
import("//ui/ozone/ozone.gni")
# See //content/BUILD.gn for how this works.
-@@ -49,7 +50,6 @@ target(link_target_type, "gpu_sources")
+@@ -49,7 +50,6 @@ target(link_target_type, "gpu_sources") {
]
configs += [ "//content:content_implementation" ]
@@ -107,7 +107,7 @@
deps = [
"//base",
"//base/third_party/dynamic_annotations",
-@@ -134,4 +134,8 @@ target(link_target_type, "gpu_sources")
+@@ -134,4 +134,8 @@ target(link_target_type, "gpu_sources") {
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
@@ -116,11 +116,11 @@
+ public_configs = [ "//media/gpu:libva_config" ]
+ }
}
-Index: chromium-70.0.3538.45/content/gpu/gpu_main.cc
-===================================================================
---- chromium-70.0.3538.45.orig/content/gpu/gpu_main.cc
-+++ chromium-70.0.3538.45/content/gpu/gpu_main.cc
-@@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& pa
+diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
+index 8397889b61e2..2632f3976377 100644
+--- a/content/gpu/gpu_main.cc
++++ b/content/gpu/gpu_main.cc
+@@ -284,7 +284,7 @@ int GpuMain(const MainFunctionParams& parameters) {
base::PlatformThread::SetName("CrGpuMain");
@@ -129,7 +129,7 @@
// Set thread priority before sandbox initialization.
base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
#endif
-@@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& pa
+@@ -317,7 +317,7 @@ int GpuMain(const MainFunctionParams& parameters) {
GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
@@ -138,14 +138,15 @@
io_thread_priority = base::ThreadPriority::DISPLAY;
#endif
-Index: chromium-70.0.3538.45/gpu/config/software_rendering_list.json
-===================================================================
---- chromium-70.0.3538.45.orig/gpu/config/software_rendering_list.json
-+++ chromium-70.0.3538.45/gpu/config/software_rendering_list.json
-@@ -374,17 +374,6 @@
+diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
+index cb6118b6a4ec..7b8ea0f75881 100644
+--- a/gpu/config/software_rendering_list.json
++++ b/gpu/config/software_rendering_list.json
+@@ -369,17 +369,6 @@
+ "all"
]
},
- {
+- {
- "id": 48,
- "description": "Accelerated video decode is unavailable on Linux",
- "cr_bugs": [137247],
@@ -156,15 +157,14 @@
- "accelerated_video_decode"
- ]
- },
-- {
+ {
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
- "cr_bugs": [145531, 332596, 571899, 629434],
-Index: chromium-70.0.3538.45/media/base/media_switches.cc
-===================================================================
---- chromium-70.0.3538.45.orig/media/base/media_switches.cc
-+++ chromium-70.0.3538.45/media/base/media_switches.cc
-@@ -468,7 +468,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
+diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
+index f5b922f73cd3..916a746de835 100644
+--- a/media/base/media_switches.cc
++++ b/media/base/media_switches.cc
+@@ -499,7 +499,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
switches::kUseFakeJpegDecodeAccelerator)) {
return true;
}
@@ -173,10 +173,10 @@
return true;
#endif
return false;
-Index: chromium-70.0.3538.45/media/filters/BUILD.gn
-===================================================================
---- chromium-70.0.3538.45.orig/media/filters/BUILD.gn
-+++ chromium-70.0.3538.45/media/filters/BUILD.gn
+diff --git a/media/filters/BUILD.gn b/media/filters/BUILD.gn
+index d558b537a0a4..8e387d8203ac 100644
+--- a/media/filters/BUILD.gn
++++ b/media/filters/BUILD.gn
@@ -5,6 +5,7 @@
import("//build/config/jumbo.gni")
import("//media/media_options.gni")
@@ -185,7 +185,7 @@
jumbo_source_set("filters") {
# Do not expand the visibility here without double-checking with OWNERS, this
-@@ -198,7 +199,7 @@ jumbo_source_set("filters") {
+@@ -200,7 +201,7 @@ jumbo_source_set("filters") {
deps += [ "//media/base/android" ]
}
@@ -194,11 +194,11 @@
sources += [
"h264_bitstream_buffer.cc",
"h264_bitstream_buffer.h",
-Index: chromium-70.0.3538.45/media/gpu/BUILD.gn
-===================================================================
---- chromium-70.0.3538.45.orig/media/gpu/BUILD.gn
-+++ chromium-70.0.3538.45/media/gpu/BUILD.gn
-@@ -499,6 +499,12 @@ if (use_v4l2_codec || use_vaapi || is_ma
+diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
+index 07bfdefda523..7e33cd747614 100644
+--- a/media/gpu/BUILD.gn
++++ b/media/gpu/BUILD.gn
+@@ -508,6 +508,12 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
}
}
@@ -211,7 +211,7 @@
if (use_vaapi) {
test("jpeg_encode_accelerator_unittest") {
deps = [
-@@ -569,6 +575,7 @@ if (use_v4l2_codec || use_vaapi) {
+@@ -578,6 +584,7 @@ if (is_chromeos || is_linux) {
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
@@ -219,11 +219,11 @@
}
}
-Index: chromium-70.0.3538.45/media/gpu/gpu_video_decode_accelerator_factory.cc
-===================================================================
---- chromium-70.0.3538.45.orig/media/gpu/gpu_video_decode_accelerator_factory.cc
-+++ chromium-70.0.3538.45/media/gpu/gpu_video_decode_accelerator_factory.cc
-@@ -56,6 +56,7 @@ gpu::VideoDecodeAcceleratorCapabilities
+diff --git a/media/gpu/gpu_video_decode_accelerator_factory.cc b/media/gpu/gpu_video_decode_accelerator_factory.cc
+index 67ba4daed787..8815ba896a45 100644
+--- a/media/gpu/gpu_video_decode_accelerator_factory.cc
++++ b/media/gpu/gpu_video_decode_accelerator_factory.cc
+@@ -56,6 +56,7 @@ gpu::VideoDecodeAcceleratorCapabilities GetDecoderCapabilitiesInternal(
// profile (instead of calculating a superset).
// TODO(posciak,henryhsu): improve this so that we choose a superset of
// resolutions and other supported profile parameters.
@@ -231,11 +231,11 @@
VideoDecodeAccelerator::Capabilities capabilities;
#if defined(OS_WIN)
capabilities.supported_profiles =
-Index: chromium-70.0.3538.45/media/gpu/vaapi/vaapi_wrapper.cc
-===================================================================
---- chromium-70.0.3538.45.orig/media/gpu/vaapi/vaapi_wrapper.cc
-+++ chromium-70.0.3538.45/media/gpu/vaapi/vaapi_wrapper.cc
-@@ -337,7 +337,7 @@ bool VADisplayState::InitializeOnce() {
+diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
+index 34a733c4a9c0..72a1816743cd 100644
+--- a/media/gpu/vaapi/vaapi_wrapper.cc
++++ b/media/gpu/vaapi/vaapi_wrapper.cc
+@@ -339,7 +339,7 @@ bool VADisplayState::InitializeOnce() {
DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
<< va_vendor_string_;
@@ -244,7 +244,7 @@
LOG(ERROR) << "This build of Chromium requires VA-API version "
<< VA_MAJOR_VERSION << "." << VA_MINOR_VERSION
<< ", system version: " << major_version << "." << minor_version;
-@@ -969,7 +969,11 @@ scoped_refptr<VASurface> VaapiWrapper::C
+@@ -969,7 +969,11 @@ scoped_refptr<VASurface> VaapiWrapper::CreateVASurfaceForPixmap(
}
va_attrib_extbuf.num_planes = num_planes;
++++++ fix_building_widevinecdm_with_chromium.patch ++++++
--- /var/tmp/diff_new_pack.XSiO30/_old 2018-12-11 15:47:58.670196788 +0100
+++ /var/tmp/diff_new_pack.XSiO30/_new 2018-12-11 15:47:58.670196788 +0100
@@ -1,27 +1,11 @@
-diff -urN chromium-67.0.3371.0.old/third_party/widevine/cdm/BUILD.gn chromium-67.0.3371.0/third_party/widevine/cdm/BUILD.gn
---- chromium-67.0.3371.0.old/third_party/widevine/cdm/BUILD.gn 2018-03-20 12:06:16.192778982 +0100
-+++ chromium-67.0.3371.0/third_party/widevine/cdm/BUILD.gn 2018-03-20 12:09:54.184846595 +0100
-@@ -10,12 +10,6 @@
- import("//media/media_options.gni")
- import("//third_party/widevine/cdm/widevine.gni")
-
--# Internal Cast builds set enable_widevine=true to bring in Widevine support.
--# TODO(xhwang): Support component updated CDM on other platforms and remove this
--# assert.
--assert(!enable_widevine || is_win || is_mac || is_chromecast,
-- "Component updated CDM only supported on Windows and Mac for now.")
--
- widevine_arch = current_cpu
- if (widevine_arch == "x86") {
- widevine_arch = "ia32"
-diff -urN chromium-67.0.3371.0.old/third_party/widevine/cdm/stub/widevine_cdm_version.h chromium-67.0.3371.0/third_party/widevine/cdm/stub/widevine_cdm_version.h
---- chromium-67.0.3371.0.old/third_party/widevine/cdm/stub/widevine_cdm_version.h 2018-03-20 12:06:16.192778982 +0100
-+++ chromium-67.0.3371.0/third_party/widevine/cdm/stub/widevine_cdm_version.h 2018-03-20 12:08:24.415172133 +0100
-@@ -10,6 +10,7 @@
-
- #include "third_party/widevine/cdm/widevine_cdm_common.h"
-
+Index: chromium-71.0.3573.0/third_party/widevine/cdm/widevine_cdm_version.h
+===================================================================
+--- chromium-71.0.3573.0.orig/third_party/widevine/cdm/widevine_cdm_version.h
++++ chromium-71.0.3573.0/third_party/widevine/cdm/widevine_cdm_version.h
+@@ -11,5 +11,6 @@
+ // If the Widevine CDM is available define the following:
+ // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+ // as a string, e.g., "1.0.123.456").
+#define WIDEVINE_CDM_VERSION_STRING "unknown"
- #define WIDEVINE_CDM_AVAILABLE
#endif // WIDEVINE_CDM_VERSION_H_