* [PR PATCH] chromium: update to 77.0.3865.90.
@ 2019-10-01 0:05 voidlinux-github
2019-10-01 0:24 ` [PR PATCH] [Updated] " voidlinux-github
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-01 0:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
There is a new pull request by pbui against master on the void-packages repository
https://github.com/pbui/void-packages chromium
https://github.com/void-linux/void-packages/pull/14862
chromium: update to 77.0.3865.90.
[ci skip]
- Update vaapi patch from Ubuntu/Debian patch.
- Add two build fix patches.
- Built for x86_64, x86_64-musl, i686
- Tested on x86_64
A patch file from https://github.com/void-linux/void-packages/pull/14862.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-14862.patch --]
[-- Type: text/x-diff, Size: 49694 bytes --]
From 135d998190f17e9e07460ebd48625d090f885e37 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Sep 2019 11:52:35 -0400
Subject: [PATCH] chromium: update to 77.0.3865.90.
[ci skip]
- Update vaapi patch from Ubuntu/Debian patch.
- Add two build fix patches.
- Built for x86_64, x86_64-musl, i686
- Tested on x86_64
---
.../files/musl-patches/no-mallinfo.patch | 12 +
.../patches/chromium-enable-vaapi.patch | 760 +++++++-----------
.../chromium/patches/harfbuzz-subset.patch | 49 ++
.../chromium/patches/linked-hash-set.patch | 130 +++
.../chromium/patches/one_euro_filter.patch | 11 +
srcpkgs/chromium/template | 6 +-
6 files changed, 516 insertions(+), 452 deletions(-)
create mode 100644 srcpkgs/chromium/patches/harfbuzz-subset.patch
create mode 100644 srcpkgs/chromium/patches/linked-hash-set.patch
create mode 100644 srcpkgs/chromium/patches/one_euro_filter.patch
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 461c90cb0af..288f8670c06 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -42,3 +42,15 @@ index 0eb5c1f..8af7799 100644
mi = ::mallinfo();
return mi.uordblks;
+--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400
++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400
+@@ -122,7 +122,9 @@
+ /* #undef HAVE_MALLCTL */
+
+ /* Define to 1 if you have the `mallinfo' function. */
++#if defined(__GLIBC__)
+ #define HAVE_MALLINFO 1
++#endif
+
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #define HAVE_MALLOC_H 1
diff --git a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
index d1cb7b4be59..01c253de5ff 100644
--- a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
+++ b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
@@ -1,165 +1,107 @@
---- chrome/browser/about_flags.cc.orig 2019-07-29 16:35:46.000000000 -0400
-+++ chrome/browser/about_flags.cc 2019-07-31 13:54:18.350186083 -0400
-@@ -1119,12 +1119,14 @@
- {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
- flag_descriptions::kUiPartialSwapDescription, kOsAll,
- SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
- flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
- {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
- flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
-+#endif
- #if !defined(OS_ANDROID)
- {"enable-reader-mode", flag_descriptions::kEnableReaderModeName,
- flag_descriptions::kEnableReaderModeDescription, kOsDesktop,
-@@ -1446,6 +1448,13 @@
- flag_descriptions::kEnableVirtualDesksDescription, kOsCrOS,
- FEATURE_VALUE_TYPE(ash::features::kVirtualDesks)},
- #endif // OS_CHROMEOS
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ {
-+ "enable-accelerated-video", flag_descriptions::kAcceleratedVideoName,
-+ flag_descriptions::kAcceleratedVideoDescription, kOsLinux,
-+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedVideo),
-+ },
-+#else
- {
+From 53b93dfe87fd10cced5d2a2a63072dfc7a2af6e4 Mon Sep 17 00:00:00 2001
+From: Daniel Charles <daniel.charles@intel.com>
+Date: Fri, 28 Jul 2017 16:31:47 -0700
+Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only
+
+This patch contains all the changes necessary to use VA-API along with
+vaapi-driver to run all media use cases supported with hardware acceleration.
+
+It is intended to remain as experimental accessible from chrome://flags on linux.
+It requires libva/intel-vaapi-driver to be installed on the system path where
+chrome is executed. Other drivers could be tested if available. Flags are
+kept independent for linux, where this feature has to be enabled before
+actually using it. This should not change how other OSes use the flags
+already, the new flags will show at the buttom on the section of unavailable
+experiments
+
+The changes cover a range of compiler pre-processor flags to enable the stack.
+It moves the presandbox operations to the vaapi_wrapper class as the hook function
+is available there. vaInit will open driver on the correct installed folder.
+
+chrome flags consolidtation into only two flags for linux. Mjpeg and accelerated
+video are used. The other flags are kept for ChromeOS and other OSes.
+
+Developer testing was made on skylake hardware, ChromeOS and Ubuntu.
+
+BUG=NONE
+TEST="subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder"
+TEST="and decoder hardware accelerated"
+TEST="have libva/intel-vaapi-driver installed and not installed in the system"
+TEST="repeat on different hardware families"
+R=posciak@chromium.org
+R=kcwu@chromium.org
+
+Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
+Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171
+Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+---
+
+Index: dev/chrome/browser/about_flags.cc
+===================================================================
+--- chrome/browser/about_flags.cc
++++ chrome/browser/about_flags.cc
+@@ -1527,7 +1527,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -1453,6 +1462,7 @@
- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
+ flag_descriptions::kAcceleratedVideoDecodeDescription,
+- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
++ kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
-+#endif
- {"enable-history-favicons-google-server-query",
- flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryName,
- flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryDescription,
-@@ -1883,7 +1892,12 @@
+ {
+@@ -1993,10 +1993,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
- #endif // ENABLE_ISOLATED_XR_SERVICE
+ #endif // !defined(OS_ANDROID)
#endif // ENABLE_VR
-#if defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ {"enable-accelerated-mjpeg-decode",
-+ flag_descriptions::kAcceleratedMjpegDecodeName,
-+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsLinux,
-+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedMjpegDecode)},
-+#elif defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
{"disable-accelerated-mjpeg-decode",
flag_descriptions::kAcceleratedMjpegDecodeName,
- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
---- chrome/browser/chromeos/login/chrome_restart_request.cc.orig 2019-07-29 16:35:47.000000000 -0400
-+++ chrome/browser/chromeos/login/chrome_restart_request.cc 2019-07-31 13:58:47.201085960 -0400
-@@ -20,6 +20,7 @@
- #include "base/system/sys_info.h"
- #include "base/timer/timer.h"
- #include "base/values.h"
-+#include "build/build_config.h"
- #include "cc/base/switches.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/chromeos/boot_times_recorder.h"
-@@ -84,9 +85,14 @@
- ::switches::kBlinkSettings,
- ::switches::kDisable2dCanvasImageChromium,
- ::switches::kDisableAccelerated2dCanvas,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ ::switches::kEnableAcceleratedMjpegDecode,
-+ ::switches::kEnableAcceleratedVideo,
-+#else
- ::switches::kDisableAcceleratedMjpegDecode,
- ::switches::kDisableAcceleratedVideoDecode,
- ::switches::kDisableAcceleratedVideoEncode,
-+#endif
- ::switches::kDisableBlinkFeatures,
- ::switches::kDisableGpu,
- ::switches::kDisableGpuMemoryBufferVideoFrames,
-@@ -158,8 +164,10 @@
- ::switches::kEnableWebGLImageChromium,
- ::switches::kEnableWebVR,
- ::switches::kEnableUnsafeWebGPU,
-+#if (defined(OS_CHROMEOS) || defined(OS_ANDROID))
- ::switches::kDisableWebRtcHWDecoding,
- ::switches::kDisableWebRtcHWEncoding,
-+#endif
- ::switches::kOzonePlatform,
- ash::switches::kAshEnableTabletMode,
- ash::switches::kAshEnableWaylandServer,
-diff -ur chrome/browser/flag_descriptions.cc chromium-69.0.3497.92/chrome/browser/flag_descriptions.cc
---- chrome/browser/flag_descriptions.cc.orig 2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.cc 2019-07-02 12:27:47.137866754 -0400
-@@ -14,6 +14,13 @@
- "Enables the use of the GPU to perform 2d canvas rendering instead of "
- "using software rendering.";
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+const char kAcceleratedVideoName[] = "Hardware-accelerated video";
-+const char kAcceleratedVideoDescription[] =
-+ "Hardware-accelerated video where VA-API driver is installed on the"
-+ "system.";
-+#endif
-+
- const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
- const char kAcceleratedVideoDecodeDescription[] =
- "Hardware-accelerated video decode where available.";
-@@ -2081,6 +2088,7 @@
- const char kWebrtcHybridAgcDescription[] =
- "WebRTC Agc2 digital adaptation with Agc1 analog adaptation.";
-
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
- const char kWebrtcHwDecodingDescription[] =
- "Support in WebRTC for decoding video streams using platform hardware.";
-@@ -2088,6 +2096,7 @@
- const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
- const char kWebrtcHwEncodingDescription[] =
- "Support in WebRTC for encoding video streams using platform hardware.";
-+#endif
-
- const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
- const char kWebrtcHwH264EncodingDescription[] =
-@@ -2943,14 +2952,16 @@
+- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
++ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
+ SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
+ #endif // OS_CHROMEOS
+ {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
+Index: dev/chrome/browser/flag_descriptions.cc
+===================================================================
+--- chrome/browser/flag_descriptions.cc
++++ chrome/browser/flag_descriptions.cc
+@@ -2880,9 +2880,7 @@ const char kMacSystemMediaPermissionsInf
- // Chrome OS -------------------------------------------------------------------
+ #endif
+-// Chrome OS -------------------------------------------------------------------
+-
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
- const char kAcceleratedMjpegDecodeDescription[] =
+@@ -2890,6 +2888,12 @@ const char kAcceleratedMjpegDecodeDescri
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
-+#endif
++#endif
++
++// Chrome OS -------------------------------------------------------------------
++
+#if defined(OS_CHROMEOS)
++
const char kAppServiceAshName[] = "App Service Ash";
const char kAppServiceAshDescription[] =
"Use the App Service to provide data to the Ash UI, such as the shelf and "
-diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser/flag_descriptions.h
---- chrome/browser/flag_descriptions.h.orig 2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.h 2019-07-02 12:29:46.200214795 -0400
-@@ -43,6 +43,10 @@
- extern const char kAccelerated2dCanvasName[];
- extern const char kAccelerated2dCanvasDescription[];
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+extern const char kAcceleratedVideoName[];
-+extern const char kAcceleratedVideoDescription[];
-+#endif
- extern const char kAcceleratedVideoDecodeName[];
- extern const char kAcceleratedVideoDecodeDescription[];
-
-@@ -1765,13 +1769,17 @@
+Index: dev/chrome/browser/flag_descriptions.h
+===================================================================
+--- chrome/browser/flag_descriptions.h
++++ chrome/browser/flag_descriptions.h
+@@ -1715,13 +1715,17 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)
-// Chrome OS ------------------------------------------------------------------
-
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
@@ -173,234 +115,32 @@ diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser
extern const char kAppServiceAshName[];
extern const char kAppServiceAshDescription[];
-diff -ur content/browser/gpu/compositor_util.cc chromium-69.0.3497.92/content/browser/gpu/compositor_util.cc
---- content/browser/gpu/compositor_util.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/gpu/compositor_util.cc 2018-09-13 22:10:34.072012092 +0530
-@@ -149,7 +149,11 @@
- {"video_decode",
- SafeGetFeatureStatus(gpu_feature_info,
- gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ !command_line.HasSwitch(switches::kEnableAcceleratedVideo),
-+#else
- command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
-+#endif
- "Accelerated video decode has been disabled, either via blacklist, "
- "about:flags or the command line.",
- true, true},
---- content/browser/gpu/gpu_process_host.cc.orig 2019-07-31 14:16:52.304849119 -0400
-+++ content/browser/gpu/gpu_process_host.cc 2019-07-31 14:19:22.567480008 -0400
-@@ -208,7 +208,9 @@
- switches::kDisableLogging,
- switches::kDisableShaderNameHashing,
- switches::kDisableSkiaRuntimeOpts,
-+#if !defined(OS_LINUX)
- switches::kDisableWebRtcHWEncoding,
-+#endif
- switches::kEnableGpuRasterization,
- switches::kEnableLogging,
- switches::kEnableVizDevTools,
-diff -ur content/browser/renderer_host/media/video_capture_browsertest.cc chromium-69.0.3497.92/content/browser/renderer_host/media/video_capture_browsertest.cc
---- content/browser/renderer_host/media/video_capture_browsertest.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/renderer_host/media/video_capture_browsertest.cc 2018-09-13 22:10:34.124010499 +0530
-@@ -165,8 +165,13 @@
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kUseFakeJpegDecodeAccelerator);
- } else {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
-+ switches::kEnableAcceleratedMjpegDecode);
-+#else
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kDisableAcceleratedMjpegDecode);
-+#endif
- }
- }
-
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-07-29 16:36:09.000000000 -0400
-+++ content/browser/renderer_host/render_process_host_impl.cc 2019-07-31 14:04:18.859680348 -0400
-@@ -2937,7 +2937,11 @@
- switches::kDefaultTileHeight,
- switches::kDisable2dCanvasImageChromium,
- switches::kDisableYUVImageDecoding,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ switches::kEnableAcceleratedVideo,
-+#else
- switches::kDisableAcceleratedVideoDecode,
-+#endif
- switches::kDisableBackgroundTimerThrottling,
- switches::kDisableBestEffortTasks,
- switches::kDisableBreakpad,
-@@ -3077,8 +3081,10 @@
- #if BUILDFLAG(ENABLE_PLUGINS)
- switches::kEnablePepperTesting,
- #endif
-+#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
- switches::kDisableWebRtcHWDecoding,
- switches::kDisableWebRtcHWEncoding,
-+#endif
- switches::kEnableWebRtcSrtpAesGcm,
- switches::kEnableWebRtcSrtpEncryptedHeaders,
- switches::kEnableWebRtcStunOrigin,
-diff -ur content/browser/utility_process_host.cc chromium-69.0.3497.92/content/browser/utility_process_host.cc
---- content/browser/utility_process_host.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/utility_process_host.cc 2018-09-13 22:10:34.296005227 +0530
-@@ -296,7 +296,11 @@
- switches::kOverrideUseSoftwareGLForTests,
- switches::kOverrideEnabledCdmInterfaceVersion,
- switches::kProxyServer,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ switches::kEnableAcceleratedMjpegDecode,
-+#else
- switches::kDisableAcceleratedMjpegDecode,
-+#endif
- switches::kUseFakeDeviceForMediaStream,
- switches::kUseFakeJpegDecodeAccelerator,
- switches::kUseFileForFakeVideoCapture,
-diff -ur content/browser/webrtc/webrtc_media_recorder_browsertest.cc chromium-69.0.3497.92/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
---- content/browser/webrtc/webrtc_media_recorder_browsertest.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/webrtc/webrtc_media_recorder_browsertest.cc 2018-09-13 22:10:34.143009916 +0530
-@@ -66,7 +66,12 @@
- return;
- // This flag is also used for encoding, https://crbug.com/616640.
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
-- switches::kDisableAcceleratedVideoDecode);
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ switches::kEnableAcceleratedVideo
-+#else
-+ switches::kDisableAcceleratedVideoDecode
-+#endif
-+ );
- }
-
- private:
-diff -ur content/gpu/BUILD.gn chromium-69.0.3497.92/content/gpu/BUILD.gn
---- content/gpu/BUILD.gn 2018-09-12 00:39:41.000000000 +0530
-+++ content/gpu/BUILD.gn 2018-09-13 22:10:34.148009763 +0530
-@@ -133,4 +133,8 @@
+Index: dev/content/gpu/BUILD.gn
+===================================================================
+--- content/gpu/BUILD.gn
++++ content/gpu/BUILD.gn
+@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
+ import("//build/config/ui.gni")
+ import("//gpu/vulkan/features.gni")
+ import("//media/media_options.gni")
++import("//media/gpu/args.gni")
+ import("//ui/ozone/ozone.gni")
+
+ # See //content/BUILD.gn for how this works.
+@@ -128,4 +129,8 @@ target(link_target_type, "gpu_sources")
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
+
-+ if (is_desktop_linux) {
-+ public_configs = [ "//media/gpu:libva_config" ]
++ if (is_desktop_linux && use_vaapi) {
++ public_configs = [ "//build/config/linux/libva" ]
+ }
}
-diff -ur content/gpu/gpu_main.cc chromium-69.0.3497.92/content/gpu/gpu_main.cc
---- content/gpu/gpu_main.cc 2019-07-02 09:50:13.403486804 -0400
-+++ content/gpu/gpu_main.cc 2019-07-02 09:55:07.256818723 -0400
-@@ -288,7 +288,7 @@
-
- base::PlatformThread::SetName("CrGpuMain");
-
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
- // Set thread priority before sandbox initialization.
- base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
- #endif
-@@ -321,7 +321,7 @@
- GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
-
- base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
- io_thread_priority = base::ThreadPriority::DISPLAY;
- #endif
-
-diff -ur content/public/browser/gpu_utils.cc chromium-69.0.3497.92/content/public/browser/gpu_utils.cc
---- content/public/browser/gpu_utils.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/browser/gpu_utils.cc 2018-09-13 22:10:34.164009273 +0530
-@@ -57,9 +57,17 @@
- gpu_preferences.in_process_gpu =
- command_line->HasSwitch(switches::kInProcessGPU);
- gpu_preferences.disable_accelerated_video_decode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
- command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
-+#endif
- gpu_preferences.disable_accelerated_video_encode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
- command_line->HasSwitch(switches::kDisableAcceleratedVideoEncode);
-+#endif
- #if defined(OS_WIN)
- uint32_t enable_accelerated_vpx_decode_val =
- gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
-diff -ur content/public/common/content_switches.cc chromium-69.0.3497.92/content/public/common/content_switches.cc
---- content/public/common/content_switches.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.cc 2018-09-13 22:10:34.172009028 +0530
-@@ -79,6 +79,11 @@
- // Disable gpu-accelerated 2d canvas.
- const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas";
-
-+#if defined(OS_LINUX)
-+// Enables hardware acceleration of video for Linux only. VA-API driver
-+// is required to be present on the system installation.
-+const char kEnableAcceleratedVideo[] = "enable-accelerated-video";
-+#endif
- // Disables hardware acceleration of video decode, where available.
- const char kDisableAcceleratedVideoDecode[] =
- "disable-accelerated-video-decode";
-@@ -868,11 +873,13 @@
- // ignores this switch on its stable and beta channels.
- const char kDisableWebRtcEncryption[] = "disable-webrtc-encryption";
-
-+#if defined(OS_CHROMEOS)
- // Disables HW decode acceleration for WebRTC.
- const char kDisableWebRtcHWDecoding[] = "disable-webrtc-hw-decoding";
-
- // Disables HW encode acceleration for WebRTC.
- const char kDisableWebRtcHWEncoding[] = "disable-webrtc-hw-encoding";
-+#endif
-
- // Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC.
- // See https://tools.ietf.org/html/rfc7714 for further information.
-diff -ur content/public/common/content_switches.h chromium-69.0.3497.92/content/public/common/content_switches.h
---- content/public/common/content_switches.h 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.h 2018-09-13 22:10:34.172009028 +0530
-@@ -104,6 +104,9 @@
- CONTENT_EXPORT extern const char kDomAutomationController[];
- extern const char kDisable2dCanvasClipAntialiasing[];
- CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+CONTENT_EXPORT extern const char kEnableAcceleratedVideo[];
-+#endif
- CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[];
- CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
- CONTENT_EXPORT extern const char kEnableAutomation[];
-@@ -241,8 +244,10 @@
- CONTENT_EXPORT extern const char kWaitForDebuggerChildren[];
-
- CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
-+#if defined(OS_CHROMEOS)
- CONTENT_EXPORT extern const char kDisableWebRtcHWDecoding[];
- CONTENT_EXPORT extern const char kDisableWebRtcHWEncoding[];
-+#endif
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
- CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
-diff -ur content/renderer/render_thread_impl.cc chromium-69.0.3497.92/content/renderer/render_thread_impl.cc
---- content/renderer/render_thread_impl.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/renderer/render_thread_impl.cc 2018-09-13 22:10:34.192008415 +0530
-@@ -1441,7 +1441,11 @@
- kGpuStreamPriorityMedia);
-
- const bool enable_video_accelerator =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ cmd_line->HasSwitch(switches::kEnableAcceleratedVideo) &&
-+#else
- !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-+#endif
- (gpu_channel_host->gpu_feature_info()
- .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
- gpu::kGpuFeatureStatusEnabled);
-Only in content/renderer: render_thread_impl.cc.orig
-diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/config/software_rendering_list.json
---- gpu/config/software_rendering_list.json 2018-09-12 00:39:44.000000000 +0530
-+++ gpu/config/software_rendering_list.json 2018-09-13 22:10:34.193008384 +0530
-@@ -377,17 +377,6 @@
+Index: dev/gpu/config/software_rendering_list.json
+===================================================================
+--- gpu/config/software_rendering_list.json
++++ gpu/config/software_rendering_list.json
+@@ -369,17 +369,6 @@
]
},
{
@@ -418,119 +158,241 @@ diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/confi
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
"cr_bugs": [145531, 332596, 571899, 629434],
-diff -ur media/base/media_switches.cc chromium-69.0.3497.92/media/base/media_switches.cc
---- media/base/media_switches.cc.orig 2019-06-18 11:48:14.000000000 -0400
-+++ media/base/media_switches.cc 2019-07-02 12:32:22.370983036 -0400
-@@ -103,10 +103,15 @@
- const char kUseFakeMjpegDecodeAccelerator[] =
- "use-fake-mjpeg-decode-accelerator";
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+// Enable hardware accelerated mjpeg decode on linux
-+const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode";
-+#else
- // Disable hardware acceleration of mjpeg decode for captured frame, where
- // available.
- const char kDisableAcceleratedMjpegDecode[] =
- "disable-accelerated-mjpeg-decode";
-+#endif
-
- // When running tests on a system without the required hardware or libraries,
- // this flag will cause the tests to fail. Otherwise, they silently succeed.
-@@ -503,15 +508,21 @@
- };
-
- bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-+ switches::kEnableAcceleratedMjpegDecode)
-+#else
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-- switches::kDisableAcceleratedMjpegDecode)) {
-+ switches::kDisableAcceleratedMjpegDecode)
-+#endif
-+ ) {
- return false;
- }
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+Index: dev/media/base/media_switches.cc
+===================================================================
+--- media/base/media_switches.cc
++++ media/base/media_switches.cc
+@@ -544,7 +544,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
switches::kUseFakeMjpegDecodeAccelerator)) {
return true;
}
-#if defined(OS_CHROMEOS)
-+#if !defined(OS_ANDROID) && defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
return true;
#endif
return false;
-diff -ur media/base/media_switches.h chromium-69.0.3497.92/media/base/media_switches.h
---- media/base/media_switches.h.orig 2019-07-02 12:20:39.902984488 -0400
-+++ media/base/media_switches.h 2019-07-02 12:33:45.441923602 -0400
-@@ -60,7 +60,11 @@
- MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
- MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[];
- MEDIA_EXPORT extern const char kUseFakeMjpegDecodeAccelerator[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+MEDIA_EXPORT extern const char kEnableAcceleratedMjpegDecode[];
-+#else
- MEDIA_EXPORT extern const char kDisableAcceleratedMjpegDecode[];
-+#endif
-
- MEDIA_EXPORT extern const char kRequireAudioHardwareForTesting[];
- MEDIA_EXPORT extern const char kMuteAudio[];
---- media/gpu/BUILD.gn.orig 2019-07-29 16:36:19.000000000 -0400
-+++ media/gpu/BUILD.gn 2019-07-31 14:09:28.093032826 -0400
-@@ -495,6 +495,14 @@
+Index: dev/media/filters/BUILD.gn
+===================================================================
+--- media/filters/BUILD.gn
++++ media/filters/BUILD.gn
+@@ -5,6 +5,7 @@
+ import("//build/config/jumbo.gni")
+ import("//media/media_options.gni")
+ import("//third_party/libaom/options.gni")
++import("//media/gpu/args.gni")
+
+ jumbo_source_set("filters") {
+ # Do not expand the visibility here without double-checking with OWNERS, this
+@@ -196,7 +197,7 @@ jumbo_source_set("filters") {
+ deps += [ "//media/base/android" ]
}
- }
-+if (is_desktop_linux && use_vaapi) {
-+ import("//build/config/linux/pkg_config.gni")
-+
-+ pkg_config("libva_config") {
-+ packages = [ "libva" ]
-+ }
-+}
-+
- if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
- test("video_encode_accelerator_unittest") {
- deps = [
-@@ -525,6 +533,10 @@
+- if (current_cpu != "arm" && is_linux) {
++ if (use_vaapi) {
+ sources += [
+ "h264_bitstream_buffer.cc",
+ "h264_bitstream_buffer.h",
+Index: dev/media/gpu/BUILD.gn
+===================================================================
+--- media/gpu/BUILD.gn
++++ media/gpu/BUILD.gn
+@@ -531,6 +531,7 @@ if (use_v4l2_codec || use_vaapi || is_ma
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
-+
-+ if (is_desktop_linux) {
-+ public_configs = [ ":libva_config" ]
-+ }
++ public_configs = [ "//build/config/linux/libva" ]
}
}
---- content/renderer/media/webrtc/video_codec_factory.cc.orig 2019-07-02 16:39:57.973241977 -0400
-+++ content/renderer/media/webrtc/video_codec_factory.cc 2019-07-02 17:00:00.656342711 -0400
-@@ -187,8 +187,11 @@
- std::unique_ptr<webrtc::VideoEncoderFactory> encoder_factory;
+Index: dev/media/gpu/gpu_video_decode_accelerator_factory.cc
+===================================================================
+--- media/gpu/gpu_video_decode_accelerator_factory.cc
++++ media/gpu/gpu_video_decode_accelerator_factory.cc
+@@ -171,6 +171,8 @@ GpuVideoDecodeAcceleratorFactory::Create
+ vda = (this->*create_vda_function)(workarounds, gpu_preferences, media_log);
+ if (vda && vda->Initialize(config, client))
+ return vda;
++ else
++ LOG(ERROR) << "Initialization of one or more VDAs failed.";
+ }
- const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-- if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
-- !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
-+ if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()
-+#if defined(OS_CHROMEOS)
-+ && !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)
+ return nullptr;
+@@ -229,6 +231,7 @@ GpuVideoDecodeAcceleratorFactory::Create
+ const gpu::GpuDriverBugWorkarounds& workarounds,
+ const gpu::GpuPreferences& gpu_preferences,
+ MediaLog* media_log) const {
++ LOG(WARNING) << "Initializing VAAPI VDA.";
+ std::unique_ptr<VideoDecodeAccelerator> decoder;
+ decoder.reset(new VaapiVideoDecodeAccelerator(make_context_current_cb_,
+ bind_image_cb_));
+Index: dev/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/ipc/service/gpu_video_decode_accelerator.cc
++++ media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+@@ -380,6 +380,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+ LOG(ERROR) << "Failed creating the VDA factory";
+ return false;
+ }
++ LOG(WARNING) << "Created the VDA factory";
+
+ const gpu::GpuDriverBugWorkarounds& gpu_workarounds =
+ stub_->channel()->gpu_channel_manager()->gpu_driver_bug_workarounds();
+@@ -393,6 +394,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+ << (config.is_encrypted() ? " with encryption" : "");
+ return false;
+ }
++ LOG(WARNING) << "Created VDA";
+
+ // Attempt to set up performing decoding tasks on IO thread, if supported by
+ // the VDA.
+Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_video_decode_accelerator.cc
++++ media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+@@ -64,6 +64,7 @@ void ReportToUMA(VAVDADecoderFailure fai
+ VAVDA_DECODER_FAILURES_MAX + 1);
+ }
+
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
+ // Lake) Cpu platform id's are referenced from the following file in kernel
+ // source arch/x86/include/asm/intel-family.h
+@@ -76,6 +77,7 @@ bool IsGeminiLakeOrLater() {
+ cpuid.model() >= kGeminiLakeModelId;
+ return is_geminilake_or_later;
+ }
+#endif
-+ ) {
- encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
+
+ } // namespace
+
+@@ -632,6 +634,10 @@ void VaapiVideoDecodeAccelerator::Assign
+ va_surface_format_ = GetVaFormatForVideoCodecProfile(profile_);
+ std::vector<VASurfaceID> va_surface_ids;
+
++ // Nvidia doesn't support VAProfileNone, so don't try to create a temporary
++ // copy buffer there. It's not needed anyways for hardware video decoding
++ // to work.
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // If we aren't in BufferAllocationMode::kNone, we have to allocate a
+ // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
+ // internal decoded frame.
+@@ -645,15 +651,20 @@ void VaapiVideoDecodeAccelerator::Assign
+ NotifyError(PLATFORM_FAILURE);
+ }
}
++#endif
-@@ -205,8 +208,11 @@
- std::unique_ptr<webrtc::VideoDecoderFactory> decoder_factory;
+ for (size_t i = 0; i < buffers.size(); ++i) {
+ // If we aren't in BufferAllocationMode::kNone, this |picture| is
+ // only used as a copy destination. Therefore, the VaapiWrapper used and
+ // owned by |picture| is |vpp_vaapi_wrapper_|.
+ std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++ vaapi_wrapper_,
++#else
+ (buffer_allocation_mode_ == BufferAllocationMode::kNone)
+ ? vaapi_wrapper_
+ : vpp_vaapi_wrapper_,
++#endif
+ make_context_current_cb_, bind_image_cb_, buffers[i]);
+ RETURN_AND_NOTIFY_ON_FAILURE(picture, "Failed creating a VaapiPicture",
+ PLATFORM_FAILURE, );
+@@ -1078,6 +1089,9 @@ VaapiVideoDecodeAccelerator::GetSupporte
+
+ VaapiVideoDecodeAccelerator::BufferAllocationMode
+ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++ return BufferAllocationMode::kNormal;
++#else
+ // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
+ // |output_mode_| as well.
+ if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
+@@ -1113,6 +1127,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+ return BufferAllocationMode::kReduced;
- const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-- if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
-- !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)) {
-+ if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()
-+#if defined(OS_CHROMEOS)
-+ && !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)
+ return BufferAllocationMode::kSuperReduced;
+#endif
-+ ) {
- decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
+ }
+
+ bool VaapiVideoDecodeAccelerator::IsBufferAllocationModeReducedOrSuperReduced()
+Index: dev/media/gpu/vaapi/vaapi_wrapper.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_wrapper.cc
++++ media/gpu/vaapi/vaapi_wrapper.cc
+@@ -324,6 +324,11 @@ void VADisplayState::PreSandboxInitializ
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+ if (drm_file.IsValid())
+ VADisplayState::Get()->SetDrmFd(drm_file.GetPlatformFile());
++
++ const char kNvidiaPath[] = "/dev/dri/nvidiactl";
++ base::File nvidia_file = base::File(
++ base::FilePath::FromUTF8Unsafe(kNvidiaPath),
++ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+ }
+
+ VADisplayState::VADisplayState()
+@@ -351,10 +356,6 @@ bool VADisplayState::Initialize() {
+ }
+
+ bool VADisplayState::InitializeOnce() {
+- static_assert(
+- VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
+- "Requires VA-API >= 1.1.0");
+-
+ switch (gl::GetGLImplementation()) {
+ case gl::kGLImplementationEGLGLES2:
+ va_display_ = vaGetDisplayDRM(drm_fd_.get());
+@@ -362,10 +363,10 @@ bool VADisplayState::InitializeOnce() {
+ case gl::kGLImplementationDesktopGL:
+ #if defined(USE_X11)
+ va_display_ = vaGetDisplay(gfx::GetXDisplay());
+-#else
+- LOG(WARNING) << "VAAPI video acceleration not available without "
+- "DesktopGL (GLX).";
++ if (vaDisplayIsValid(va_display_))
++ break;
+ #endif // USE_X11
++ va_display_ = vaGetDisplayDRM(drm_fd_.get());
+ break;
+ // Cannot infer platform from GL, try all available displays
+ case gl::kGLImplementationNone:
+@@ -398,8 +399,19 @@ bool VADisplayState::InitializeOnce() {
+ int major_version, minor_version;
+ VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
+ if (va_res != VA_STATUS_SUCCESS) {
+- LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res);
+- return false;
++ LOG(ERROR) << "vaInitialize failed (ignore if using Wayland desktop environment): " << vaErrorStr(va_res);
++ va_display_ = vaGetDisplayDRM(drm_fd_.get());
++ if (!vaDisplayIsValid(va_display_)) {
++ LOG(ERROR) << "Could not get a valid DRM VA display";
++ return false;
++ }
++ va_res = vaInitialize(va_display_, &major_version, &minor_version);
++ if (va_res != VA_STATUS_SUCCESS) {
++ LOG(ERROR) << "vaInitialize failed using DRM: " << vaErrorStr(va_res);
++ return false;
++ } else {
++ LOG(WARNING) << "vaInitialize succeeded for DRM";
++ }
}
+ va_initialized_ = true;
+@@ -407,7 +419,7 @@ bool VADisplayState::InitializeOnce() {
+ va_vendor_string_ = vaQueryVendorString(va_display_);
+ DLOG_IF(WARNING, va_vendor_string_.empty())
+ << "Vendor string empty or error reading.";
+- DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
++ VLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
+ << va_vendor_string_;
+
+ // The VAAPI version is determined from what is loaded on the system by
+@@ -742,7 +754,7 @@ bool VASupportedProfiles::AreAttribsSupp
+ 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
++ VLOG(1) << "Unsupported value " << required_attribs[i].value
+ << " for attribute type " << required_attribs[i].type;
+ return false;
+ }
diff --git a/srcpkgs/chromium/patches/harfbuzz-subset.patch b/srcpkgs/chromium/patches/harfbuzz-subset.patch
new file mode 100644
index 00000000000..6f228b774d4
--- /dev/null
+++ b/srcpkgs/chromium/patches/harfbuzz-subset.patch
@@ -0,0 +1,49 @@
+From 27e25336b8316ff3ec4e464058682ed85801fd06 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Mon, 29 Jul 2019 10:54:28 +0000
+Subject: [PATCH] Also link against libharfbuzz-subset when use_system_harfbuzz is true
+
+When building HarfBuzz as part of Chromium, there is a single source set
+with all the files we need in the build.
+
+Upstream HarfBuzz, on the other hand, produces a few different libraries:
+harfbuzz, harfbuzz-icu and harfbuzz-subset. When |use_system_harfbuzz| is
+true, we were only looking for (and using) harfbuzz.pc with pkg-config even
+though we also use symbols from libharfbuzz-subset.so. This resulted in
+errors when linking:
+
+ ld: obj/skia/skia/SkPDFSubsetFont.o: in function `SkPDFSubsetFont(sk_sp<SkData>, SkPDFGlyphUse const&, SkPDF::Metadata::Subsetter, char const*, int)':
+ SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x48a): undefined reference to `hb_subset_input_create_or_fail'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x4af): undefined reference to `hb_subset_input_glyph_set'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5d7): undefined reference to `hb_subset_input_set_retain_gids'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5e4): undefined reference to `hb_subset_input_set_drop_hints'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5f3): undefined reference to `hb_subset'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x66f): undefined reference to `hb_subset_input_destroy'
+
+as reported in
+https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ
+
+Change-Id: I997af075c7b7263cd7cc71a63db5b0f93bd1ab59
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715288
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Commit-Queue: Dominik Röttsches <drott@chromium.org>
+Reviewed-by: Dominik Röttsches <drott@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#681760}
+---
+
+diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
+index 37d8e33..72013eb1d 100644
+--- third_party/harfbuzz-ng/BUILD.gn
++++ third_party/harfbuzz-ng/BUILD.gn
+@@ -16,7 +16,10 @@
+ "//third_party:freetype_harfbuzz",
+ "//third_party/freetype:freetype_source",
+ ]
+- packages = [ "harfbuzz" ]
++ packages = [
++ "harfbuzz",
++ "harfbuzz-subset",
++ ]
+ }
+ } else {
+ config("harfbuzz_config") {
diff --git a/srcpkgs/chromium/patches/linked-hash-set.patch b/srcpkgs/chromium/patches/linked-hash-set.patch
new file mode 100644
index 00000000000..24b13d8a5c0
--- /dev/null
+++ b/srcpkgs/chromium/patches/linked-hash-set.patch
@@ -0,0 +1,130 @@
+From 74138b9febd37eac0fc26b8efb110014a83a52c6 Mon Sep 17 00:00:00 2001
+From: Jeremy Roman <jbroman@chromium.org>
+Date: Wed, 07 Aug 2019 13:26:48 +0000
+Subject: [PATCH] WTF: Make LinkedHashSet understand values for which memset initialization would be bad.
+
+Includes a unit test which fails before, and uses this to fix FontCacheKeyTraits.
+
+Bug: 980025
+Change-Id: If41f97444c7fd37b9b95d6dadaf3da5689079e9e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739948
+Reviewed-by: Kentaro Hara <haraken@chromium.org>
+Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
+Commit-Queue: Jeremy Roman <jbroman@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#684731}
+---
+
+diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h b/third_party/blink/renderer/platform/fonts/font_cache_key.h
+index 0efc8fb..90063cb 100644
+--- third_party/blink/renderer/platform/fonts/font_cache_key.h
++++ third_party/blink/renderer/platform/fonts/font_cache_key.h
+@@ -133,6 +133,10 @@
+
+ struct FontCacheKeyTraits : WTF::SimpleClassHashTraits<FontCacheKey> {
+ STATIC_ONLY(FontCacheKeyTraits);
++
++ // std::string's empty state need not be zero in all implementations,
++ // and it is held within FontFaceCreationParams.
++ static const bool kEmptyValueIsZero = false;
+ };
+
+ } // namespace blink
+diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
+index b35b6e9..77e524c 100644
+--- third_party/blink/renderer/platform/wtf/linked_hash_set.h
++++ third_party/blink/renderer/platform/wtf/linked_hash_set.h
+@@ -146,6 +146,11 @@
+ LinkedHashSetNodeBase* next)
+ : LinkedHashSetNodeBase(prev, next), value_(value) {}
+
++ LinkedHashSetNode(ValueArg&& value,
++ LinkedHashSetNodeBase* prev,
++ LinkedHashSetNodeBase* next)
++ : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {}
++
+ LinkedHashSetNode(LinkedHashSetNode&& other)
+ : LinkedHashSetNodeBase(std::move(other)),
+ value_(std::move(other.value_)) {}
+@@ -445,10 +450,13 @@
+
+ // The slot is empty when the next_ field is zero so it's safe to zero
+ // the backing.
+- static const bool kEmptyValueIsZero = true;
++ static const bool kEmptyValueIsZero = ValueTraits::kEmptyValueIsZero;
+
+ static const bool kHasIsEmptyValueFunction = true;
+ static bool IsEmptyValue(const Node& node) { return !node.next_; }
++ static Node EmptyValue() {
++ return Node(ValueTraits::EmptyValue(), nullptr, nullptr);
++ }
+
+ static const int kDeletedValue = -1;
+
+diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+index 4c3f899..cd1be00 100644
+--- third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
++++ third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+@@ -487,6 +487,7 @@
+ };
+
+ struct Complicated {
++ Complicated() : Complicated(0) {}
+ Complicated(int value) : simple_(value) { objects_constructed_++; }
+
+ Complicated(const Complicated& other) : simple_(other.simple_) {
+@@ -495,9 +496,6 @@
+
+ Simple simple_;
+ static int objects_constructed_;
+-
+- private:
+- Complicated() = delete;
+ };
+
+ int Complicated::objects_constructed_ = 0;
+@@ -731,4 +729,45 @@
+
+ } // anonymous namespace
+
++// A unit type which objects to its state being initialized wrong.
++struct InvalidZeroValue {
++ InvalidZeroValue() = default;
++ InvalidZeroValue(WTF::HashTableDeletedValueType) : deleted_(true) {}
++ ~InvalidZeroValue() { CHECK(ok_); }
++ bool IsHashTableDeletedValue() const { return deleted_; }
++
++ bool ok_ = true;
++ bool deleted_ = false;
++};
++
++template <>
++struct HashTraits<InvalidZeroValue> : SimpleClassHashTraits<InvalidZeroValue> {
++ static const bool kEmptyValueIsZero = false;
++};
++
++template <>
++struct DefaultHash<InvalidZeroValue> {
++ struct Hash {
++ static unsigned GetHash(const InvalidZeroValue&) { return 0; }
++ static bool Equal(const InvalidZeroValue&, const InvalidZeroValue&) {
++ return true;
++ }
++ };
++};
++
++template <typename Set>
++class ListOrLinkedHashSetInvalidZeroTest : public testing::Test {};
++
++using InvalidZeroValueSetTypes =
++ testing::Types<ListHashSet<InvalidZeroValue>,
++ ListHashSet<InvalidZeroValue, 1>,
++ LinkedHashSet<InvalidZeroValue>>;
++TYPED_TEST_SUITE(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValueSetTypes);
++
++TYPED_TEST(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValue) {
++ using Set = TypeParam;
++ Set set;
++ set.insert(InvalidZeroValue());
++}
++
+ } // namespace WTF
diff --git a/srcpkgs/chromium/patches/one_euro_filter.patch b/srcpkgs/chromium/patches/one_euro_filter.patch
new file mode 100644
index 00000000000..357babf1668
--- /dev/null
+++ b/srcpkgs/chromium/patches/one_euro_filter.patch
@@ -0,0 +1,11 @@
+--- third_party/one_euro_filter/src/one_euro_filter.h.orig 2019-09-29 21:21:03.958633609 -0400
++++ third_party/one_euro_filter/src/one_euro_filter.h 2019-09-29 21:21:54.128270940 -0400
+@@ -3,6 +3,8 @@
+
+ #include "low_pass_filter.h"
+
++#include <memory>
++
+ namespace one_euro_filter {
+ namespace test {
+ class OneEuroFilterTest;
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 6a35ada420d..304251bf6c9 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See http://www.chromium.org/developers/calendar for the latest version
-version=76.0.3809.132
+version=77.0.3865.90
revision=1
archs="i686 x86_64*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=d54e4640b5e399d170dffbc5bcff65157eb1b29314b94b5d808f727d9ce45241
+checksum=004cfdb1df74847bea8659bcaf8e039d51fe1101d42b6cf1c6cc346073fdefc3
lib32disabled=yes
nodebug=yes
@@ -246,7 +246,7 @@ do_install() {
vinstall out/Release/icudtl.dat 0644 usr/lib/chromium
- for size in 22 24 48 64 128 256; do
+ for size in 24 48 64 128 256; do
install -Dm644 "chrome/app/theme/chromium/product_logo_${size}.png" \
${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
done
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 77.0.3865.90.
2019-10-01 0:05 [PR PATCH] chromium: update to 77.0.3865.90 voidlinux-github
2019-10-01 0:24 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-01 0:24 ` voidlinux-github
2019-10-01 0:26 ` voidlinux-github
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-01 0:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 468 bytes --]
There is an updated pull request by pbui against master on the void-packages repository
https://github.com/pbui/void-packages chromium
https://github.com/void-linux/void-packages/pull/14862
chromium: update to 77.0.3865.90.
[ci skip]
- Update vaapi patch from Ubuntu/Debian patch.
- Add two build fix patches.
- Built for x86_64, x86_64-musl, i686
- Tested on x86_64
A patch file from https://github.com/void-linux/void-packages/pull/14862.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-14862.patch --]
[-- Type: text/x-diff, Size: 50785 bytes --]
From 135d998190f17e9e07460ebd48625d090f885e37 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Sep 2019 11:52:35 -0400
Subject: [PATCH 1/2] chromium: update to 77.0.3865.90.
[ci skip]
- Update vaapi patch from Ubuntu/Debian patch.
- Add two build fix patches.
- Built for x86_64, x86_64-musl, i686
- Tested on x86_64
---
.../files/musl-patches/no-mallinfo.patch | 12 +
.../patches/chromium-enable-vaapi.patch | 760 +++++++-----------
.../chromium/patches/harfbuzz-subset.patch | 49 ++
.../chromium/patches/linked-hash-set.patch | 130 +++
.../chromium/patches/one_euro_filter.patch | 11 +
srcpkgs/chromium/template | 6 +-
6 files changed, 516 insertions(+), 452 deletions(-)
create mode 100644 srcpkgs/chromium/patches/harfbuzz-subset.patch
create mode 100644 srcpkgs/chromium/patches/linked-hash-set.patch
create mode 100644 srcpkgs/chromium/patches/one_euro_filter.patch
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 461c90cb0af..288f8670c06 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -42,3 +42,15 @@ index 0eb5c1f..8af7799 100644
mi = ::mallinfo();
return mi.uordblks;
+--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400
++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400
+@@ -122,7 +122,9 @@
+ /* #undef HAVE_MALLCTL */
+
+ /* Define to 1 if you have the `mallinfo' function. */
++#if defined(__GLIBC__)
+ #define HAVE_MALLINFO 1
++#endif
+
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #define HAVE_MALLOC_H 1
diff --git a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
index d1cb7b4be59..01c253de5ff 100644
--- a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
+++ b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
@@ -1,165 +1,107 @@
---- chrome/browser/about_flags.cc.orig 2019-07-29 16:35:46.000000000 -0400
-+++ chrome/browser/about_flags.cc 2019-07-31 13:54:18.350186083 -0400
-@@ -1119,12 +1119,14 @@
- {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
- flag_descriptions::kUiPartialSwapDescription, kOsAll,
- SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
- flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
- {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
- flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
-+#endif
- #if !defined(OS_ANDROID)
- {"enable-reader-mode", flag_descriptions::kEnableReaderModeName,
- flag_descriptions::kEnableReaderModeDescription, kOsDesktop,
-@@ -1446,6 +1448,13 @@
- flag_descriptions::kEnableVirtualDesksDescription, kOsCrOS,
- FEATURE_VALUE_TYPE(ash::features::kVirtualDesks)},
- #endif // OS_CHROMEOS
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ {
-+ "enable-accelerated-video", flag_descriptions::kAcceleratedVideoName,
-+ flag_descriptions::kAcceleratedVideoDescription, kOsLinux,
-+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedVideo),
-+ },
-+#else
- {
+From 53b93dfe87fd10cced5d2a2a63072dfc7a2af6e4 Mon Sep 17 00:00:00 2001
+From: Daniel Charles <daniel.charles@intel.com>
+Date: Fri, 28 Jul 2017 16:31:47 -0700
+Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only
+
+This patch contains all the changes necessary to use VA-API along with
+vaapi-driver to run all media use cases supported with hardware acceleration.
+
+It is intended to remain as experimental accessible from chrome://flags on linux.
+It requires libva/intel-vaapi-driver to be installed on the system path where
+chrome is executed. Other drivers could be tested if available. Flags are
+kept independent for linux, where this feature has to be enabled before
+actually using it. This should not change how other OSes use the flags
+already, the new flags will show at the buttom on the section of unavailable
+experiments
+
+The changes cover a range of compiler pre-processor flags to enable the stack.
+It moves the presandbox operations to the vaapi_wrapper class as the hook function
+is available there. vaInit will open driver on the correct installed folder.
+
+chrome flags consolidtation into only two flags for linux. Mjpeg and accelerated
+video are used. The other flags are kept for ChromeOS and other OSes.
+
+Developer testing was made on skylake hardware, ChromeOS and Ubuntu.
+
+BUG=NONE
+TEST="subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder"
+TEST="and decoder hardware accelerated"
+TEST="have libva/intel-vaapi-driver installed and not installed in the system"
+TEST="repeat on different hardware families"
+R=posciak@chromium.org
+R=kcwu@chromium.org
+
+Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
+Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171
+Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+---
+
+Index: dev/chrome/browser/about_flags.cc
+===================================================================
+--- chrome/browser/about_flags.cc
++++ chrome/browser/about_flags.cc
+@@ -1527,7 +1527,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -1453,6 +1462,7 @@
- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
+ flag_descriptions::kAcceleratedVideoDecodeDescription,
+- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
++ kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
-+#endif
- {"enable-history-favicons-google-server-query",
- flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryName,
- flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryDescription,
-@@ -1883,7 +1892,12 @@
+ {
+@@ -1993,10 +1993,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
- #endif // ENABLE_ISOLATED_XR_SERVICE
+ #endif // !defined(OS_ANDROID)
#endif // ENABLE_VR
-#if defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ {"enable-accelerated-mjpeg-decode",
-+ flag_descriptions::kAcceleratedMjpegDecodeName,
-+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsLinux,
-+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedMjpegDecode)},
-+#elif defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
{"disable-accelerated-mjpeg-decode",
flag_descriptions::kAcceleratedMjpegDecodeName,
- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
---- chrome/browser/chromeos/login/chrome_restart_request.cc.orig 2019-07-29 16:35:47.000000000 -0400
-+++ chrome/browser/chromeos/login/chrome_restart_request.cc 2019-07-31 13:58:47.201085960 -0400
-@@ -20,6 +20,7 @@
- #include "base/system/sys_info.h"
- #include "base/timer/timer.h"
- #include "base/values.h"
-+#include "build/build_config.h"
- #include "cc/base/switches.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/chromeos/boot_times_recorder.h"
-@@ -84,9 +85,14 @@
- ::switches::kBlinkSettings,
- ::switches::kDisable2dCanvasImageChromium,
- ::switches::kDisableAccelerated2dCanvas,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ ::switches::kEnableAcceleratedMjpegDecode,
-+ ::switches::kEnableAcceleratedVideo,
-+#else
- ::switches::kDisableAcceleratedMjpegDecode,
- ::switches::kDisableAcceleratedVideoDecode,
- ::switches::kDisableAcceleratedVideoEncode,
-+#endif
- ::switches::kDisableBlinkFeatures,
- ::switches::kDisableGpu,
- ::switches::kDisableGpuMemoryBufferVideoFrames,
-@@ -158,8 +164,10 @@
- ::switches::kEnableWebGLImageChromium,
- ::switches::kEnableWebVR,
- ::switches::kEnableUnsafeWebGPU,
-+#if (defined(OS_CHROMEOS) || defined(OS_ANDROID))
- ::switches::kDisableWebRtcHWDecoding,
- ::switches::kDisableWebRtcHWEncoding,
-+#endif
- ::switches::kOzonePlatform,
- ash::switches::kAshEnableTabletMode,
- ash::switches::kAshEnableWaylandServer,
-diff -ur chrome/browser/flag_descriptions.cc chromium-69.0.3497.92/chrome/browser/flag_descriptions.cc
---- chrome/browser/flag_descriptions.cc.orig 2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.cc 2019-07-02 12:27:47.137866754 -0400
-@@ -14,6 +14,13 @@
- "Enables the use of the GPU to perform 2d canvas rendering instead of "
- "using software rendering.";
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+const char kAcceleratedVideoName[] = "Hardware-accelerated video";
-+const char kAcceleratedVideoDescription[] =
-+ "Hardware-accelerated video where VA-API driver is installed on the"
-+ "system.";
-+#endif
-+
- const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
- const char kAcceleratedVideoDecodeDescription[] =
- "Hardware-accelerated video decode where available.";
-@@ -2081,6 +2088,7 @@
- const char kWebrtcHybridAgcDescription[] =
- "WebRTC Agc2 digital adaptation with Agc1 analog adaptation.";
-
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
- const char kWebrtcHwDecodingDescription[] =
- "Support in WebRTC for decoding video streams using platform hardware.";
-@@ -2088,6 +2096,7 @@
- const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
- const char kWebrtcHwEncodingDescription[] =
- "Support in WebRTC for encoding video streams using platform hardware.";
-+#endif
-
- const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
- const char kWebrtcHwH264EncodingDescription[] =
-@@ -2943,14 +2952,16 @@
+- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
++ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
+ SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
+ #endif // OS_CHROMEOS
+ {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
+Index: dev/chrome/browser/flag_descriptions.cc
+===================================================================
+--- chrome/browser/flag_descriptions.cc
++++ chrome/browser/flag_descriptions.cc
+@@ -2880,9 +2880,7 @@ const char kMacSystemMediaPermissionsInf
- // Chrome OS -------------------------------------------------------------------
+ #endif
+-// Chrome OS -------------------------------------------------------------------
+-
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
- const char kAcceleratedMjpegDecodeDescription[] =
+@@ -2890,6 +2888,12 @@ const char kAcceleratedMjpegDecodeDescri
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
-+#endif
++#endif
++
++// Chrome OS -------------------------------------------------------------------
++
+#if defined(OS_CHROMEOS)
++
const char kAppServiceAshName[] = "App Service Ash";
const char kAppServiceAshDescription[] =
"Use the App Service to provide data to the Ash UI, such as the shelf and "
-diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser/flag_descriptions.h
---- chrome/browser/flag_descriptions.h.orig 2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.h 2019-07-02 12:29:46.200214795 -0400
-@@ -43,6 +43,10 @@
- extern const char kAccelerated2dCanvasName[];
- extern const char kAccelerated2dCanvasDescription[];
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+extern const char kAcceleratedVideoName[];
-+extern const char kAcceleratedVideoDescription[];
-+#endif
- extern const char kAcceleratedVideoDecodeName[];
- extern const char kAcceleratedVideoDecodeDescription[];
-
-@@ -1765,13 +1769,17 @@
+Index: dev/chrome/browser/flag_descriptions.h
+===================================================================
+--- chrome/browser/flag_descriptions.h
++++ chrome/browser/flag_descriptions.h
+@@ -1715,13 +1715,17 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)
-// Chrome OS ------------------------------------------------------------------
-
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
@@ -173,234 +115,32 @@ diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser
extern const char kAppServiceAshName[];
extern const char kAppServiceAshDescription[];
-diff -ur content/browser/gpu/compositor_util.cc chromium-69.0.3497.92/content/browser/gpu/compositor_util.cc
---- content/browser/gpu/compositor_util.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/gpu/compositor_util.cc 2018-09-13 22:10:34.072012092 +0530
-@@ -149,7 +149,11 @@
- {"video_decode",
- SafeGetFeatureStatus(gpu_feature_info,
- gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ !command_line.HasSwitch(switches::kEnableAcceleratedVideo),
-+#else
- command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
-+#endif
- "Accelerated video decode has been disabled, either via blacklist, "
- "about:flags or the command line.",
- true, true},
---- content/browser/gpu/gpu_process_host.cc.orig 2019-07-31 14:16:52.304849119 -0400
-+++ content/browser/gpu/gpu_process_host.cc 2019-07-31 14:19:22.567480008 -0400
-@@ -208,7 +208,9 @@
- switches::kDisableLogging,
- switches::kDisableShaderNameHashing,
- switches::kDisableSkiaRuntimeOpts,
-+#if !defined(OS_LINUX)
- switches::kDisableWebRtcHWEncoding,
-+#endif
- switches::kEnableGpuRasterization,
- switches::kEnableLogging,
- switches::kEnableVizDevTools,
-diff -ur content/browser/renderer_host/media/video_capture_browsertest.cc chromium-69.0.3497.92/content/browser/renderer_host/media/video_capture_browsertest.cc
---- content/browser/renderer_host/media/video_capture_browsertest.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/renderer_host/media/video_capture_browsertest.cc 2018-09-13 22:10:34.124010499 +0530
-@@ -165,8 +165,13 @@
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kUseFakeJpegDecodeAccelerator);
- } else {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
-+ switches::kEnableAcceleratedMjpegDecode);
-+#else
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kDisableAcceleratedMjpegDecode);
-+#endif
- }
- }
-
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-07-29 16:36:09.000000000 -0400
-+++ content/browser/renderer_host/render_process_host_impl.cc 2019-07-31 14:04:18.859680348 -0400
-@@ -2937,7 +2937,11 @@
- switches::kDefaultTileHeight,
- switches::kDisable2dCanvasImageChromium,
- switches::kDisableYUVImageDecoding,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ switches::kEnableAcceleratedVideo,
-+#else
- switches::kDisableAcceleratedVideoDecode,
-+#endif
- switches::kDisableBackgroundTimerThrottling,
- switches::kDisableBestEffortTasks,
- switches::kDisableBreakpad,
-@@ -3077,8 +3081,10 @@
- #if BUILDFLAG(ENABLE_PLUGINS)
- switches::kEnablePepperTesting,
- #endif
-+#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
- switches::kDisableWebRtcHWDecoding,
- switches::kDisableWebRtcHWEncoding,
-+#endif
- switches::kEnableWebRtcSrtpAesGcm,
- switches::kEnableWebRtcSrtpEncryptedHeaders,
- switches::kEnableWebRtcStunOrigin,
-diff -ur content/browser/utility_process_host.cc chromium-69.0.3497.92/content/browser/utility_process_host.cc
---- content/browser/utility_process_host.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/utility_process_host.cc 2018-09-13 22:10:34.296005227 +0530
-@@ -296,7 +296,11 @@
- switches::kOverrideUseSoftwareGLForTests,
- switches::kOverrideEnabledCdmInterfaceVersion,
- switches::kProxyServer,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ switches::kEnableAcceleratedMjpegDecode,
-+#else
- switches::kDisableAcceleratedMjpegDecode,
-+#endif
- switches::kUseFakeDeviceForMediaStream,
- switches::kUseFakeJpegDecodeAccelerator,
- switches::kUseFileForFakeVideoCapture,
-diff -ur content/browser/webrtc/webrtc_media_recorder_browsertest.cc chromium-69.0.3497.92/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
---- content/browser/webrtc/webrtc_media_recorder_browsertest.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/webrtc/webrtc_media_recorder_browsertest.cc 2018-09-13 22:10:34.143009916 +0530
-@@ -66,7 +66,12 @@
- return;
- // This flag is also used for encoding, https://crbug.com/616640.
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
-- switches::kDisableAcceleratedVideoDecode);
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ switches::kEnableAcceleratedVideo
-+#else
-+ switches::kDisableAcceleratedVideoDecode
-+#endif
-+ );
- }
-
- private:
-diff -ur content/gpu/BUILD.gn chromium-69.0.3497.92/content/gpu/BUILD.gn
---- content/gpu/BUILD.gn 2018-09-12 00:39:41.000000000 +0530
-+++ content/gpu/BUILD.gn 2018-09-13 22:10:34.148009763 +0530
-@@ -133,4 +133,8 @@
+Index: dev/content/gpu/BUILD.gn
+===================================================================
+--- content/gpu/BUILD.gn
++++ content/gpu/BUILD.gn
+@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
+ import("//build/config/ui.gni")
+ import("//gpu/vulkan/features.gni")
+ import("//media/media_options.gni")
++import("//media/gpu/args.gni")
+ import("//ui/ozone/ozone.gni")
+
+ # See //content/BUILD.gn for how this works.
+@@ -128,4 +129,8 @@ target(link_target_type, "gpu_sources")
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
+
-+ if (is_desktop_linux) {
-+ public_configs = [ "//media/gpu:libva_config" ]
++ if (is_desktop_linux && use_vaapi) {
++ public_configs = [ "//build/config/linux/libva" ]
+ }
}
-diff -ur content/gpu/gpu_main.cc chromium-69.0.3497.92/content/gpu/gpu_main.cc
---- content/gpu/gpu_main.cc 2019-07-02 09:50:13.403486804 -0400
-+++ content/gpu/gpu_main.cc 2019-07-02 09:55:07.256818723 -0400
-@@ -288,7 +288,7 @@
-
- base::PlatformThread::SetName("CrGpuMain");
-
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
- // Set thread priority before sandbox initialization.
- base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
- #endif
-@@ -321,7 +321,7 @@
- GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
-
- base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
- io_thread_priority = base::ThreadPriority::DISPLAY;
- #endif
-
-diff -ur content/public/browser/gpu_utils.cc chromium-69.0.3497.92/content/public/browser/gpu_utils.cc
---- content/public/browser/gpu_utils.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/browser/gpu_utils.cc 2018-09-13 22:10:34.164009273 +0530
-@@ -57,9 +57,17 @@
- gpu_preferences.in_process_gpu =
- command_line->HasSwitch(switches::kInProcessGPU);
- gpu_preferences.disable_accelerated_video_decode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
- command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
-+#endif
- gpu_preferences.disable_accelerated_video_encode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
- command_line->HasSwitch(switches::kDisableAcceleratedVideoEncode);
-+#endif
- #if defined(OS_WIN)
- uint32_t enable_accelerated_vpx_decode_val =
- gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
-diff -ur content/public/common/content_switches.cc chromium-69.0.3497.92/content/public/common/content_switches.cc
---- content/public/common/content_switches.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.cc 2018-09-13 22:10:34.172009028 +0530
-@@ -79,6 +79,11 @@
- // Disable gpu-accelerated 2d canvas.
- const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas";
-
-+#if defined(OS_LINUX)
-+// Enables hardware acceleration of video for Linux only. VA-API driver
-+// is required to be present on the system installation.
-+const char kEnableAcceleratedVideo[] = "enable-accelerated-video";
-+#endif
- // Disables hardware acceleration of video decode, where available.
- const char kDisableAcceleratedVideoDecode[] =
- "disable-accelerated-video-decode";
-@@ -868,11 +873,13 @@
- // ignores this switch on its stable and beta channels.
- const char kDisableWebRtcEncryption[] = "disable-webrtc-encryption";
-
-+#if defined(OS_CHROMEOS)
- // Disables HW decode acceleration for WebRTC.
- const char kDisableWebRtcHWDecoding[] = "disable-webrtc-hw-decoding";
-
- // Disables HW encode acceleration for WebRTC.
- const char kDisableWebRtcHWEncoding[] = "disable-webrtc-hw-encoding";
-+#endif
-
- // Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC.
- // See https://tools.ietf.org/html/rfc7714 for further information.
-diff -ur content/public/common/content_switches.h chromium-69.0.3497.92/content/public/common/content_switches.h
---- content/public/common/content_switches.h 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.h 2018-09-13 22:10:34.172009028 +0530
-@@ -104,6 +104,9 @@
- CONTENT_EXPORT extern const char kDomAutomationController[];
- extern const char kDisable2dCanvasClipAntialiasing[];
- CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+CONTENT_EXPORT extern const char kEnableAcceleratedVideo[];
-+#endif
- CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[];
- CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
- CONTENT_EXPORT extern const char kEnableAutomation[];
-@@ -241,8 +244,10 @@
- CONTENT_EXPORT extern const char kWaitForDebuggerChildren[];
-
- CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
-+#if defined(OS_CHROMEOS)
- CONTENT_EXPORT extern const char kDisableWebRtcHWDecoding[];
- CONTENT_EXPORT extern const char kDisableWebRtcHWEncoding[];
-+#endif
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
- CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
-diff -ur content/renderer/render_thread_impl.cc chromium-69.0.3497.92/content/renderer/render_thread_impl.cc
---- content/renderer/render_thread_impl.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/renderer/render_thread_impl.cc 2018-09-13 22:10:34.192008415 +0530
-@@ -1441,7 +1441,11 @@
- kGpuStreamPriorityMedia);
-
- const bool enable_video_accelerator =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ cmd_line->HasSwitch(switches::kEnableAcceleratedVideo) &&
-+#else
- !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-+#endif
- (gpu_channel_host->gpu_feature_info()
- .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
- gpu::kGpuFeatureStatusEnabled);
-Only in content/renderer: render_thread_impl.cc.orig
-diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/config/software_rendering_list.json
---- gpu/config/software_rendering_list.json 2018-09-12 00:39:44.000000000 +0530
-+++ gpu/config/software_rendering_list.json 2018-09-13 22:10:34.193008384 +0530
-@@ -377,17 +377,6 @@
+Index: dev/gpu/config/software_rendering_list.json
+===================================================================
+--- gpu/config/software_rendering_list.json
++++ gpu/config/software_rendering_list.json
+@@ -369,17 +369,6 @@
]
},
{
@@ -418,119 +158,241 @@ diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/confi
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
"cr_bugs": [145531, 332596, 571899, 629434],
-diff -ur media/base/media_switches.cc chromium-69.0.3497.92/media/base/media_switches.cc
---- media/base/media_switches.cc.orig 2019-06-18 11:48:14.000000000 -0400
-+++ media/base/media_switches.cc 2019-07-02 12:32:22.370983036 -0400
-@@ -103,10 +103,15 @@
- const char kUseFakeMjpegDecodeAccelerator[] =
- "use-fake-mjpeg-decode-accelerator";
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+// Enable hardware accelerated mjpeg decode on linux
-+const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode";
-+#else
- // Disable hardware acceleration of mjpeg decode for captured frame, where
- // available.
- const char kDisableAcceleratedMjpegDecode[] =
- "disable-accelerated-mjpeg-decode";
-+#endif
-
- // When running tests on a system without the required hardware or libraries,
- // this flag will cause the tests to fail. Otherwise, they silently succeed.
-@@ -503,15 +508,21 @@
- };
-
- bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-+ switches::kEnableAcceleratedMjpegDecode)
-+#else
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-- switches::kDisableAcceleratedMjpegDecode)) {
-+ switches::kDisableAcceleratedMjpegDecode)
-+#endif
-+ ) {
- return false;
- }
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+Index: dev/media/base/media_switches.cc
+===================================================================
+--- media/base/media_switches.cc
++++ media/base/media_switches.cc
+@@ -544,7 +544,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
switches::kUseFakeMjpegDecodeAccelerator)) {
return true;
}
-#if defined(OS_CHROMEOS)
-+#if !defined(OS_ANDROID) && defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
return true;
#endif
return false;
-diff -ur media/base/media_switches.h chromium-69.0.3497.92/media/base/media_switches.h
---- media/base/media_switches.h.orig 2019-07-02 12:20:39.902984488 -0400
-+++ media/base/media_switches.h 2019-07-02 12:33:45.441923602 -0400
-@@ -60,7 +60,11 @@
- MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
- MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[];
- MEDIA_EXPORT extern const char kUseFakeMjpegDecodeAccelerator[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+MEDIA_EXPORT extern const char kEnableAcceleratedMjpegDecode[];
-+#else
- MEDIA_EXPORT extern const char kDisableAcceleratedMjpegDecode[];
-+#endif
-
- MEDIA_EXPORT extern const char kRequireAudioHardwareForTesting[];
- MEDIA_EXPORT extern const char kMuteAudio[];
---- media/gpu/BUILD.gn.orig 2019-07-29 16:36:19.000000000 -0400
-+++ media/gpu/BUILD.gn 2019-07-31 14:09:28.093032826 -0400
-@@ -495,6 +495,14 @@
+Index: dev/media/filters/BUILD.gn
+===================================================================
+--- media/filters/BUILD.gn
++++ media/filters/BUILD.gn
+@@ -5,6 +5,7 @@
+ import("//build/config/jumbo.gni")
+ import("//media/media_options.gni")
+ import("//third_party/libaom/options.gni")
++import("//media/gpu/args.gni")
+
+ jumbo_source_set("filters") {
+ # Do not expand the visibility here without double-checking with OWNERS, this
+@@ -196,7 +197,7 @@ jumbo_source_set("filters") {
+ deps += [ "//media/base/android" ]
}
- }
-+if (is_desktop_linux && use_vaapi) {
-+ import("//build/config/linux/pkg_config.gni")
-+
-+ pkg_config("libva_config") {
-+ packages = [ "libva" ]
-+ }
-+}
-+
- if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
- test("video_encode_accelerator_unittest") {
- deps = [
-@@ -525,6 +533,10 @@
+- if (current_cpu != "arm" && is_linux) {
++ if (use_vaapi) {
+ sources += [
+ "h264_bitstream_buffer.cc",
+ "h264_bitstream_buffer.h",
+Index: dev/media/gpu/BUILD.gn
+===================================================================
+--- media/gpu/BUILD.gn
++++ media/gpu/BUILD.gn
+@@ -531,6 +531,7 @@ if (use_v4l2_codec || use_vaapi || is_ma
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
-+
-+ if (is_desktop_linux) {
-+ public_configs = [ ":libva_config" ]
-+ }
++ public_configs = [ "//build/config/linux/libva" ]
}
}
---- content/renderer/media/webrtc/video_codec_factory.cc.orig 2019-07-02 16:39:57.973241977 -0400
-+++ content/renderer/media/webrtc/video_codec_factory.cc 2019-07-02 17:00:00.656342711 -0400
-@@ -187,8 +187,11 @@
- std::unique_ptr<webrtc::VideoEncoderFactory> encoder_factory;
+Index: dev/media/gpu/gpu_video_decode_accelerator_factory.cc
+===================================================================
+--- media/gpu/gpu_video_decode_accelerator_factory.cc
++++ media/gpu/gpu_video_decode_accelerator_factory.cc
+@@ -171,6 +171,8 @@ GpuVideoDecodeAcceleratorFactory::Create
+ vda = (this->*create_vda_function)(workarounds, gpu_preferences, media_log);
+ if (vda && vda->Initialize(config, client))
+ return vda;
++ else
++ LOG(ERROR) << "Initialization of one or more VDAs failed.";
+ }
- const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-- if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
-- !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
-+ if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()
-+#if defined(OS_CHROMEOS)
-+ && !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)
+ return nullptr;
+@@ -229,6 +231,7 @@ GpuVideoDecodeAcceleratorFactory::Create
+ const gpu::GpuDriverBugWorkarounds& workarounds,
+ const gpu::GpuPreferences& gpu_preferences,
+ MediaLog* media_log) const {
++ LOG(WARNING) << "Initializing VAAPI VDA.";
+ std::unique_ptr<VideoDecodeAccelerator> decoder;
+ decoder.reset(new VaapiVideoDecodeAccelerator(make_context_current_cb_,
+ bind_image_cb_));
+Index: dev/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/ipc/service/gpu_video_decode_accelerator.cc
++++ media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+@@ -380,6 +380,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+ LOG(ERROR) << "Failed creating the VDA factory";
+ return false;
+ }
++ LOG(WARNING) << "Created the VDA factory";
+
+ const gpu::GpuDriverBugWorkarounds& gpu_workarounds =
+ stub_->channel()->gpu_channel_manager()->gpu_driver_bug_workarounds();
+@@ -393,6 +394,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+ << (config.is_encrypted() ? " with encryption" : "");
+ return false;
+ }
++ LOG(WARNING) << "Created VDA";
+
+ // Attempt to set up performing decoding tasks on IO thread, if supported by
+ // the VDA.
+Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_video_decode_accelerator.cc
++++ media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+@@ -64,6 +64,7 @@ void ReportToUMA(VAVDADecoderFailure fai
+ VAVDA_DECODER_FAILURES_MAX + 1);
+ }
+
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
+ // Lake) Cpu platform id's are referenced from the following file in kernel
+ // source arch/x86/include/asm/intel-family.h
+@@ -76,6 +77,7 @@ bool IsGeminiLakeOrLater() {
+ cpuid.model() >= kGeminiLakeModelId;
+ return is_geminilake_or_later;
+ }
+#endif
-+ ) {
- encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
+
+ } // namespace
+
+@@ -632,6 +634,10 @@ void VaapiVideoDecodeAccelerator::Assign
+ va_surface_format_ = GetVaFormatForVideoCodecProfile(profile_);
+ std::vector<VASurfaceID> va_surface_ids;
+
++ // Nvidia doesn't support VAProfileNone, so don't try to create a temporary
++ // copy buffer there. It's not needed anyways for hardware video decoding
++ // to work.
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // If we aren't in BufferAllocationMode::kNone, we have to allocate a
+ // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
+ // internal decoded frame.
+@@ -645,15 +651,20 @@ void VaapiVideoDecodeAccelerator::Assign
+ NotifyError(PLATFORM_FAILURE);
+ }
}
++#endif
-@@ -205,8 +208,11 @@
- std::unique_ptr<webrtc::VideoDecoderFactory> decoder_factory;
+ for (size_t i = 0; i < buffers.size(); ++i) {
+ // If we aren't in BufferAllocationMode::kNone, this |picture| is
+ // only used as a copy destination. Therefore, the VaapiWrapper used and
+ // owned by |picture| is |vpp_vaapi_wrapper_|.
+ std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++ vaapi_wrapper_,
++#else
+ (buffer_allocation_mode_ == BufferAllocationMode::kNone)
+ ? vaapi_wrapper_
+ : vpp_vaapi_wrapper_,
++#endif
+ make_context_current_cb_, bind_image_cb_, buffers[i]);
+ RETURN_AND_NOTIFY_ON_FAILURE(picture, "Failed creating a VaapiPicture",
+ PLATFORM_FAILURE, );
+@@ -1078,6 +1089,9 @@ VaapiVideoDecodeAccelerator::GetSupporte
+
+ VaapiVideoDecodeAccelerator::BufferAllocationMode
+ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++ return BufferAllocationMode::kNormal;
++#else
+ // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
+ // |output_mode_| as well.
+ if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
+@@ -1113,6 +1127,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+ return BufferAllocationMode::kReduced;
- const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-- if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
-- !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)) {
-+ if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()
-+#if defined(OS_CHROMEOS)
-+ && !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)
+ return BufferAllocationMode::kSuperReduced;
+#endif
-+ ) {
- decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
+ }
+
+ bool VaapiVideoDecodeAccelerator::IsBufferAllocationModeReducedOrSuperReduced()
+Index: dev/media/gpu/vaapi/vaapi_wrapper.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_wrapper.cc
++++ media/gpu/vaapi/vaapi_wrapper.cc
+@@ -324,6 +324,11 @@ void VADisplayState::PreSandboxInitializ
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+ if (drm_file.IsValid())
+ VADisplayState::Get()->SetDrmFd(drm_file.GetPlatformFile());
++
++ const char kNvidiaPath[] = "/dev/dri/nvidiactl";
++ base::File nvidia_file = base::File(
++ base::FilePath::FromUTF8Unsafe(kNvidiaPath),
++ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+ }
+
+ VADisplayState::VADisplayState()
+@@ -351,10 +356,6 @@ bool VADisplayState::Initialize() {
+ }
+
+ bool VADisplayState::InitializeOnce() {
+- static_assert(
+- VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
+- "Requires VA-API >= 1.1.0");
+-
+ switch (gl::GetGLImplementation()) {
+ case gl::kGLImplementationEGLGLES2:
+ va_display_ = vaGetDisplayDRM(drm_fd_.get());
+@@ -362,10 +363,10 @@ bool VADisplayState::InitializeOnce() {
+ case gl::kGLImplementationDesktopGL:
+ #if defined(USE_X11)
+ va_display_ = vaGetDisplay(gfx::GetXDisplay());
+-#else
+- LOG(WARNING) << "VAAPI video acceleration not available without "
+- "DesktopGL (GLX).";
++ if (vaDisplayIsValid(va_display_))
++ break;
+ #endif // USE_X11
++ va_display_ = vaGetDisplayDRM(drm_fd_.get());
+ break;
+ // Cannot infer platform from GL, try all available displays
+ case gl::kGLImplementationNone:
+@@ -398,8 +399,19 @@ bool VADisplayState::InitializeOnce() {
+ int major_version, minor_version;
+ VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
+ if (va_res != VA_STATUS_SUCCESS) {
+- LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res);
+- return false;
++ LOG(ERROR) << "vaInitialize failed (ignore if using Wayland desktop environment): " << vaErrorStr(va_res);
++ va_display_ = vaGetDisplayDRM(drm_fd_.get());
++ if (!vaDisplayIsValid(va_display_)) {
++ LOG(ERROR) << "Could not get a valid DRM VA display";
++ return false;
++ }
++ va_res = vaInitialize(va_display_, &major_version, &minor_version);
++ if (va_res != VA_STATUS_SUCCESS) {
++ LOG(ERROR) << "vaInitialize failed using DRM: " << vaErrorStr(va_res);
++ return false;
++ } else {
++ LOG(WARNING) << "vaInitialize succeeded for DRM";
++ }
}
+ va_initialized_ = true;
+@@ -407,7 +419,7 @@ bool VADisplayState::InitializeOnce() {
+ va_vendor_string_ = vaQueryVendorString(va_display_);
+ DLOG_IF(WARNING, va_vendor_string_.empty())
+ << "Vendor string empty or error reading.";
+- DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
++ VLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
+ << va_vendor_string_;
+
+ // The VAAPI version is determined from what is loaded on the system by
+@@ -742,7 +754,7 @@ bool VASupportedProfiles::AreAttribsSupp
+ 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
++ VLOG(1) << "Unsupported value " << required_attribs[i].value
+ << " for attribute type " << required_attribs[i].type;
+ return false;
+ }
diff --git a/srcpkgs/chromium/patches/harfbuzz-subset.patch b/srcpkgs/chromium/patches/harfbuzz-subset.patch
new file mode 100644
index 00000000000..6f228b774d4
--- /dev/null
+++ b/srcpkgs/chromium/patches/harfbuzz-subset.patch
@@ -0,0 +1,49 @@
+From 27e25336b8316ff3ec4e464058682ed85801fd06 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Mon, 29 Jul 2019 10:54:28 +0000
+Subject: [PATCH] Also link against libharfbuzz-subset when use_system_harfbuzz is true
+
+When building HarfBuzz as part of Chromium, there is a single source set
+with all the files we need in the build.
+
+Upstream HarfBuzz, on the other hand, produces a few different libraries:
+harfbuzz, harfbuzz-icu and harfbuzz-subset. When |use_system_harfbuzz| is
+true, we were only looking for (and using) harfbuzz.pc with pkg-config even
+though we also use symbols from libharfbuzz-subset.so. This resulted in
+errors when linking:
+
+ ld: obj/skia/skia/SkPDFSubsetFont.o: in function `SkPDFSubsetFont(sk_sp<SkData>, SkPDFGlyphUse const&, SkPDF::Metadata::Subsetter, char const*, int)':
+ SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x48a): undefined reference to `hb_subset_input_create_or_fail'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x4af): undefined reference to `hb_subset_input_glyph_set'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5d7): undefined reference to `hb_subset_input_set_retain_gids'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5e4): undefined reference to `hb_subset_input_set_drop_hints'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5f3): undefined reference to `hb_subset'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x66f): undefined reference to `hb_subset_input_destroy'
+
+as reported in
+https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ
+
+Change-Id: I997af075c7b7263cd7cc71a63db5b0f93bd1ab59
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715288
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Commit-Queue: Dominik Röttsches <drott@chromium.org>
+Reviewed-by: Dominik Röttsches <drott@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#681760}
+---
+
+diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
+index 37d8e33..72013eb1d 100644
+--- third_party/harfbuzz-ng/BUILD.gn
++++ third_party/harfbuzz-ng/BUILD.gn
+@@ -16,7 +16,10 @@
+ "//third_party:freetype_harfbuzz",
+ "//third_party/freetype:freetype_source",
+ ]
+- packages = [ "harfbuzz" ]
++ packages = [
++ "harfbuzz",
++ "harfbuzz-subset",
++ ]
+ }
+ } else {
+ config("harfbuzz_config") {
diff --git a/srcpkgs/chromium/patches/linked-hash-set.patch b/srcpkgs/chromium/patches/linked-hash-set.patch
new file mode 100644
index 00000000000..24b13d8a5c0
--- /dev/null
+++ b/srcpkgs/chromium/patches/linked-hash-set.patch
@@ -0,0 +1,130 @@
+From 74138b9febd37eac0fc26b8efb110014a83a52c6 Mon Sep 17 00:00:00 2001
+From: Jeremy Roman <jbroman@chromium.org>
+Date: Wed, 07 Aug 2019 13:26:48 +0000
+Subject: [PATCH] WTF: Make LinkedHashSet understand values for which memset initialization would be bad.
+
+Includes a unit test which fails before, and uses this to fix FontCacheKeyTraits.
+
+Bug: 980025
+Change-Id: If41f97444c7fd37b9b95d6dadaf3da5689079e9e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739948
+Reviewed-by: Kentaro Hara <haraken@chromium.org>
+Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
+Commit-Queue: Jeremy Roman <jbroman@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#684731}
+---
+
+diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h b/third_party/blink/renderer/platform/fonts/font_cache_key.h
+index 0efc8fb..90063cb 100644
+--- third_party/blink/renderer/platform/fonts/font_cache_key.h
++++ third_party/blink/renderer/platform/fonts/font_cache_key.h
+@@ -133,6 +133,10 @@
+
+ struct FontCacheKeyTraits : WTF::SimpleClassHashTraits<FontCacheKey> {
+ STATIC_ONLY(FontCacheKeyTraits);
++
++ // std::string's empty state need not be zero in all implementations,
++ // and it is held within FontFaceCreationParams.
++ static const bool kEmptyValueIsZero = false;
+ };
+
+ } // namespace blink
+diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
+index b35b6e9..77e524c 100644
+--- third_party/blink/renderer/platform/wtf/linked_hash_set.h
++++ third_party/blink/renderer/platform/wtf/linked_hash_set.h
+@@ -146,6 +146,11 @@
+ LinkedHashSetNodeBase* next)
+ : LinkedHashSetNodeBase(prev, next), value_(value) {}
+
++ LinkedHashSetNode(ValueArg&& value,
++ LinkedHashSetNodeBase* prev,
++ LinkedHashSetNodeBase* next)
++ : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {}
++
+ LinkedHashSetNode(LinkedHashSetNode&& other)
+ : LinkedHashSetNodeBase(std::move(other)),
+ value_(std::move(other.value_)) {}
+@@ -445,10 +450,13 @@
+
+ // The slot is empty when the next_ field is zero so it's safe to zero
+ // the backing.
+- static const bool kEmptyValueIsZero = true;
++ static const bool kEmptyValueIsZero = ValueTraits::kEmptyValueIsZero;
+
+ static const bool kHasIsEmptyValueFunction = true;
+ static bool IsEmptyValue(const Node& node) { return !node.next_; }
++ static Node EmptyValue() {
++ return Node(ValueTraits::EmptyValue(), nullptr, nullptr);
++ }
+
+ static const int kDeletedValue = -1;
+
+diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+index 4c3f899..cd1be00 100644
+--- third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
++++ third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+@@ -487,6 +487,7 @@
+ };
+
+ struct Complicated {
++ Complicated() : Complicated(0) {}
+ Complicated(int value) : simple_(value) { objects_constructed_++; }
+
+ Complicated(const Complicated& other) : simple_(other.simple_) {
+@@ -495,9 +496,6 @@
+
+ Simple simple_;
+ static int objects_constructed_;
+-
+- private:
+- Complicated() = delete;
+ };
+
+ int Complicated::objects_constructed_ = 0;
+@@ -731,4 +729,45 @@
+
+ } // anonymous namespace
+
++// A unit type which objects to its state being initialized wrong.
++struct InvalidZeroValue {
++ InvalidZeroValue() = default;
++ InvalidZeroValue(WTF::HashTableDeletedValueType) : deleted_(true) {}
++ ~InvalidZeroValue() { CHECK(ok_); }
++ bool IsHashTableDeletedValue() const { return deleted_; }
++
++ bool ok_ = true;
++ bool deleted_ = false;
++};
++
++template <>
++struct HashTraits<InvalidZeroValue> : SimpleClassHashTraits<InvalidZeroValue> {
++ static const bool kEmptyValueIsZero = false;
++};
++
++template <>
++struct DefaultHash<InvalidZeroValue> {
++ struct Hash {
++ static unsigned GetHash(const InvalidZeroValue&) { return 0; }
++ static bool Equal(const InvalidZeroValue&, const InvalidZeroValue&) {
++ return true;
++ }
++ };
++};
++
++template <typename Set>
++class ListOrLinkedHashSetInvalidZeroTest : public testing::Test {};
++
++using InvalidZeroValueSetTypes =
++ testing::Types<ListHashSet<InvalidZeroValue>,
++ ListHashSet<InvalidZeroValue, 1>,
++ LinkedHashSet<InvalidZeroValue>>;
++TYPED_TEST_SUITE(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValueSetTypes);
++
++TYPED_TEST(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValue) {
++ using Set = TypeParam;
++ Set set;
++ set.insert(InvalidZeroValue());
++}
++
+ } // namespace WTF
diff --git a/srcpkgs/chromium/patches/one_euro_filter.patch b/srcpkgs/chromium/patches/one_euro_filter.patch
new file mode 100644
index 00000000000..357babf1668
--- /dev/null
+++ b/srcpkgs/chromium/patches/one_euro_filter.patch
@@ -0,0 +1,11 @@
+--- third_party/one_euro_filter/src/one_euro_filter.h.orig 2019-09-29 21:21:03.958633609 -0400
++++ third_party/one_euro_filter/src/one_euro_filter.h 2019-09-29 21:21:54.128270940 -0400
+@@ -3,6 +3,8 @@
+
+ #include "low_pass_filter.h"
+
++#include <memory>
++
+ namespace one_euro_filter {
+ namespace test {
+ class OneEuroFilterTest;
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 6a35ada420d..304251bf6c9 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See http://www.chromium.org/developers/calendar for the latest version
-version=76.0.3809.132
+version=77.0.3865.90
revision=1
archs="i686 x86_64*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=d54e4640b5e399d170dffbc5bcff65157eb1b29314b94b5d808f727d9ce45241
+checksum=004cfdb1df74847bea8659bcaf8e039d51fe1101d42b6cf1c6cc346073fdefc3
lib32disabled=yes
nodebug=yes
@@ -246,7 +246,7 @@ do_install() {
vinstall out/Release/icudtl.dat 0644 usr/lib/chromium
- for size in 22 24 48 64 128 256; do
+ for size in 24 48 64 128 256; do
install -Dm644 "chrome/app/theme/chromium/product_logo_${size}.png" \
${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
done
From d7fca5d1f97b4e59905b2468c66490ccb789a740 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Sep 2019 20:24:50 -0400
Subject: [PATCH 2/2] chromium-widevine: update to 77.0.3865.90.
---
srcpkgs/chromium-widevine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index a8e074fd168..ed8edd483e5 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
_channel="stable"
pkgname=chromium-widevine
-version=75.0.3770.142
+version=77.0.3865.90
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -17,7 +17,7 @@ depends="chromium binutils xz"
homepage="https://www.google.com/chrome"
repository=nonfree
distfiles="https://dl.google.com/linux/direct/google-chrome-${_channel}_${_chromeVersion}_amd64.deb"
-checksum=8a39e922d9d0f12b79949efc46c22021f89a8207670fa9493a366ad8231b343f
+checksum=f443503c88164f018ddb88247d2824431efcb863935ae476f4ada6218f41fdda
do_extract() {
:
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 77.0.3865.90.
2019-10-01 0:05 [PR PATCH] chromium: update to 77.0.3865.90 voidlinux-github
@ 2019-10-01 0:24 ` voidlinux-github
2019-10-01 0:24 ` voidlinux-github
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-01 0:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 468 bytes --]
There is an updated pull request by pbui against master on the void-packages repository
https://github.com/pbui/void-packages chromium
https://github.com/void-linux/void-packages/pull/14862
chromium: update to 77.0.3865.90.
[ci skip]
- Update vaapi patch from Ubuntu/Debian patch.
- Add two build fix patches.
- Built for x86_64, x86_64-musl, i686
- Tested on x86_64
A patch file from https://github.com/void-linux/void-packages/pull/14862.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-14862.patch --]
[-- Type: text/x-diff, Size: 50785 bytes --]
From 135d998190f17e9e07460ebd48625d090f885e37 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Sep 2019 11:52:35 -0400
Subject: [PATCH 1/2] chromium: update to 77.0.3865.90.
[ci skip]
- Update vaapi patch from Ubuntu/Debian patch.
- Add two build fix patches.
- Built for x86_64, x86_64-musl, i686
- Tested on x86_64
---
.../files/musl-patches/no-mallinfo.patch | 12 +
.../patches/chromium-enable-vaapi.patch | 760 +++++++-----------
.../chromium/patches/harfbuzz-subset.patch | 49 ++
.../chromium/patches/linked-hash-set.patch | 130 +++
.../chromium/patches/one_euro_filter.patch | 11 +
srcpkgs/chromium/template | 6 +-
6 files changed, 516 insertions(+), 452 deletions(-)
create mode 100644 srcpkgs/chromium/patches/harfbuzz-subset.patch
create mode 100644 srcpkgs/chromium/patches/linked-hash-set.patch
create mode 100644 srcpkgs/chromium/patches/one_euro_filter.patch
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 461c90cb0af..288f8670c06 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -42,3 +42,15 @@ index 0eb5c1f..8af7799 100644
mi = ::mallinfo();
return mi.uordblks;
+--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400
++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400
+@@ -122,7 +122,9 @@
+ /* #undef HAVE_MALLCTL */
+
+ /* Define to 1 if you have the `mallinfo' function. */
++#if defined(__GLIBC__)
+ #define HAVE_MALLINFO 1
++#endif
+
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #define HAVE_MALLOC_H 1
diff --git a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
index d1cb7b4be59..01c253de5ff 100644
--- a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
+++ b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
@@ -1,165 +1,107 @@
---- chrome/browser/about_flags.cc.orig 2019-07-29 16:35:46.000000000 -0400
-+++ chrome/browser/about_flags.cc 2019-07-31 13:54:18.350186083 -0400
-@@ -1119,12 +1119,14 @@
- {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
- flag_descriptions::kUiPartialSwapDescription, kOsAll,
- SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
- flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
- {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
- flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
-+#endif
- #if !defined(OS_ANDROID)
- {"enable-reader-mode", flag_descriptions::kEnableReaderModeName,
- flag_descriptions::kEnableReaderModeDescription, kOsDesktop,
-@@ -1446,6 +1448,13 @@
- flag_descriptions::kEnableVirtualDesksDescription, kOsCrOS,
- FEATURE_VALUE_TYPE(ash::features::kVirtualDesks)},
- #endif // OS_CHROMEOS
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ {
-+ "enable-accelerated-video", flag_descriptions::kAcceleratedVideoName,
-+ flag_descriptions::kAcceleratedVideoDescription, kOsLinux,
-+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedVideo),
-+ },
-+#else
- {
+From 53b93dfe87fd10cced5d2a2a63072dfc7a2af6e4 Mon Sep 17 00:00:00 2001
+From: Daniel Charles <daniel.charles@intel.com>
+Date: Fri, 28 Jul 2017 16:31:47 -0700
+Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only
+
+This patch contains all the changes necessary to use VA-API along with
+vaapi-driver to run all media use cases supported with hardware acceleration.
+
+It is intended to remain as experimental accessible from chrome://flags on linux.
+It requires libva/intel-vaapi-driver to be installed on the system path where
+chrome is executed. Other drivers could be tested if available. Flags are
+kept independent for linux, where this feature has to be enabled before
+actually using it. This should not change how other OSes use the flags
+already, the new flags will show at the buttom on the section of unavailable
+experiments
+
+The changes cover a range of compiler pre-processor flags to enable the stack.
+It moves the presandbox operations to the vaapi_wrapper class as the hook function
+is available there. vaInit will open driver on the correct installed folder.
+
+chrome flags consolidtation into only two flags for linux. Mjpeg and accelerated
+video are used. The other flags are kept for ChromeOS and other OSes.
+
+Developer testing was made on skylake hardware, ChromeOS and Ubuntu.
+
+BUG=NONE
+TEST="subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder"
+TEST="and decoder hardware accelerated"
+TEST="have libva/intel-vaapi-driver installed and not installed in the system"
+TEST="repeat on different hardware families"
+R=posciak@chromium.org
+R=kcwu@chromium.org
+
+Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
+Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171
+Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+---
+
+Index: dev/chrome/browser/about_flags.cc
+===================================================================
+--- chrome/browser/about_flags.cc
++++ chrome/browser/about_flags.cc
+@@ -1527,7 +1527,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -1453,6 +1462,7 @@
- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
+ flag_descriptions::kAcceleratedVideoDecodeDescription,
+- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
++ kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
-+#endif
- {"enable-history-favicons-google-server-query",
- flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryName,
- flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryDescription,
-@@ -1883,7 +1892,12 @@
+ {
+@@ -1993,10 +1993,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
- #endif // ENABLE_ISOLATED_XR_SERVICE
+ #endif // !defined(OS_ANDROID)
#endif // ENABLE_VR
-#if defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ {"enable-accelerated-mjpeg-decode",
-+ flag_descriptions::kAcceleratedMjpegDecodeName,
-+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsLinux,
-+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedMjpegDecode)},
-+#elif defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
{"disable-accelerated-mjpeg-decode",
flag_descriptions::kAcceleratedMjpegDecodeName,
- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
---- chrome/browser/chromeos/login/chrome_restart_request.cc.orig 2019-07-29 16:35:47.000000000 -0400
-+++ chrome/browser/chromeos/login/chrome_restart_request.cc 2019-07-31 13:58:47.201085960 -0400
-@@ -20,6 +20,7 @@
- #include "base/system/sys_info.h"
- #include "base/timer/timer.h"
- #include "base/values.h"
-+#include "build/build_config.h"
- #include "cc/base/switches.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/chromeos/boot_times_recorder.h"
-@@ -84,9 +85,14 @@
- ::switches::kBlinkSettings,
- ::switches::kDisable2dCanvasImageChromium,
- ::switches::kDisableAccelerated2dCanvas,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ ::switches::kEnableAcceleratedMjpegDecode,
-+ ::switches::kEnableAcceleratedVideo,
-+#else
- ::switches::kDisableAcceleratedMjpegDecode,
- ::switches::kDisableAcceleratedVideoDecode,
- ::switches::kDisableAcceleratedVideoEncode,
-+#endif
- ::switches::kDisableBlinkFeatures,
- ::switches::kDisableGpu,
- ::switches::kDisableGpuMemoryBufferVideoFrames,
-@@ -158,8 +164,10 @@
- ::switches::kEnableWebGLImageChromium,
- ::switches::kEnableWebVR,
- ::switches::kEnableUnsafeWebGPU,
-+#if (defined(OS_CHROMEOS) || defined(OS_ANDROID))
- ::switches::kDisableWebRtcHWDecoding,
- ::switches::kDisableWebRtcHWEncoding,
-+#endif
- ::switches::kOzonePlatform,
- ash::switches::kAshEnableTabletMode,
- ash::switches::kAshEnableWaylandServer,
-diff -ur chrome/browser/flag_descriptions.cc chromium-69.0.3497.92/chrome/browser/flag_descriptions.cc
---- chrome/browser/flag_descriptions.cc.orig 2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.cc 2019-07-02 12:27:47.137866754 -0400
-@@ -14,6 +14,13 @@
- "Enables the use of the GPU to perform 2d canvas rendering instead of "
- "using software rendering.";
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+const char kAcceleratedVideoName[] = "Hardware-accelerated video";
-+const char kAcceleratedVideoDescription[] =
-+ "Hardware-accelerated video where VA-API driver is installed on the"
-+ "system.";
-+#endif
-+
- const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
- const char kAcceleratedVideoDecodeDescription[] =
- "Hardware-accelerated video decode where available.";
-@@ -2081,6 +2088,7 @@
- const char kWebrtcHybridAgcDescription[] =
- "WebRTC Agc2 digital adaptation with Agc1 analog adaptation.";
-
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
- const char kWebrtcHwDecodingDescription[] =
- "Support in WebRTC for decoding video streams using platform hardware.";
-@@ -2088,6 +2096,7 @@
- const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
- const char kWebrtcHwEncodingDescription[] =
- "Support in WebRTC for encoding video streams using platform hardware.";
-+#endif
-
- const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
- const char kWebrtcHwH264EncodingDescription[] =
-@@ -2943,14 +2952,16 @@
+- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
++ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
+ SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
+ #endif // OS_CHROMEOS
+ {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
+Index: dev/chrome/browser/flag_descriptions.cc
+===================================================================
+--- chrome/browser/flag_descriptions.cc
++++ chrome/browser/flag_descriptions.cc
+@@ -2880,9 +2880,7 @@ const char kMacSystemMediaPermissionsInf
- // Chrome OS -------------------------------------------------------------------
+ #endif
+-// Chrome OS -------------------------------------------------------------------
+-
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
- const char kAcceleratedMjpegDecodeDescription[] =
+@@ -2890,6 +2888,12 @@ const char kAcceleratedMjpegDecodeDescri
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
-+#endif
++#endif
++
++// Chrome OS -------------------------------------------------------------------
++
+#if defined(OS_CHROMEOS)
++
const char kAppServiceAshName[] = "App Service Ash";
const char kAppServiceAshDescription[] =
"Use the App Service to provide data to the Ash UI, such as the shelf and "
-diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser/flag_descriptions.h
---- chrome/browser/flag_descriptions.h.orig 2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.h 2019-07-02 12:29:46.200214795 -0400
-@@ -43,6 +43,10 @@
- extern const char kAccelerated2dCanvasName[];
- extern const char kAccelerated2dCanvasDescription[];
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+extern const char kAcceleratedVideoName[];
-+extern const char kAcceleratedVideoDescription[];
-+#endif
- extern const char kAcceleratedVideoDecodeName[];
- extern const char kAcceleratedVideoDecodeDescription[];
-
-@@ -1765,13 +1769,17 @@
+Index: dev/chrome/browser/flag_descriptions.h
+===================================================================
+--- chrome/browser/flag_descriptions.h
++++ chrome/browser/flag_descriptions.h
+@@ -1715,13 +1715,17 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)
-// Chrome OS ------------------------------------------------------------------
-
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
@@ -173,234 +115,32 @@ diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser
extern const char kAppServiceAshName[];
extern const char kAppServiceAshDescription[];
-diff -ur content/browser/gpu/compositor_util.cc chromium-69.0.3497.92/content/browser/gpu/compositor_util.cc
---- content/browser/gpu/compositor_util.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/gpu/compositor_util.cc 2018-09-13 22:10:34.072012092 +0530
-@@ -149,7 +149,11 @@
- {"video_decode",
- SafeGetFeatureStatus(gpu_feature_info,
- gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ !command_line.HasSwitch(switches::kEnableAcceleratedVideo),
-+#else
- command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
-+#endif
- "Accelerated video decode has been disabled, either via blacklist, "
- "about:flags or the command line.",
- true, true},
---- content/browser/gpu/gpu_process_host.cc.orig 2019-07-31 14:16:52.304849119 -0400
-+++ content/browser/gpu/gpu_process_host.cc 2019-07-31 14:19:22.567480008 -0400
-@@ -208,7 +208,9 @@
- switches::kDisableLogging,
- switches::kDisableShaderNameHashing,
- switches::kDisableSkiaRuntimeOpts,
-+#if !defined(OS_LINUX)
- switches::kDisableWebRtcHWEncoding,
-+#endif
- switches::kEnableGpuRasterization,
- switches::kEnableLogging,
- switches::kEnableVizDevTools,
-diff -ur content/browser/renderer_host/media/video_capture_browsertest.cc chromium-69.0.3497.92/content/browser/renderer_host/media/video_capture_browsertest.cc
---- content/browser/renderer_host/media/video_capture_browsertest.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/renderer_host/media/video_capture_browsertest.cc 2018-09-13 22:10:34.124010499 +0530
-@@ -165,8 +165,13 @@
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kUseFakeJpegDecodeAccelerator);
- } else {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
-+ switches::kEnableAcceleratedMjpegDecode);
-+#else
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kDisableAcceleratedMjpegDecode);
-+#endif
- }
- }
-
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-07-29 16:36:09.000000000 -0400
-+++ content/browser/renderer_host/render_process_host_impl.cc 2019-07-31 14:04:18.859680348 -0400
-@@ -2937,7 +2937,11 @@
- switches::kDefaultTileHeight,
- switches::kDisable2dCanvasImageChromium,
- switches::kDisableYUVImageDecoding,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ switches::kEnableAcceleratedVideo,
-+#else
- switches::kDisableAcceleratedVideoDecode,
-+#endif
- switches::kDisableBackgroundTimerThrottling,
- switches::kDisableBestEffortTasks,
- switches::kDisableBreakpad,
-@@ -3077,8 +3081,10 @@
- #if BUILDFLAG(ENABLE_PLUGINS)
- switches::kEnablePepperTesting,
- #endif
-+#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
- switches::kDisableWebRtcHWDecoding,
- switches::kDisableWebRtcHWEncoding,
-+#endif
- switches::kEnableWebRtcSrtpAesGcm,
- switches::kEnableWebRtcSrtpEncryptedHeaders,
- switches::kEnableWebRtcStunOrigin,
-diff -ur content/browser/utility_process_host.cc chromium-69.0.3497.92/content/browser/utility_process_host.cc
---- content/browser/utility_process_host.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/utility_process_host.cc 2018-09-13 22:10:34.296005227 +0530
-@@ -296,7 +296,11 @@
- switches::kOverrideUseSoftwareGLForTests,
- switches::kOverrideEnabledCdmInterfaceVersion,
- switches::kProxyServer,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ switches::kEnableAcceleratedMjpegDecode,
-+#else
- switches::kDisableAcceleratedMjpegDecode,
-+#endif
- switches::kUseFakeDeviceForMediaStream,
- switches::kUseFakeJpegDecodeAccelerator,
- switches::kUseFileForFakeVideoCapture,
-diff -ur content/browser/webrtc/webrtc_media_recorder_browsertest.cc chromium-69.0.3497.92/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
---- content/browser/webrtc/webrtc_media_recorder_browsertest.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/webrtc/webrtc_media_recorder_browsertest.cc 2018-09-13 22:10:34.143009916 +0530
-@@ -66,7 +66,12 @@
- return;
- // This flag is also used for encoding, https://crbug.com/616640.
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
-- switches::kDisableAcceleratedVideoDecode);
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ switches::kEnableAcceleratedVideo
-+#else
-+ switches::kDisableAcceleratedVideoDecode
-+#endif
-+ );
- }
-
- private:
-diff -ur content/gpu/BUILD.gn chromium-69.0.3497.92/content/gpu/BUILD.gn
---- content/gpu/BUILD.gn 2018-09-12 00:39:41.000000000 +0530
-+++ content/gpu/BUILD.gn 2018-09-13 22:10:34.148009763 +0530
-@@ -133,4 +133,8 @@
+Index: dev/content/gpu/BUILD.gn
+===================================================================
+--- content/gpu/BUILD.gn
++++ content/gpu/BUILD.gn
+@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
+ import("//build/config/ui.gni")
+ import("//gpu/vulkan/features.gni")
+ import("//media/media_options.gni")
++import("//media/gpu/args.gni")
+ import("//ui/ozone/ozone.gni")
+
+ # See //content/BUILD.gn for how this works.
+@@ -128,4 +129,8 @@ target(link_target_type, "gpu_sources")
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
+
-+ if (is_desktop_linux) {
-+ public_configs = [ "//media/gpu:libva_config" ]
++ if (is_desktop_linux && use_vaapi) {
++ public_configs = [ "//build/config/linux/libva" ]
+ }
}
-diff -ur content/gpu/gpu_main.cc chromium-69.0.3497.92/content/gpu/gpu_main.cc
---- content/gpu/gpu_main.cc 2019-07-02 09:50:13.403486804 -0400
-+++ content/gpu/gpu_main.cc 2019-07-02 09:55:07.256818723 -0400
-@@ -288,7 +288,7 @@
-
- base::PlatformThread::SetName("CrGpuMain");
-
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
- // Set thread priority before sandbox initialization.
- base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
- #endif
-@@ -321,7 +321,7 @@
- GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
-
- base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
- io_thread_priority = base::ThreadPriority::DISPLAY;
- #endif
-
-diff -ur content/public/browser/gpu_utils.cc chromium-69.0.3497.92/content/public/browser/gpu_utils.cc
---- content/public/browser/gpu_utils.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/browser/gpu_utils.cc 2018-09-13 22:10:34.164009273 +0530
-@@ -57,9 +57,17 @@
- gpu_preferences.in_process_gpu =
- command_line->HasSwitch(switches::kInProcessGPU);
- gpu_preferences.disable_accelerated_video_decode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
- command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
-+#endif
- gpu_preferences.disable_accelerated_video_encode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
- command_line->HasSwitch(switches::kDisableAcceleratedVideoEncode);
-+#endif
- #if defined(OS_WIN)
- uint32_t enable_accelerated_vpx_decode_val =
- gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
-diff -ur content/public/common/content_switches.cc chromium-69.0.3497.92/content/public/common/content_switches.cc
---- content/public/common/content_switches.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.cc 2018-09-13 22:10:34.172009028 +0530
-@@ -79,6 +79,11 @@
- // Disable gpu-accelerated 2d canvas.
- const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas";
-
-+#if defined(OS_LINUX)
-+// Enables hardware acceleration of video for Linux only. VA-API driver
-+// is required to be present on the system installation.
-+const char kEnableAcceleratedVideo[] = "enable-accelerated-video";
-+#endif
- // Disables hardware acceleration of video decode, where available.
- const char kDisableAcceleratedVideoDecode[] =
- "disable-accelerated-video-decode";
-@@ -868,11 +873,13 @@
- // ignores this switch on its stable and beta channels.
- const char kDisableWebRtcEncryption[] = "disable-webrtc-encryption";
-
-+#if defined(OS_CHROMEOS)
- // Disables HW decode acceleration for WebRTC.
- const char kDisableWebRtcHWDecoding[] = "disable-webrtc-hw-decoding";
-
- // Disables HW encode acceleration for WebRTC.
- const char kDisableWebRtcHWEncoding[] = "disable-webrtc-hw-encoding";
-+#endif
-
- // Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC.
- // See https://tools.ietf.org/html/rfc7714 for further information.
-diff -ur content/public/common/content_switches.h chromium-69.0.3497.92/content/public/common/content_switches.h
---- content/public/common/content_switches.h 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.h 2018-09-13 22:10:34.172009028 +0530
-@@ -104,6 +104,9 @@
- CONTENT_EXPORT extern const char kDomAutomationController[];
- extern const char kDisable2dCanvasClipAntialiasing[];
- CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+CONTENT_EXPORT extern const char kEnableAcceleratedVideo[];
-+#endif
- CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[];
- CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
- CONTENT_EXPORT extern const char kEnableAutomation[];
-@@ -241,8 +244,10 @@
- CONTENT_EXPORT extern const char kWaitForDebuggerChildren[];
-
- CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
-+#if defined(OS_CHROMEOS)
- CONTENT_EXPORT extern const char kDisableWebRtcHWDecoding[];
- CONTENT_EXPORT extern const char kDisableWebRtcHWEncoding[];
-+#endif
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
- CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
-diff -ur content/renderer/render_thread_impl.cc chromium-69.0.3497.92/content/renderer/render_thread_impl.cc
---- content/renderer/render_thread_impl.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/renderer/render_thread_impl.cc 2018-09-13 22:10:34.192008415 +0530
-@@ -1441,7 +1441,11 @@
- kGpuStreamPriorityMedia);
-
- const bool enable_video_accelerator =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ cmd_line->HasSwitch(switches::kEnableAcceleratedVideo) &&
-+#else
- !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-+#endif
- (gpu_channel_host->gpu_feature_info()
- .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
- gpu::kGpuFeatureStatusEnabled);
-Only in content/renderer: render_thread_impl.cc.orig
-diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/config/software_rendering_list.json
---- gpu/config/software_rendering_list.json 2018-09-12 00:39:44.000000000 +0530
-+++ gpu/config/software_rendering_list.json 2018-09-13 22:10:34.193008384 +0530
-@@ -377,17 +377,6 @@
+Index: dev/gpu/config/software_rendering_list.json
+===================================================================
+--- gpu/config/software_rendering_list.json
++++ gpu/config/software_rendering_list.json
+@@ -369,17 +369,6 @@
]
},
{
@@ -418,119 +158,241 @@ diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/confi
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
"cr_bugs": [145531, 332596, 571899, 629434],
-diff -ur media/base/media_switches.cc chromium-69.0.3497.92/media/base/media_switches.cc
---- media/base/media_switches.cc.orig 2019-06-18 11:48:14.000000000 -0400
-+++ media/base/media_switches.cc 2019-07-02 12:32:22.370983036 -0400
-@@ -103,10 +103,15 @@
- const char kUseFakeMjpegDecodeAccelerator[] =
- "use-fake-mjpeg-decode-accelerator";
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+// Enable hardware accelerated mjpeg decode on linux
-+const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode";
-+#else
- // Disable hardware acceleration of mjpeg decode for captured frame, where
- // available.
- const char kDisableAcceleratedMjpegDecode[] =
- "disable-accelerated-mjpeg-decode";
-+#endif
-
- // When running tests on a system without the required hardware or libraries,
- // this flag will cause the tests to fail. Otherwise, they silently succeed.
-@@ -503,15 +508,21 @@
- };
-
- bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-+ switches::kEnableAcceleratedMjpegDecode)
-+#else
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-- switches::kDisableAcceleratedMjpegDecode)) {
-+ switches::kDisableAcceleratedMjpegDecode)
-+#endif
-+ ) {
- return false;
- }
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+Index: dev/media/base/media_switches.cc
+===================================================================
+--- media/base/media_switches.cc
++++ media/base/media_switches.cc
+@@ -544,7 +544,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
switches::kUseFakeMjpegDecodeAccelerator)) {
return true;
}
-#if defined(OS_CHROMEOS)
-+#if !defined(OS_ANDROID) && defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
return true;
#endif
return false;
-diff -ur media/base/media_switches.h chromium-69.0.3497.92/media/base/media_switches.h
---- media/base/media_switches.h.orig 2019-07-02 12:20:39.902984488 -0400
-+++ media/base/media_switches.h 2019-07-02 12:33:45.441923602 -0400
-@@ -60,7 +60,11 @@
- MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
- MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[];
- MEDIA_EXPORT extern const char kUseFakeMjpegDecodeAccelerator[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+MEDIA_EXPORT extern const char kEnableAcceleratedMjpegDecode[];
-+#else
- MEDIA_EXPORT extern const char kDisableAcceleratedMjpegDecode[];
-+#endif
-
- MEDIA_EXPORT extern const char kRequireAudioHardwareForTesting[];
- MEDIA_EXPORT extern const char kMuteAudio[];
---- media/gpu/BUILD.gn.orig 2019-07-29 16:36:19.000000000 -0400
-+++ media/gpu/BUILD.gn 2019-07-31 14:09:28.093032826 -0400
-@@ -495,6 +495,14 @@
+Index: dev/media/filters/BUILD.gn
+===================================================================
+--- media/filters/BUILD.gn
++++ media/filters/BUILD.gn
+@@ -5,6 +5,7 @@
+ import("//build/config/jumbo.gni")
+ import("//media/media_options.gni")
+ import("//third_party/libaom/options.gni")
++import("//media/gpu/args.gni")
+
+ jumbo_source_set("filters") {
+ # Do not expand the visibility here without double-checking with OWNERS, this
+@@ -196,7 +197,7 @@ jumbo_source_set("filters") {
+ deps += [ "//media/base/android" ]
}
- }
-+if (is_desktop_linux && use_vaapi) {
-+ import("//build/config/linux/pkg_config.gni")
-+
-+ pkg_config("libva_config") {
-+ packages = [ "libva" ]
-+ }
-+}
-+
- if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
- test("video_encode_accelerator_unittest") {
- deps = [
-@@ -525,6 +533,10 @@
+- if (current_cpu != "arm" && is_linux) {
++ if (use_vaapi) {
+ sources += [
+ "h264_bitstream_buffer.cc",
+ "h264_bitstream_buffer.h",
+Index: dev/media/gpu/BUILD.gn
+===================================================================
+--- media/gpu/BUILD.gn
++++ media/gpu/BUILD.gn
+@@ -531,6 +531,7 @@ if (use_v4l2_codec || use_vaapi || is_ma
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
-+
-+ if (is_desktop_linux) {
-+ public_configs = [ ":libva_config" ]
-+ }
++ public_configs = [ "//build/config/linux/libva" ]
}
}
---- content/renderer/media/webrtc/video_codec_factory.cc.orig 2019-07-02 16:39:57.973241977 -0400
-+++ content/renderer/media/webrtc/video_codec_factory.cc 2019-07-02 17:00:00.656342711 -0400
-@@ -187,8 +187,11 @@
- std::unique_ptr<webrtc::VideoEncoderFactory> encoder_factory;
+Index: dev/media/gpu/gpu_video_decode_accelerator_factory.cc
+===================================================================
+--- media/gpu/gpu_video_decode_accelerator_factory.cc
++++ media/gpu/gpu_video_decode_accelerator_factory.cc
+@@ -171,6 +171,8 @@ GpuVideoDecodeAcceleratorFactory::Create
+ vda = (this->*create_vda_function)(workarounds, gpu_preferences, media_log);
+ if (vda && vda->Initialize(config, client))
+ return vda;
++ else
++ LOG(ERROR) << "Initialization of one or more VDAs failed.";
+ }
- const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-- if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
-- !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
-+ if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()
-+#if defined(OS_CHROMEOS)
-+ && !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)
+ return nullptr;
+@@ -229,6 +231,7 @@ GpuVideoDecodeAcceleratorFactory::Create
+ const gpu::GpuDriverBugWorkarounds& workarounds,
+ const gpu::GpuPreferences& gpu_preferences,
+ MediaLog* media_log) const {
++ LOG(WARNING) << "Initializing VAAPI VDA.";
+ std::unique_ptr<VideoDecodeAccelerator> decoder;
+ decoder.reset(new VaapiVideoDecodeAccelerator(make_context_current_cb_,
+ bind_image_cb_));
+Index: dev/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/ipc/service/gpu_video_decode_accelerator.cc
++++ media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+@@ -380,6 +380,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+ LOG(ERROR) << "Failed creating the VDA factory";
+ return false;
+ }
++ LOG(WARNING) << "Created the VDA factory";
+
+ const gpu::GpuDriverBugWorkarounds& gpu_workarounds =
+ stub_->channel()->gpu_channel_manager()->gpu_driver_bug_workarounds();
+@@ -393,6 +394,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+ << (config.is_encrypted() ? " with encryption" : "");
+ return false;
+ }
++ LOG(WARNING) << "Created VDA";
+
+ // Attempt to set up performing decoding tasks on IO thread, if supported by
+ // the VDA.
+Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_video_decode_accelerator.cc
++++ media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+@@ -64,6 +64,7 @@ void ReportToUMA(VAVDADecoderFailure fai
+ VAVDA_DECODER_FAILURES_MAX + 1);
+ }
+
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
+ // Lake) Cpu platform id's are referenced from the following file in kernel
+ // source arch/x86/include/asm/intel-family.h
+@@ -76,6 +77,7 @@ bool IsGeminiLakeOrLater() {
+ cpuid.model() >= kGeminiLakeModelId;
+ return is_geminilake_or_later;
+ }
+#endif
-+ ) {
- encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
+
+ } // namespace
+
+@@ -632,6 +634,10 @@ void VaapiVideoDecodeAccelerator::Assign
+ va_surface_format_ = GetVaFormatForVideoCodecProfile(profile_);
+ std::vector<VASurfaceID> va_surface_ids;
+
++ // Nvidia doesn't support VAProfileNone, so don't try to create a temporary
++ // copy buffer there. It's not needed anyways for hardware video decoding
++ // to work.
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // If we aren't in BufferAllocationMode::kNone, we have to allocate a
+ // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
+ // internal decoded frame.
+@@ -645,15 +651,20 @@ void VaapiVideoDecodeAccelerator::Assign
+ NotifyError(PLATFORM_FAILURE);
+ }
}
++#endif
-@@ -205,8 +208,11 @@
- std::unique_ptr<webrtc::VideoDecoderFactory> decoder_factory;
+ for (size_t i = 0; i < buffers.size(); ++i) {
+ // If we aren't in BufferAllocationMode::kNone, this |picture| is
+ // only used as a copy destination. Therefore, the VaapiWrapper used and
+ // owned by |picture| is |vpp_vaapi_wrapper_|.
+ std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++ vaapi_wrapper_,
++#else
+ (buffer_allocation_mode_ == BufferAllocationMode::kNone)
+ ? vaapi_wrapper_
+ : vpp_vaapi_wrapper_,
++#endif
+ make_context_current_cb_, bind_image_cb_, buffers[i]);
+ RETURN_AND_NOTIFY_ON_FAILURE(picture, "Failed creating a VaapiPicture",
+ PLATFORM_FAILURE, );
+@@ -1078,6 +1089,9 @@ VaapiVideoDecodeAccelerator::GetSupporte
+
+ VaapiVideoDecodeAccelerator::BufferAllocationMode
+ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++ return BufferAllocationMode::kNormal;
++#else
+ // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
+ // |output_mode_| as well.
+ if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
+@@ -1113,6 +1127,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+ return BufferAllocationMode::kReduced;
- const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-- if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
-- !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)) {
-+ if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()
-+#if defined(OS_CHROMEOS)
-+ && !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)
+ return BufferAllocationMode::kSuperReduced;
+#endif
-+ ) {
- decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
+ }
+
+ bool VaapiVideoDecodeAccelerator::IsBufferAllocationModeReducedOrSuperReduced()
+Index: dev/media/gpu/vaapi/vaapi_wrapper.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_wrapper.cc
++++ media/gpu/vaapi/vaapi_wrapper.cc
+@@ -324,6 +324,11 @@ void VADisplayState::PreSandboxInitializ
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+ if (drm_file.IsValid())
+ VADisplayState::Get()->SetDrmFd(drm_file.GetPlatformFile());
++
++ const char kNvidiaPath[] = "/dev/dri/nvidiactl";
++ base::File nvidia_file = base::File(
++ base::FilePath::FromUTF8Unsafe(kNvidiaPath),
++ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+ }
+
+ VADisplayState::VADisplayState()
+@@ -351,10 +356,6 @@ bool VADisplayState::Initialize() {
+ }
+
+ bool VADisplayState::InitializeOnce() {
+- static_assert(
+- VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
+- "Requires VA-API >= 1.1.0");
+-
+ switch (gl::GetGLImplementation()) {
+ case gl::kGLImplementationEGLGLES2:
+ va_display_ = vaGetDisplayDRM(drm_fd_.get());
+@@ -362,10 +363,10 @@ bool VADisplayState::InitializeOnce() {
+ case gl::kGLImplementationDesktopGL:
+ #if defined(USE_X11)
+ va_display_ = vaGetDisplay(gfx::GetXDisplay());
+-#else
+- LOG(WARNING) << "VAAPI video acceleration not available without "
+- "DesktopGL (GLX).";
++ if (vaDisplayIsValid(va_display_))
++ break;
+ #endif // USE_X11
++ va_display_ = vaGetDisplayDRM(drm_fd_.get());
+ break;
+ // Cannot infer platform from GL, try all available displays
+ case gl::kGLImplementationNone:
+@@ -398,8 +399,19 @@ bool VADisplayState::InitializeOnce() {
+ int major_version, minor_version;
+ VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
+ if (va_res != VA_STATUS_SUCCESS) {
+- LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res);
+- return false;
++ LOG(ERROR) << "vaInitialize failed (ignore if using Wayland desktop environment): " << vaErrorStr(va_res);
++ va_display_ = vaGetDisplayDRM(drm_fd_.get());
++ if (!vaDisplayIsValid(va_display_)) {
++ LOG(ERROR) << "Could not get a valid DRM VA display";
++ return false;
++ }
++ va_res = vaInitialize(va_display_, &major_version, &minor_version);
++ if (va_res != VA_STATUS_SUCCESS) {
++ LOG(ERROR) << "vaInitialize failed using DRM: " << vaErrorStr(va_res);
++ return false;
++ } else {
++ LOG(WARNING) << "vaInitialize succeeded for DRM";
++ }
}
+ va_initialized_ = true;
+@@ -407,7 +419,7 @@ bool VADisplayState::InitializeOnce() {
+ va_vendor_string_ = vaQueryVendorString(va_display_);
+ DLOG_IF(WARNING, va_vendor_string_.empty())
+ << "Vendor string empty or error reading.";
+- DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
++ VLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
+ << va_vendor_string_;
+
+ // The VAAPI version is determined from what is loaded on the system by
+@@ -742,7 +754,7 @@ bool VASupportedProfiles::AreAttribsSupp
+ 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
++ VLOG(1) << "Unsupported value " << required_attribs[i].value
+ << " for attribute type " << required_attribs[i].type;
+ return false;
+ }
diff --git a/srcpkgs/chromium/patches/harfbuzz-subset.patch b/srcpkgs/chromium/patches/harfbuzz-subset.patch
new file mode 100644
index 00000000000..6f228b774d4
--- /dev/null
+++ b/srcpkgs/chromium/patches/harfbuzz-subset.patch
@@ -0,0 +1,49 @@
+From 27e25336b8316ff3ec4e464058682ed85801fd06 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Mon, 29 Jul 2019 10:54:28 +0000
+Subject: [PATCH] Also link against libharfbuzz-subset when use_system_harfbuzz is true
+
+When building HarfBuzz as part of Chromium, there is a single source set
+with all the files we need in the build.
+
+Upstream HarfBuzz, on the other hand, produces a few different libraries:
+harfbuzz, harfbuzz-icu and harfbuzz-subset. When |use_system_harfbuzz| is
+true, we were only looking for (and using) harfbuzz.pc with pkg-config even
+though we also use symbols from libharfbuzz-subset.so. This resulted in
+errors when linking:
+
+ ld: obj/skia/skia/SkPDFSubsetFont.o: in function `SkPDFSubsetFont(sk_sp<SkData>, SkPDFGlyphUse const&, SkPDF::Metadata::Subsetter, char const*, int)':
+ SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x48a): undefined reference to `hb_subset_input_create_or_fail'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x4af): undefined reference to `hb_subset_input_glyph_set'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5d7): undefined reference to `hb_subset_input_set_retain_gids'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5e4): undefined reference to `hb_subset_input_set_drop_hints'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5f3): undefined reference to `hb_subset'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x66f): undefined reference to `hb_subset_input_destroy'
+
+as reported in
+https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ
+
+Change-Id: I997af075c7b7263cd7cc71a63db5b0f93bd1ab59
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715288
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Commit-Queue: Dominik Röttsches <drott@chromium.org>
+Reviewed-by: Dominik Röttsches <drott@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#681760}
+---
+
+diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
+index 37d8e33..72013eb1d 100644
+--- third_party/harfbuzz-ng/BUILD.gn
++++ third_party/harfbuzz-ng/BUILD.gn
+@@ -16,7 +16,10 @@
+ "//third_party:freetype_harfbuzz",
+ "//third_party/freetype:freetype_source",
+ ]
+- packages = [ "harfbuzz" ]
++ packages = [
++ "harfbuzz",
++ "harfbuzz-subset",
++ ]
+ }
+ } else {
+ config("harfbuzz_config") {
diff --git a/srcpkgs/chromium/patches/linked-hash-set.patch b/srcpkgs/chromium/patches/linked-hash-set.patch
new file mode 100644
index 00000000000..24b13d8a5c0
--- /dev/null
+++ b/srcpkgs/chromium/patches/linked-hash-set.patch
@@ -0,0 +1,130 @@
+From 74138b9febd37eac0fc26b8efb110014a83a52c6 Mon Sep 17 00:00:00 2001
+From: Jeremy Roman <jbroman@chromium.org>
+Date: Wed, 07 Aug 2019 13:26:48 +0000
+Subject: [PATCH] WTF: Make LinkedHashSet understand values for which memset initialization would be bad.
+
+Includes a unit test which fails before, and uses this to fix FontCacheKeyTraits.
+
+Bug: 980025
+Change-Id: If41f97444c7fd37b9b95d6dadaf3da5689079e9e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739948
+Reviewed-by: Kentaro Hara <haraken@chromium.org>
+Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
+Commit-Queue: Jeremy Roman <jbroman@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#684731}
+---
+
+diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h b/third_party/blink/renderer/platform/fonts/font_cache_key.h
+index 0efc8fb..90063cb 100644
+--- third_party/blink/renderer/platform/fonts/font_cache_key.h
++++ third_party/blink/renderer/platform/fonts/font_cache_key.h
+@@ -133,6 +133,10 @@
+
+ struct FontCacheKeyTraits : WTF::SimpleClassHashTraits<FontCacheKey> {
+ STATIC_ONLY(FontCacheKeyTraits);
++
++ // std::string's empty state need not be zero in all implementations,
++ // and it is held within FontFaceCreationParams.
++ static const bool kEmptyValueIsZero = false;
+ };
+
+ } // namespace blink
+diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
+index b35b6e9..77e524c 100644
+--- third_party/blink/renderer/platform/wtf/linked_hash_set.h
++++ third_party/blink/renderer/platform/wtf/linked_hash_set.h
+@@ -146,6 +146,11 @@
+ LinkedHashSetNodeBase* next)
+ : LinkedHashSetNodeBase(prev, next), value_(value) {}
+
++ LinkedHashSetNode(ValueArg&& value,
++ LinkedHashSetNodeBase* prev,
++ LinkedHashSetNodeBase* next)
++ : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {}
++
+ LinkedHashSetNode(LinkedHashSetNode&& other)
+ : LinkedHashSetNodeBase(std::move(other)),
+ value_(std::move(other.value_)) {}
+@@ -445,10 +450,13 @@
+
+ // The slot is empty when the next_ field is zero so it's safe to zero
+ // the backing.
+- static const bool kEmptyValueIsZero = true;
++ static const bool kEmptyValueIsZero = ValueTraits::kEmptyValueIsZero;
+
+ static const bool kHasIsEmptyValueFunction = true;
+ static bool IsEmptyValue(const Node& node) { return !node.next_; }
++ static Node EmptyValue() {
++ return Node(ValueTraits::EmptyValue(), nullptr, nullptr);
++ }
+
+ static const int kDeletedValue = -1;
+
+diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+index 4c3f899..cd1be00 100644
+--- third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
++++ third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+@@ -487,6 +487,7 @@
+ };
+
+ struct Complicated {
++ Complicated() : Complicated(0) {}
+ Complicated(int value) : simple_(value) { objects_constructed_++; }
+
+ Complicated(const Complicated& other) : simple_(other.simple_) {
+@@ -495,9 +496,6 @@
+
+ Simple simple_;
+ static int objects_constructed_;
+-
+- private:
+- Complicated() = delete;
+ };
+
+ int Complicated::objects_constructed_ = 0;
+@@ -731,4 +729,45 @@
+
+ } // anonymous namespace
+
++// A unit type which objects to its state being initialized wrong.
++struct InvalidZeroValue {
++ InvalidZeroValue() = default;
++ InvalidZeroValue(WTF::HashTableDeletedValueType) : deleted_(true) {}
++ ~InvalidZeroValue() { CHECK(ok_); }
++ bool IsHashTableDeletedValue() const { return deleted_; }
++
++ bool ok_ = true;
++ bool deleted_ = false;
++};
++
++template <>
++struct HashTraits<InvalidZeroValue> : SimpleClassHashTraits<InvalidZeroValue> {
++ static const bool kEmptyValueIsZero = false;
++};
++
++template <>
++struct DefaultHash<InvalidZeroValue> {
++ struct Hash {
++ static unsigned GetHash(const InvalidZeroValue&) { return 0; }
++ static bool Equal(const InvalidZeroValue&, const InvalidZeroValue&) {
++ return true;
++ }
++ };
++};
++
++template <typename Set>
++class ListOrLinkedHashSetInvalidZeroTest : public testing::Test {};
++
++using InvalidZeroValueSetTypes =
++ testing::Types<ListHashSet<InvalidZeroValue>,
++ ListHashSet<InvalidZeroValue, 1>,
++ LinkedHashSet<InvalidZeroValue>>;
++TYPED_TEST_SUITE(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValueSetTypes);
++
++TYPED_TEST(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValue) {
++ using Set = TypeParam;
++ Set set;
++ set.insert(InvalidZeroValue());
++}
++
+ } // namespace WTF
diff --git a/srcpkgs/chromium/patches/one_euro_filter.patch b/srcpkgs/chromium/patches/one_euro_filter.patch
new file mode 100644
index 00000000000..357babf1668
--- /dev/null
+++ b/srcpkgs/chromium/patches/one_euro_filter.patch
@@ -0,0 +1,11 @@
+--- third_party/one_euro_filter/src/one_euro_filter.h.orig 2019-09-29 21:21:03.958633609 -0400
++++ third_party/one_euro_filter/src/one_euro_filter.h 2019-09-29 21:21:54.128270940 -0400
+@@ -3,6 +3,8 @@
+
+ #include "low_pass_filter.h"
+
++#include <memory>
++
+ namespace one_euro_filter {
+ namespace test {
+ class OneEuroFilterTest;
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 6a35ada420d..304251bf6c9 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See http://www.chromium.org/developers/calendar for the latest version
-version=76.0.3809.132
+version=77.0.3865.90
revision=1
archs="i686 x86_64*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=d54e4640b5e399d170dffbc5bcff65157eb1b29314b94b5d808f727d9ce45241
+checksum=004cfdb1df74847bea8659bcaf8e039d51fe1101d42b6cf1c6cc346073fdefc3
lib32disabled=yes
nodebug=yes
@@ -246,7 +246,7 @@ do_install() {
vinstall out/Release/icudtl.dat 0644 usr/lib/chromium
- for size in 22 24 48 64 128 256; do
+ for size in 24 48 64 128 256; do
install -Dm644 "chrome/app/theme/chromium/product_logo_${size}.png" \
${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
done
From d7fca5d1f97b4e59905b2468c66490ccb789a740 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Sep 2019 20:24:50 -0400
Subject: [PATCH 2/2] chromium-widevine: update to 77.0.3865.90.
---
srcpkgs/chromium-widevine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index a8e074fd168..ed8edd483e5 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
_channel="stable"
pkgname=chromium-widevine
-version=75.0.3770.142
+version=77.0.3865.90
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -17,7 +17,7 @@ depends="chromium binutils xz"
homepage="https://www.google.com/chrome"
repository=nonfree
distfiles="https://dl.google.com/linux/direct/google-chrome-${_channel}_${_chromeVersion}_amd64.deb"
-checksum=8a39e922d9d0f12b79949efc46c22021f89a8207670fa9493a366ad8231b343f
+checksum=f443503c88164f018ddb88247d2824431efcb863935ae476f4ada6218f41fdda
do_extract() {
:
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 77.0.3865.90.
2019-10-01 0:05 [PR PATCH] chromium: update to 77.0.3865.90 voidlinux-github
2019-10-01 0:24 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-01 0:24 ` voidlinux-github
@ 2019-10-01 0:26 ` voidlinux-github
2019-10-01 0:26 ` voidlinux-github
2019-10-01 19:42 ` [PR PATCH] [Merged]: " voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-01 0:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 468 bytes --]
There is an updated pull request by pbui against master on the void-packages repository
https://github.com/pbui/void-packages chromium
https://github.com/void-linux/void-packages/pull/14862
chromium: update to 77.0.3865.90.
[ci skip]
- Update vaapi patch from Ubuntu/Debian patch.
- Add two build fix patches.
- Built for x86_64, x86_64-musl, i686
- Tested on x86_64
A patch file from https://github.com/void-linux/void-packages/pull/14862.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-14862.patch --]
[-- Type: text/x-diff, Size: 50795 bytes --]
From 135d998190f17e9e07460ebd48625d090f885e37 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Sep 2019 11:52:35 -0400
Subject: [PATCH 1/2] chromium: update to 77.0.3865.90.
[ci skip]
- Update vaapi patch from Ubuntu/Debian patch.
- Add two build fix patches.
- Built for x86_64, x86_64-musl, i686
- Tested on x86_64
---
.../files/musl-patches/no-mallinfo.patch | 12 +
.../patches/chromium-enable-vaapi.patch | 760 +++++++-----------
.../chromium/patches/harfbuzz-subset.patch | 49 ++
.../chromium/patches/linked-hash-set.patch | 130 +++
.../chromium/patches/one_euro_filter.patch | 11 +
srcpkgs/chromium/template | 6 +-
6 files changed, 516 insertions(+), 452 deletions(-)
create mode 100644 srcpkgs/chromium/patches/harfbuzz-subset.patch
create mode 100644 srcpkgs/chromium/patches/linked-hash-set.patch
create mode 100644 srcpkgs/chromium/patches/one_euro_filter.patch
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 461c90cb0af..288f8670c06 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -42,3 +42,15 @@ index 0eb5c1f..8af7799 100644
mi = ::mallinfo();
return mi.uordblks;
+--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400
++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400
+@@ -122,7 +122,9 @@
+ /* #undef HAVE_MALLCTL */
+
+ /* Define to 1 if you have the `mallinfo' function. */
++#if defined(__GLIBC__)
+ #define HAVE_MALLINFO 1
++#endif
+
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #define HAVE_MALLOC_H 1
diff --git a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
index d1cb7b4be59..01c253de5ff 100644
--- a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
+++ b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
@@ -1,165 +1,107 @@
---- chrome/browser/about_flags.cc.orig 2019-07-29 16:35:46.000000000 -0400
-+++ chrome/browser/about_flags.cc 2019-07-31 13:54:18.350186083 -0400
-@@ -1119,12 +1119,14 @@
- {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
- flag_descriptions::kUiPartialSwapDescription, kOsAll,
- SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
- flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
- {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
- flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
-+#endif
- #if !defined(OS_ANDROID)
- {"enable-reader-mode", flag_descriptions::kEnableReaderModeName,
- flag_descriptions::kEnableReaderModeDescription, kOsDesktop,
-@@ -1446,6 +1448,13 @@
- flag_descriptions::kEnableVirtualDesksDescription, kOsCrOS,
- FEATURE_VALUE_TYPE(ash::features::kVirtualDesks)},
- #endif // OS_CHROMEOS
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ {
-+ "enable-accelerated-video", flag_descriptions::kAcceleratedVideoName,
-+ flag_descriptions::kAcceleratedVideoDescription, kOsLinux,
-+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedVideo),
-+ },
-+#else
- {
+From 53b93dfe87fd10cced5d2a2a63072dfc7a2af6e4 Mon Sep 17 00:00:00 2001
+From: Daniel Charles <daniel.charles@intel.com>
+Date: Fri, 28 Jul 2017 16:31:47 -0700
+Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only
+
+This patch contains all the changes necessary to use VA-API along with
+vaapi-driver to run all media use cases supported with hardware acceleration.
+
+It is intended to remain as experimental accessible from chrome://flags on linux.
+It requires libva/intel-vaapi-driver to be installed on the system path where
+chrome is executed. Other drivers could be tested if available. Flags are
+kept independent for linux, where this feature has to be enabled before
+actually using it. This should not change how other OSes use the flags
+already, the new flags will show at the buttom on the section of unavailable
+experiments
+
+The changes cover a range of compiler pre-processor flags to enable the stack.
+It moves the presandbox operations to the vaapi_wrapper class as the hook function
+is available there. vaInit will open driver on the correct installed folder.
+
+chrome flags consolidtation into only two flags for linux. Mjpeg and accelerated
+video are used. The other flags are kept for ChromeOS and other OSes.
+
+Developer testing was made on skylake hardware, ChromeOS and Ubuntu.
+
+BUG=NONE
+TEST="subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder"
+TEST="and decoder hardware accelerated"
+TEST="have libva/intel-vaapi-driver installed and not installed in the system"
+TEST="repeat on different hardware families"
+R=posciak@chromium.org
+R=kcwu@chromium.org
+
+Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
+Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171
+Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+---
+
+Index: dev/chrome/browser/about_flags.cc
+===================================================================
+--- chrome/browser/about_flags.cc
++++ chrome/browser/about_flags.cc
+@@ -1527,7 +1527,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -1453,6 +1462,7 @@
- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
+ flag_descriptions::kAcceleratedVideoDecodeDescription,
+- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
++ kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
-+#endif
- {"enable-history-favicons-google-server-query",
- flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryName,
- flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryDescription,
-@@ -1883,7 +1892,12 @@
+ {
+@@ -1993,10 +1993,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
- #endif // ENABLE_ISOLATED_XR_SERVICE
+ #endif // !defined(OS_ANDROID)
#endif // ENABLE_VR
-#if defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ {"enable-accelerated-mjpeg-decode",
-+ flag_descriptions::kAcceleratedMjpegDecodeName,
-+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsLinux,
-+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedMjpegDecode)},
-+#elif defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
{"disable-accelerated-mjpeg-decode",
flag_descriptions::kAcceleratedMjpegDecodeName,
- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
---- chrome/browser/chromeos/login/chrome_restart_request.cc.orig 2019-07-29 16:35:47.000000000 -0400
-+++ chrome/browser/chromeos/login/chrome_restart_request.cc 2019-07-31 13:58:47.201085960 -0400
-@@ -20,6 +20,7 @@
- #include "base/system/sys_info.h"
- #include "base/timer/timer.h"
- #include "base/values.h"
-+#include "build/build_config.h"
- #include "cc/base/switches.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/chromeos/boot_times_recorder.h"
-@@ -84,9 +85,14 @@
- ::switches::kBlinkSettings,
- ::switches::kDisable2dCanvasImageChromium,
- ::switches::kDisableAccelerated2dCanvas,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ ::switches::kEnableAcceleratedMjpegDecode,
-+ ::switches::kEnableAcceleratedVideo,
-+#else
- ::switches::kDisableAcceleratedMjpegDecode,
- ::switches::kDisableAcceleratedVideoDecode,
- ::switches::kDisableAcceleratedVideoEncode,
-+#endif
- ::switches::kDisableBlinkFeatures,
- ::switches::kDisableGpu,
- ::switches::kDisableGpuMemoryBufferVideoFrames,
-@@ -158,8 +164,10 @@
- ::switches::kEnableWebGLImageChromium,
- ::switches::kEnableWebVR,
- ::switches::kEnableUnsafeWebGPU,
-+#if (defined(OS_CHROMEOS) || defined(OS_ANDROID))
- ::switches::kDisableWebRtcHWDecoding,
- ::switches::kDisableWebRtcHWEncoding,
-+#endif
- ::switches::kOzonePlatform,
- ash::switches::kAshEnableTabletMode,
- ash::switches::kAshEnableWaylandServer,
-diff -ur chrome/browser/flag_descriptions.cc chromium-69.0.3497.92/chrome/browser/flag_descriptions.cc
---- chrome/browser/flag_descriptions.cc.orig 2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.cc 2019-07-02 12:27:47.137866754 -0400
-@@ -14,6 +14,13 @@
- "Enables the use of the GPU to perform 2d canvas rendering instead of "
- "using software rendering.";
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+const char kAcceleratedVideoName[] = "Hardware-accelerated video";
-+const char kAcceleratedVideoDescription[] =
-+ "Hardware-accelerated video where VA-API driver is installed on the"
-+ "system.";
-+#endif
-+
- const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
- const char kAcceleratedVideoDecodeDescription[] =
- "Hardware-accelerated video decode where available.";
-@@ -2081,6 +2088,7 @@
- const char kWebrtcHybridAgcDescription[] =
- "WebRTC Agc2 digital adaptation with Agc1 analog adaptation.";
-
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
- const char kWebrtcHwDecodingDescription[] =
- "Support in WebRTC for decoding video streams using platform hardware.";
-@@ -2088,6 +2096,7 @@
- const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
- const char kWebrtcHwEncodingDescription[] =
- "Support in WebRTC for encoding video streams using platform hardware.";
-+#endif
-
- const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
- const char kWebrtcHwH264EncodingDescription[] =
-@@ -2943,14 +2952,16 @@
+- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
++ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
+ SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
+ #endif // OS_CHROMEOS
+ {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
+Index: dev/chrome/browser/flag_descriptions.cc
+===================================================================
+--- chrome/browser/flag_descriptions.cc
++++ chrome/browser/flag_descriptions.cc
+@@ -2880,9 +2880,7 @@ const char kMacSystemMediaPermissionsInf
- // Chrome OS -------------------------------------------------------------------
+ #endif
+-// Chrome OS -------------------------------------------------------------------
+-
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
- const char kAcceleratedMjpegDecodeDescription[] =
+@@ -2890,6 +2888,12 @@ const char kAcceleratedMjpegDecodeDescri
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
-+#endif
++#endif
++
++// Chrome OS -------------------------------------------------------------------
++
+#if defined(OS_CHROMEOS)
++
const char kAppServiceAshName[] = "App Service Ash";
const char kAppServiceAshDescription[] =
"Use the App Service to provide data to the Ash UI, such as the shelf and "
-diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser/flag_descriptions.h
---- chrome/browser/flag_descriptions.h.orig 2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.h 2019-07-02 12:29:46.200214795 -0400
-@@ -43,6 +43,10 @@
- extern const char kAccelerated2dCanvasName[];
- extern const char kAccelerated2dCanvasDescription[];
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+extern const char kAcceleratedVideoName[];
-+extern const char kAcceleratedVideoDescription[];
-+#endif
- extern const char kAcceleratedVideoDecodeName[];
- extern const char kAcceleratedVideoDecodeDescription[];
-
-@@ -1765,13 +1769,17 @@
+Index: dev/chrome/browser/flag_descriptions.h
+===================================================================
+--- chrome/browser/flag_descriptions.h
++++ chrome/browser/flag_descriptions.h
+@@ -1715,13 +1715,17 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)
-// Chrome OS ------------------------------------------------------------------
-
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
@@ -173,234 +115,32 @@ diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser
extern const char kAppServiceAshName[];
extern const char kAppServiceAshDescription[];
-diff -ur content/browser/gpu/compositor_util.cc chromium-69.0.3497.92/content/browser/gpu/compositor_util.cc
---- content/browser/gpu/compositor_util.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/gpu/compositor_util.cc 2018-09-13 22:10:34.072012092 +0530
-@@ -149,7 +149,11 @@
- {"video_decode",
- SafeGetFeatureStatus(gpu_feature_info,
- gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ !command_line.HasSwitch(switches::kEnableAcceleratedVideo),
-+#else
- command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
-+#endif
- "Accelerated video decode has been disabled, either via blacklist, "
- "about:flags or the command line.",
- true, true},
---- content/browser/gpu/gpu_process_host.cc.orig 2019-07-31 14:16:52.304849119 -0400
-+++ content/browser/gpu/gpu_process_host.cc 2019-07-31 14:19:22.567480008 -0400
-@@ -208,7 +208,9 @@
- switches::kDisableLogging,
- switches::kDisableShaderNameHashing,
- switches::kDisableSkiaRuntimeOpts,
-+#if !defined(OS_LINUX)
- switches::kDisableWebRtcHWEncoding,
-+#endif
- switches::kEnableGpuRasterization,
- switches::kEnableLogging,
- switches::kEnableVizDevTools,
-diff -ur content/browser/renderer_host/media/video_capture_browsertest.cc chromium-69.0.3497.92/content/browser/renderer_host/media/video_capture_browsertest.cc
---- content/browser/renderer_host/media/video_capture_browsertest.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/renderer_host/media/video_capture_browsertest.cc 2018-09-13 22:10:34.124010499 +0530
-@@ -165,8 +165,13 @@
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kUseFakeJpegDecodeAccelerator);
- } else {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
-+ switches::kEnableAcceleratedMjpegDecode);
-+#else
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kDisableAcceleratedMjpegDecode);
-+#endif
- }
- }
-
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-07-29 16:36:09.000000000 -0400
-+++ content/browser/renderer_host/render_process_host_impl.cc 2019-07-31 14:04:18.859680348 -0400
-@@ -2937,7 +2937,11 @@
- switches::kDefaultTileHeight,
- switches::kDisable2dCanvasImageChromium,
- switches::kDisableYUVImageDecoding,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ switches::kEnableAcceleratedVideo,
-+#else
- switches::kDisableAcceleratedVideoDecode,
-+#endif
- switches::kDisableBackgroundTimerThrottling,
- switches::kDisableBestEffortTasks,
- switches::kDisableBreakpad,
-@@ -3077,8 +3081,10 @@
- #if BUILDFLAG(ENABLE_PLUGINS)
- switches::kEnablePepperTesting,
- #endif
-+#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
- switches::kDisableWebRtcHWDecoding,
- switches::kDisableWebRtcHWEncoding,
-+#endif
- switches::kEnableWebRtcSrtpAesGcm,
- switches::kEnableWebRtcSrtpEncryptedHeaders,
- switches::kEnableWebRtcStunOrigin,
-diff -ur content/browser/utility_process_host.cc chromium-69.0.3497.92/content/browser/utility_process_host.cc
---- content/browser/utility_process_host.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/utility_process_host.cc 2018-09-13 22:10:34.296005227 +0530
-@@ -296,7 +296,11 @@
- switches::kOverrideUseSoftwareGLForTests,
- switches::kOverrideEnabledCdmInterfaceVersion,
- switches::kProxyServer,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ switches::kEnableAcceleratedMjpegDecode,
-+#else
- switches::kDisableAcceleratedMjpegDecode,
-+#endif
- switches::kUseFakeDeviceForMediaStream,
- switches::kUseFakeJpegDecodeAccelerator,
- switches::kUseFileForFakeVideoCapture,
-diff -ur content/browser/webrtc/webrtc_media_recorder_browsertest.cc chromium-69.0.3497.92/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
---- content/browser/webrtc/webrtc_media_recorder_browsertest.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/webrtc/webrtc_media_recorder_browsertest.cc 2018-09-13 22:10:34.143009916 +0530
-@@ -66,7 +66,12 @@
- return;
- // This flag is also used for encoding, https://crbug.com/616640.
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
-- switches::kDisableAcceleratedVideoDecode);
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ switches::kEnableAcceleratedVideo
-+#else
-+ switches::kDisableAcceleratedVideoDecode
-+#endif
-+ );
- }
-
- private:
-diff -ur content/gpu/BUILD.gn chromium-69.0.3497.92/content/gpu/BUILD.gn
---- content/gpu/BUILD.gn 2018-09-12 00:39:41.000000000 +0530
-+++ content/gpu/BUILD.gn 2018-09-13 22:10:34.148009763 +0530
-@@ -133,4 +133,8 @@
+Index: dev/content/gpu/BUILD.gn
+===================================================================
+--- content/gpu/BUILD.gn
++++ content/gpu/BUILD.gn
+@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
+ import("//build/config/ui.gni")
+ import("//gpu/vulkan/features.gni")
+ import("//media/media_options.gni")
++import("//media/gpu/args.gni")
+ import("//ui/ozone/ozone.gni")
+
+ # See //content/BUILD.gn for how this works.
+@@ -128,4 +129,8 @@ target(link_target_type, "gpu_sources")
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
+
-+ if (is_desktop_linux) {
-+ public_configs = [ "//media/gpu:libva_config" ]
++ if (is_desktop_linux && use_vaapi) {
++ public_configs = [ "//build/config/linux/libva" ]
+ }
}
-diff -ur content/gpu/gpu_main.cc chromium-69.0.3497.92/content/gpu/gpu_main.cc
---- content/gpu/gpu_main.cc 2019-07-02 09:50:13.403486804 -0400
-+++ content/gpu/gpu_main.cc 2019-07-02 09:55:07.256818723 -0400
-@@ -288,7 +288,7 @@
-
- base::PlatformThread::SetName("CrGpuMain");
-
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
- // Set thread priority before sandbox initialization.
- base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
- #endif
-@@ -321,7 +321,7 @@
- GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
-
- base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
- io_thread_priority = base::ThreadPriority::DISPLAY;
- #endif
-
-diff -ur content/public/browser/gpu_utils.cc chromium-69.0.3497.92/content/public/browser/gpu_utils.cc
---- content/public/browser/gpu_utils.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/browser/gpu_utils.cc 2018-09-13 22:10:34.164009273 +0530
-@@ -57,9 +57,17 @@
- gpu_preferences.in_process_gpu =
- command_line->HasSwitch(switches::kInProcessGPU);
- gpu_preferences.disable_accelerated_video_decode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
- command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
-+#endif
- gpu_preferences.disable_accelerated_video_encode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
- command_line->HasSwitch(switches::kDisableAcceleratedVideoEncode);
-+#endif
- #if defined(OS_WIN)
- uint32_t enable_accelerated_vpx_decode_val =
- gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
-diff -ur content/public/common/content_switches.cc chromium-69.0.3497.92/content/public/common/content_switches.cc
---- content/public/common/content_switches.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.cc 2018-09-13 22:10:34.172009028 +0530
-@@ -79,6 +79,11 @@
- // Disable gpu-accelerated 2d canvas.
- const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas";
-
-+#if defined(OS_LINUX)
-+// Enables hardware acceleration of video for Linux only. VA-API driver
-+// is required to be present on the system installation.
-+const char kEnableAcceleratedVideo[] = "enable-accelerated-video";
-+#endif
- // Disables hardware acceleration of video decode, where available.
- const char kDisableAcceleratedVideoDecode[] =
- "disable-accelerated-video-decode";
-@@ -868,11 +873,13 @@
- // ignores this switch on its stable and beta channels.
- const char kDisableWebRtcEncryption[] = "disable-webrtc-encryption";
-
-+#if defined(OS_CHROMEOS)
- // Disables HW decode acceleration for WebRTC.
- const char kDisableWebRtcHWDecoding[] = "disable-webrtc-hw-decoding";
-
- // Disables HW encode acceleration for WebRTC.
- const char kDisableWebRtcHWEncoding[] = "disable-webrtc-hw-encoding";
-+#endif
-
- // Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC.
- // See https://tools.ietf.org/html/rfc7714 for further information.
-diff -ur content/public/common/content_switches.h chromium-69.0.3497.92/content/public/common/content_switches.h
---- content/public/common/content_switches.h 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.h 2018-09-13 22:10:34.172009028 +0530
-@@ -104,6 +104,9 @@
- CONTENT_EXPORT extern const char kDomAutomationController[];
- extern const char kDisable2dCanvasClipAntialiasing[];
- CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+CONTENT_EXPORT extern const char kEnableAcceleratedVideo[];
-+#endif
- CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[];
- CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
- CONTENT_EXPORT extern const char kEnableAutomation[];
-@@ -241,8 +244,10 @@
- CONTENT_EXPORT extern const char kWaitForDebuggerChildren[];
-
- CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
-+#if defined(OS_CHROMEOS)
- CONTENT_EXPORT extern const char kDisableWebRtcHWDecoding[];
- CONTENT_EXPORT extern const char kDisableWebRtcHWEncoding[];
-+#endif
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
- CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
-diff -ur content/renderer/render_thread_impl.cc chromium-69.0.3497.92/content/renderer/render_thread_impl.cc
---- content/renderer/render_thread_impl.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/renderer/render_thread_impl.cc 2018-09-13 22:10:34.192008415 +0530
-@@ -1441,7 +1441,11 @@
- kGpuStreamPriorityMedia);
-
- const bool enable_video_accelerator =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ cmd_line->HasSwitch(switches::kEnableAcceleratedVideo) &&
-+#else
- !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-+#endif
- (gpu_channel_host->gpu_feature_info()
- .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
- gpu::kGpuFeatureStatusEnabled);
-Only in content/renderer: render_thread_impl.cc.orig
-diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/config/software_rendering_list.json
---- gpu/config/software_rendering_list.json 2018-09-12 00:39:44.000000000 +0530
-+++ gpu/config/software_rendering_list.json 2018-09-13 22:10:34.193008384 +0530
-@@ -377,17 +377,6 @@
+Index: dev/gpu/config/software_rendering_list.json
+===================================================================
+--- gpu/config/software_rendering_list.json
++++ gpu/config/software_rendering_list.json
+@@ -369,17 +369,6 @@
]
},
{
@@ -418,119 +158,241 @@ diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/confi
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
"cr_bugs": [145531, 332596, 571899, 629434],
-diff -ur media/base/media_switches.cc chromium-69.0.3497.92/media/base/media_switches.cc
---- media/base/media_switches.cc.orig 2019-06-18 11:48:14.000000000 -0400
-+++ media/base/media_switches.cc 2019-07-02 12:32:22.370983036 -0400
-@@ -103,10 +103,15 @@
- const char kUseFakeMjpegDecodeAccelerator[] =
- "use-fake-mjpeg-decode-accelerator";
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+// Enable hardware accelerated mjpeg decode on linux
-+const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode";
-+#else
- // Disable hardware acceleration of mjpeg decode for captured frame, where
- // available.
- const char kDisableAcceleratedMjpegDecode[] =
- "disable-accelerated-mjpeg-decode";
-+#endif
-
- // When running tests on a system without the required hardware or libraries,
- // this flag will cause the tests to fail. Otherwise, they silently succeed.
-@@ -503,15 +508,21 @@
- };
-
- bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-+ switches::kEnableAcceleratedMjpegDecode)
-+#else
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-- switches::kDisableAcceleratedMjpegDecode)) {
-+ switches::kDisableAcceleratedMjpegDecode)
-+#endif
-+ ) {
- return false;
- }
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+Index: dev/media/base/media_switches.cc
+===================================================================
+--- media/base/media_switches.cc
++++ media/base/media_switches.cc
+@@ -544,7 +544,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
switches::kUseFakeMjpegDecodeAccelerator)) {
return true;
}
-#if defined(OS_CHROMEOS)
-+#if !defined(OS_ANDROID) && defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
return true;
#endif
return false;
-diff -ur media/base/media_switches.h chromium-69.0.3497.92/media/base/media_switches.h
---- media/base/media_switches.h.orig 2019-07-02 12:20:39.902984488 -0400
-+++ media/base/media_switches.h 2019-07-02 12:33:45.441923602 -0400
-@@ -60,7 +60,11 @@
- MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
- MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[];
- MEDIA_EXPORT extern const char kUseFakeMjpegDecodeAccelerator[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+MEDIA_EXPORT extern const char kEnableAcceleratedMjpegDecode[];
-+#else
- MEDIA_EXPORT extern const char kDisableAcceleratedMjpegDecode[];
-+#endif
-
- MEDIA_EXPORT extern const char kRequireAudioHardwareForTesting[];
- MEDIA_EXPORT extern const char kMuteAudio[];
---- media/gpu/BUILD.gn.orig 2019-07-29 16:36:19.000000000 -0400
-+++ media/gpu/BUILD.gn 2019-07-31 14:09:28.093032826 -0400
-@@ -495,6 +495,14 @@
+Index: dev/media/filters/BUILD.gn
+===================================================================
+--- media/filters/BUILD.gn
++++ media/filters/BUILD.gn
+@@ -5,6 +5,7 @@
+ import("//build/config/jumbo.gni")
+ import("//media/media_options.gni")
+ import("//third_party/libaom/options.gni")
++import("//media/gpu/args.gni")
+
+ jumbo_source_set("filters") {
+ # Do not expand the visibility here without double-checking with OWNERS, this
+@@ -196,7 +197,7 @@ jumbo_source_set("filters") {
+ deps += [ "//media/base/android" ]
}
- }
-+if (is_desktop_linux && use_vaapi) {
-+ import("//build/config/linux/pkg_config.gni")
-+
-+ pkg_config("libva_config") {
-+ packages = [ "libva" ]
-+ }
-+}
-+
- if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
- test("video_encode_accelerator_unittest") {
- deps = [
-@@ -525,6 +533,10 @@
+- if (current_cpu != "arm" && is_linux) {
++ if (use_vaapi) {
+ sources += [
+ "h264_bitstream_buffer.cc",
+ "h264_bitstream_buffer.h",
+Index: dev/media/gpu/BUILD.gn
+===================================================================
+--- media/gpu/BUILD.gn
++++ media/gpu/BUILD.gn
+@@ -531,6 +531,7 @@ if (use_v4l2_codec || use_vaapi || is_ma
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
-+
-+ if (is_desktop_linux) {
-+ public_configs = [ ":libva_config" ]
-+ }
++ public_configs = [ "//build/config/linux/libva" ]
}
}
---- content/renderer/media/webrtc/video_codec_factory.cc.orig 2019-07-02 16:39:57.973241977 -0400
-+++ content/renderer/media/webrtc/video_codec_factory.cc 2019-07-02 17:00:00.656342711 -0400
-@@ -187,8 +187,11 @@
- std::unique_ptr<webrtc::VideoEncoderFactory> encoder_factory;
+Index: dev/media/gpu/gpu_video_decode_accelerator_factory.cc
+===================================================================
+--- media/gpu/gpu_video_decode_accelerator_factory.cc
++++ media/gpu/gpu_video_decode_accelerator_factory.cc
+@@ -171,6 +171,8 @@ GpuVideoDecodeAcceleratorFactory::Create
+ vda = (this->*create_vda_function)(workarounds, gpu_preferences, media_log);
+ if (vda && vda->Initialize(config, client))
+ return vda;
++ else
++ LOG(ERROR) << "Initialization of one or more VDAs failed.";
+ }
- const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-- if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
-- !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
-+ if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()
-+#if defined(OS_CHROMEOS)
-+ && !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)
+ return nullptr;
+@@ -229,6 +231,7 @@ GpuVideoDecodeAcceleratorFactory::Create
+ const gpu::GpuDriverBugWorkarounds& workarounds,
+ const gpu::GpuPreferences& gpu_preferences,
+ MediaLog* media_log) const {
++ LOG(WARNING) << "Initializing VAAPI VDA.";
+ std::unique_ptr<VideoDecodeAccelerator> decoder;
+ decoder.reset(new VaapiVideoDecodeAccelerator(make_context_current_cb_,
+ bind_image_cb_));
+Index: dev/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/ipc/service/gpu_video_decode_accelerator.cc
++++ media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+@@ -380,6 +380,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+ LOG(ERROR) << "Failed creating the VDA factory";
+ return false;
+ }
++ LOG(WARNING) << "Created the VDA factory";
+
+ const gpu::GpuDriverBugWorkarounds& gpu_workarounds =
+ stub_->channel()->gpu_channel_manager()->gpu_driver_bug_workarounds();
+@@ -393,6 +394,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+ << (config.is_encrypted() ? " with encryption" : "");
+ return false;
+ }
++ LOG(WARNING) << "Created VDA";
+
+ // Attempt to set up performing decoding tasks on IO thread, if supported by
+ // the VDA.
+Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_video_decode_accelerator.cc
++++ media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+@@ -64,6 +64,7 @@ void ReportToUMA(VAVDADecoderFailure fai
+ VAVDA_DECODER_FAILURES_MAX + 1);
+ }
+
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
+ // Lake) Cpu platform id's are referenced from the following file in kernel
+ // source arch/x86/include/asm/intel-family.h
+@@ -76,6 +77,7 @@ bool IsGeminiLakeOrLater() {
+ cpuid.model() >= kGeminiLakeModelId;
+ return is_geminilake_or_later;
+ }
+#endif
-+ ) {
- encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
+
+ } // namespace
+
+@@ -632,6 +634,10 @@ void VaapiVideoDecodeAccelerator::Assign
+ va_surface_format_ = GetVaFormatForVideoCodecProfile(profile_);
+ std::vector<VASurfaceID> va_surface_ids;
+
++ // Nvidia doesn't support VAProfileNone, so don't try to create a temporary
++ // copy buffer there. It's not needed anyways for hardware video decoding
++ // to work.
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // If we aren't in BufferAllocationMode::kNone, we have to allocate a
+ // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
+ // internal decoded frame.
+@@ -645,15 +651,20 @@ void VaapiVideoDecodeAccelerator::Assign
+ NotifyError(PLATFORM_FAILURE);
+ }
}
++#endif
-@@ -205,8 +208,11 @@
- std::unique_ptr<webrtc::VideoDecoderFactory> decoder_factory;
+ for (size_t i = 0; i < buffers.size(); ++i) {
+ // If we aren't in BufferAllocationMode::kNone, this |picture| is
+ // only used as a copy destination. Therefore, the VaapiWrapper used and
+ // owned by |picture| is |vpp_vaapi_wrapper_|.
+ std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++ vaapi_wrapper_,
++#else
+ (buffer_allocation_mode_ == BufferAllocationMode::kNone)
+ ? vaapi_wrapper_
+ : vpp_vaapi_wrapper_,
++#endif
+ make_context_current_cb_, bind_image_cb_, buffers[i]);
+ RETURN_AND_NOTIFY_ON_FAILURE(picture, "Failed creating a VaapiPicture",
+ PLATFORM_FAILURE, );
+@@ -1078,6 +1089,9 @@ VaapiVideoDecodeAccelerator::GetSupporte
+
+ VaapiVideoDecodeAccelerator::BufferAllocationMode
+ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++ return BufferAllocationMode::kNormal;
++#else
+ // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
+ // |output_mode_| as well.
+ if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
+@@ -1113,6 +1127,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+ return BufferAllocationMode::kReduced;
- const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-- if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
-- !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)) {
-+ if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()
-+#if defined(OS_CHROMEOS)
-+ && !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)
+ return BufferAllocationMode::kSuperReduced;
+#endif
-+ ) {
- decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
+ }
+
+ bool VaapiVideoDecodeAccelerator::IsBufferAllocationModeReducedOrSuperReduced()
+Index: dev/media/gpu/vaapi/vaapi_wrapper.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_wrapper.cc
++++ media/gpu/vaapi/vaapi_wrapper.cc
+@@ -324,6 +324,11 @@ void VADisplayState::PreSandboxInitializ
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+ if (drm_file.IsValid())
+ VADisplayState::Get()->SetDrmFd(drm_file.GetPlatformFile());
++
++ const char kNvidiaPath[] = "/dev/dri/nvidiactl";
++ base::File nvidia_file = base::File(
++ base::FilePath::FromUTF8Unsafe(kNvidiaPath),
++ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+ }
+
+ VADisplayState::VADisplayState()
+@@ -351,10 +356,6 @@ bool VADisplayState::Initialize() {
+ }
+
+ bool VADisplayState::InitializeOnce() {
+- static_assert(
+- VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
+- "Requires VA-API >= 1.1.0");
+-
+ switch (gl::GetGLImplementation()) {
+ case gl::kGLImplementationEGLGLES2:
+ va_display_ = vaGetDisplayDRM(drm_fd_.get());
+@@ -362,10 +363,10 @@ bool VADisplayState::InitializeOnce() {
+ case gl::kGLImplementationDesktopGL:
+ #if defined(USE_X11)
+ va_display_ = vaGetDisplay(gfx::GetXDisplay());
+-#else
+- LOG(WARNING) << "VAAPI video acceleration not available without "
+- "DesktopGL (GLX).";
++ if (vaDisplayIsValid(va_display_))
++ break;
+ #endif // USE_X11
++ va_display_ = vaGetDisplayDRM(drm_fd_.get());
+ break;
+ // Cannot infer platform from GL, try all available displays
+ case gl::kGLImplementationNone:
+@@ -398,8 +399,19 @@ bool VADisplayState::InitializeOnce() {
+ int major_version, minor_version;
+ VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
+ if (va_res != VA_STATUS_SUCCESS) {
+- LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res);
+- return false;
++ LOG(ERROR) << "vaInitialize failed (ignore if using Wayland desktop environment): " << vaErrorStr(va_res);
++ va_display_ = vaGetDisplayDRM(drm_fd_.get());
++ if (!vaDisplayIsValid(va_display_)) {
++ LOG(ERROR) << "Could not get a valid DRM VA display";
++ return false;
++ }
++ va_res = vaInitialize(va_display_, &major_version, &minor_version);
++ if (va_res != VA_STATUS_SUCCESS) {
++ LOG(ERROR) << "vaInitialize failed using DRM: " << vaErrorStr(va_res);
++ return false;
++ } else {
++ LOG(WARNING) << "vaInitialize succeeded for DRM";
++ }
}
+ va_initialized_ = true;
+@@ -407,7 +419,7 @@ bool VADisplayState::InitializeOnce() {
+ va_vendor_string_ = vaQueryVendorString(va_display_);
+ DLOG_IF(WARNING, va_vendor_string_.empty())
+ << "Vendor string empty or error reading.";
+- DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
++ VLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
+ << va_vendor_string_;
+
+ // The VAAPI version is determined from what is loaded on the system by
+@@ -742,7 +754,7 @@ bool VASupportedProfiles::AreAttribsSupp
+ 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
++ VLOG(1) << "Unsupported value " << required_attribs[i].value
+ << " for attribute type " << required_attribs[i].type;
+ return false;
+ }
diff --git a/srcpkgs/chromium/patches/harfbuzz-subset.patch b/srcpkgs/chromium/patches/harfbuzz-subset.patch
new file mode 100644
index 00000000000..6f228b774d4
--- /dev/null
+++ b/srcpkgs/chromium/patches/harfbuzz-subset.patch
@@ -0,0 +1,49 @@
+From 27e25336b8316ff3ec4e464058682ed85801fd06 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Mon, 29 Jul 2019 10:54:28 +0000
+Subject: [PATCH] Also link against libharfbuzz-subset when use_system_harfbuzz is true
+
+When building HarfBuzz as part of Chromium, there is a single source set
+with all the files we need in the build.
+
+Upstream HarfBuzz, on the other hand, produces a few different libraries:
+harfbuzz, harfbuzz-icu and harfbuzz-subset. When |use_system_harfbuzz| is
+true, we were only looking for (and using) harfbuzz.pc with pkg-config even
+though we also use symbols from libharfbuzz-subset.so. This resulted in
+errors when linking:
+
+ ld: obj/skia/skia/SkPDFSubsetFont.o: in function `SkPDFSubsetFont(sk_sp<SkData>, SkPDFGlyphUse const&, SkPDF::Metadata::Subsetter, char const*, int)':
+ SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x48a): undefined reference to `hb_subset_input_create_or_fail'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x4af): undefined reference to `hb_subset_input_glyph_set'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5d7): undefined reference to `hb_subset_input_set_retain_gids'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5e4): undefined reference to `hb_subset_input_set_drop_hints'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5f3): undefined reference to `hb_subset'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x66f): undefined reference to `hb_subset_input_destroy'
+
+as reported in
+https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ
+
+Change-Id: I997af075c7b7263cd7cc71a63db5b0f93bd1ab59
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715288
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Commit-Queue: Dominik Röttsches <drott@chromium.org>
+Reviewed-by: Dominik Röttsches <drott@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#681760}
+---
+
+diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
+index 37d8e33..72013eb1d 100644
+--- third_party/harfbuzz-ng/BUILD.gn
++++ third_party/harfbuzz-ng/BUILD.gn
+@@ -16,7 +16,10 @@
+ "//third_party:freetype_harfbuzz",
+ "//third_party/freetype:freetype_source",
+ ]
+- packages = [ "harfbuzz" ]
++ packages = [
++ "harfbuzz",
++ "harfbuzz-subset",
++ ]
+ }
+ } else {
+ config("harfbuzz_config") {
diff --git a/srcpkgs/chromium/patches/linked-hash-set.patch b/srcpkgs/chromium/patches/linked-hash-set.patch
new file mode 100644
index 00000000000..24b13d8a5c0
--- /dev/null
+++ b/srcpkgs/chromium/patches/linked-hash-set.patch
@@ -0,0 +1,130 @@
+From 74138b9febd37eac0fc26b8efb110014a83a52c6 Mon Sep 17 00:00:00 2001
+From: Jeremy Roman <jbroman@chromium.org>
+Date: Wed, 07 Aug 2019 13:26:48 +0000
+Subject: [PATCH] WTF: Make LinkedHashSet understand values for which memset initialization would be bad.
+
+Includes a unit test which fails before, and uses this to fix FontCacheKeyTraits.
+
+Bug: 980025
+Change-Id: If41f97444c7fd37b9b95d6dadaf3da5689079e9e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739948
+Reviewed-by: Kentaro Hara <haraken@chromium.org>
+Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
+Commit-Queue: Jeremy Roman <jbroman@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#684731}
+---
+
+diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h b/third_party/blink/renderer/platform/fonts/font_cache_key.h
+index 0efc8fb..90063cb 100644
+--- third_party/blink/renderer/platform/fonts/font_cache_key.h
++++ third_party/blink/renderer/platform/fonts/font_cache_key.h
+@@ -133,6 +133,10 @@
+
+ struct FontCacheKeyTraits : WTF::SimpleClassHashTraits<FontCacheKey> {
+ STATIC_ONLY(FontCacheKeyTraits);
++
++ // std::string's empty state need not be zero in all implementations,
++ // and it is held within FontFaceCreationParams.
++ static const bool kEmptyValueIsZero = false;
+ };
+
+ } // namespace blink
+diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
+index b35b6e9..77e524c 100644
+--- third_party/blink/renderer/platform/wtf/linked_hash_set.h
++++ third_party/blink/renderer/platform/wtf/linked_hash_set.h
+@@ -146,6 +146,11 @@
+ LinkedHashSetNodeBase* next)
+ : LinkedHashSetNodeBase(prev, next), value_(value) {}
+
++ LinkedHashSetNode(ValueArg&& value,
++ LinkedHashSetNodeBase* prev,
++ LinkedHashSetNodeBase* next)
++ : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {}
++
+ LinkedHashSetNode(LinkedHashSetNode&& other)
+ : LinkedHashSetNodeBase(std::move(other)),
+ value_(std::move(other.value_)) {}
+@@ -445,10 +450,13 @@
+
+ // The slot is empty when the next_ field is zero so it's safe to zero
+ // the backing.
+- static const bool kEmptyValueIsZero = true;
++ static const bool kEmptyValueIsZero = ValueTraits::kEmptyValueIsZero;
+
+ static const bool kHasIsEmptyValueFunction = true;
+ static bool IsEmptyValue(const Node& node) { return !node.next_; }
++ static Node EmptyValue() {
++ return Node(ValueTraits::EmptyValue(), nullptr, nullptr);
++ }
+
+ static const int kDeletedValue = -1;
+
+diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+index 4c3f899..cd1be00 100644
+--- third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
++++ third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+@@ -487,6 +487,7 @@
+ };
+
+ struct Complicated {
++ Complicated() : Complicated(0) {}
+ Complicated(int value) : simple_(value) { objects_constructed_++; }
+
+ Complicated(const Complicated& other) : simple_(other.simple_) {
+@@ -495,9 +496,6 @@
+
+ Simple simple_;
+ static int objects_constructed_;
+-
+- private:
+- Complicated() = delete;
+ };
+
+ int Complicated::objects_constructed_ = 0;
+@@ -731,4 +729,45 @@
+
+ } // anonymous namespace
+
++// A unit type which objects to its state being initialized wrong.
++struct InvalidZeroValue {
++ InvalidZeroValue() = default;
++ InvalidZeroValue(WTF::HashTableDeletedValueType) : deleted_(true) {}
++ ~InvalidZeroValue() { CHECK(ok_); }
++ bool IsHashTableDeletedValue() const { return deleted_; }
++
++ bool ok_ = true;
++ bool deleted_ = false;
++};
++
++template <>
++struct HashTraits<InvalidZeroValue> : SimpleClassHashTraits<InvalidZeroValue> {
++ static const bool kEmptyValueIsZero = false;
++};
++
++template <>
++struct DefaultHash<InvalidZeroValue> {
++ struct Hash {
++ static unsigned GetHash(const InvalidZeroValue&) { return 0; }
++ static bool Equal(const InvalidZeroValue&, const InvalidZeroValue&) {
++ return true;
++ }
++ };
++};
++
++template <typename Set>
++class ListOrLinkedHashSetInvalidZeroTest : public testing::Test {};
++
++using InvalidZeroValueSetTypes =
++ testing::Types<ListHashSet<InvalidZeroValue>,
++ ListHashSet<InvalidZeroValue, 1>,
++ LinkedHashSet<InvalidZeroValue>>;
++TYPED_TEST_SUITE(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValueSetTypes);
++
++TYPED_TEST(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValue) {
++ using Set = TypeParam;
++ Set set;
++ set.insert(InvalidZeroValue());
++}
++
+ } // namespace WTF
diff --git a/srcpkgs/chromium/patches/one_euro_filter.patch b/srcpkgs/chromium/patches/one_euro_filter.patch
new file mode 100644
index 00000000000..357babf1668
--- /dev/null
+++ b/srcpkgs/chromium/patches/one_euro_filter.patch
@@ -0,0 +1,11 @@
+--- third_party/one_euro_filter/src/one_euro_filter.h.orig 2019-09-29 21:21:03.958633609 -0400
++++ third_party/one_euro_filter/src/one_euro_filter.h 2019-09-29 21:21:54.128270940 -0400
+@@ -3,6 +3,8 @@
+
+ #include "low_pass_filter.h"
+
++#include <memory>
++
+ namespace one_euro_filter {
+ namespace test {
+ class OneEuroFilterTest;
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 6a35ada420d..304251bf6c9 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See http://www.chromium.org/developers/calendar for the latest version
-version=76.0.3809.132
+version=77.0.3865.90
revision=1
archs="i686 x86_64*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=d54e4640b5e399d170dffbc5bcff65157eb1b29314b94b5d808f727d9ce45241
+checksum=004cfdb1df74847bea8659bcaf8e039d51fe1101d42b6cf1c6cc346073fdefc3
lib32disabled=yes
nodebug=yes
@@ -246,7 +246,7 @@ do_install() {
vinstall out/Release/icudtl.dat 0644 usr/lib/chromium
- for size in 22 24 48 64 128 256; do
+ for size in 24 48 64 128 256; do
install -Dm644 "chrome/app/theme/chromium/product_logo_${size}.png" \
${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
done
From 853290d711ee5d31780c6c0ad38d87ffcc530612 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Sep 2019 20:24:50 -0400
Subject: [PATCH 2/2] chromium-widevine: update to 77.0.3865.90.
[ci skip]
---
srcpkgs/chromium-widevine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index a8e074fd168..ed8edd483e5 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
_channel="stable"
pkgname=chromium-widevine
-version=75.0.3770.142
+version=77.0.3865.90
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -17,7 +17,7 @@ depends="chromium binutils xz"
homepage="https://www.google.com/chrome"
repository=nonfree
distfiles="https://dl.google.com/linux/direct/google-chrome-${_channel}_${_chromeVersion}_amd64.deb"
-checksum=8a39e922d9d0f12b79949efc46c22021f89a8207670fa9493a366ad8231b343f
+checksum=f443503c88164f018ddb88247d2824431efcb863935ae476f4ada6218f41fdda
do_extract() {
:
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 77.0.3865.90.
2019-10-01 0:05 [PR PATCH] chromium: update to 77.0.3865.90 voidlinux-github
` (2 preceding siblings ...)
2019-10-01 0:26 ` voidlinux-github
@ 2019-10-01 0:26 ` voidlinux-github
2019-10-01 19:42 ` [PR PATCH] [Merged]: " voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-01 0:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 468 bytes --]
There is an updated pull request by pbui against master on the void-packages repository
https://github.com/pbui/void-packages chromium
https://github.com/void-linux/void-packages/pull/14862
chromium: update to 77.0.3865.90.
[ci skip]
- Update vaapi patch from Ubuntu/Debian patch.
- Add two build fix patches.
- Built for x86_64, x86_64-musl, i686
- Tested on x86_64
A patch file from https://github.com/void-linux/void-packages/pull/14862.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-14862.patch --]
[-- Type: text/x-diff, Size: 50795 bytes --]
From 135d998190f17e9e07460ebd48625d090f885e37 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Sep 2019 11:52:35 -0400
Subject: [PATCH 1/2] chromium: update to 77.0.3865.90.
[ci skip]
- Update vaapi patch from Ubuntu/Debian patch.
- Add two build fix patches.
- Built for x86_64, x86_64-musl, i686
- Tested on x86_64
---
.../files/musl-patches/no-mallinfo.patch | 12 +
.../patches/chromium-enable-vaapi.patch | 760 +++++++-----------
.../chromium/patches/harfbuzz-subset.patch | 49 ++
.../chromium/patches/linked-hash-set.patch | 130 +++
.../chromium/patches/one_euro_filter.patch | 11 +
srcpkgs/chromium/template | 6 +-
6 files changed, 516 insertions(+), 452 deletions(-)
create mode 100644 srcpkgs/chromium/patches/harfbuzz-subset.patch
create mode 100644 srcpkgs/chromium/patches/linked-hash-set.patch
create mode 100644 srcpkgs/chromium/patches/one_euro_filter.patch
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 461c90cb0af..288f8670c06 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -42,3 +42,15 @@ index 0eb5c1f..8af7799 100644
mi = ::mallinfo();
return mi.uordblks;
+--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400
++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400
+@@ -122,7 +122,9 @@
+ /* #undef HAVE_MALLCTL */
+
+ /* Define to 1 if you have the `mallinfo' function. */
++#if defined(__GLIBC__)
+ #define HAVE_MALLINFO 1
++#endif
+
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #define HAVE_MALLOC_H 1
diff --git a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
index d1cb7b4be59..01c253de5ff 100644
--- a/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
+++ b/srcpkgs/chromium/patches/chromium-enable-vaapi.patch
@@ -1,165 +1,107 @@
---- chrome/browser/about_flags.cc.orig 2019-07-29 16:35:46.000000000 -0400
-+++ chrome/browser/about_flags.cc 2019-07-31 13:54:18.350186083 -0400
-@@ -1119,12 +1119,14 @@
- {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
- flag_descriptions::kUiPartialSwapDescription, kOsAll,
- SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
- flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
- {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
- flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
-+#endif
- #if !defined(OS_ANDROID)
- {"enable-reader-mode", flag_descriptions::kEnableReaderModeName,
- flag_descriptions::kEnableReaderModeDescription, kOsDesktop,
-@@ -1446,6 +1448,13 @@
- flag_descriptions::kEnableVirtualDesksDescription, kOsCrOS,
- FEATURE_VALUE_TYPE(ash::features::kVirtualDesks)},
- #endif // OS_CHROMEOS
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ {
-+ "enable-accelerated-video", flag_descriptions::kAcceleratedVideoName,
-+ flag_descriptions::kAcceleratedVideoDescription, kOsLinux,
-+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedVideo),
-+ },
-+#else
- {
+From 53b93dfe87fd10cced5d2a2a63072dfc7a2af6e4 Mon Sep 17 00:00:00 2001
+From: Daniel Charles <daniel.charles@intel.com>
+Date: Fri, 28 Jul 2017 16:31:47 -0700
+Subject: [PATCH] Enable VAVDA, VAVEA and VAJDA on linux with VAAPI only
+
+This patch contains all the changes necessary to use VA-API along with
+vaapi-driver to run all media use cases supported with hardware acceleration.
+
+It is intended to remain as experimental accessible from chrome://flags on linux.
+It requires libva/intel-vaapi-driver to be installed on the system path where
+chrome is executed. Other drivers could be tested if available. Flags are
+kept independent for linux, where this feature has to be enabled before
+actually using it. This should not change how other OSes use the flags
+already, the new flags will show at the buttom on the section of unavailable
+experiments
+
+The changes cover a range of compiler pre-processor flags to enable the stack.
+It moves the presandbox operations to the vaapi_wrapper class as the hook function
+is available there. vaInit will open driver on the correct installed folder.
+
+chrome flags consolidtation into only two flags for linux. Mjpeg and accelerated
+video are used. The other flags are kept for ChromeOS and other OSes.
+
+Developer testing was made on skylake hardware, ChromeOS and Ubuntu.
+
+BUG=NONE
+TEST="subjective testing with VAVDA,VAVEA and VAJDA, autotest for encoder"
+TEST="and decoder hardware accelerated"
+TEST="have libva/intel-vaapi-driver installed and not installed in the system"
+TEST="repeat on different hardware families"
+R=posciak@chromium.org
+R=kcwu@chromium.org
+
+Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
+Change-Id: Ifbbf5c9e5221a8b5733fc6d4d0cf984a1f103171
+Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+---
+
+Index: dev/chrome/browser/about_flags.cc
+===================================================================
+--- chrome/browser/about_flags.cc
++++ chrome/browser/about_flags.cc
+@@ -1527,7 +1527,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -1453,6 +1462,7 @@
- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
+ flag_descriptions::kAcceleratedVideoDecodeDescription,
+- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
++ kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
-+#endif
- {"enable-history-favicons-google-server-query",
- flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryName,
- flag_descriptions::kEnableHistoryFaviconsGoogleServerQueryDescription,
-@@ -1883,7 +1892,12 @@
+ {
+@@ -1993,10 +1993,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
- #endif // ENABLE_ISOLATED_XR_SERVICE
+ #endif // !defined(OS_ANDROID)
#endif // ENABLE_VR
-#if defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ {"enable-accelerated-mjpeg-decode",
-+ flag_descriptions::kAcceleratedMjpegDecodeName,
-+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsLinux,
-+ SINGLE_VALUE_TYPE(switches::kEnableAcceleratedMjpegDecode)},
-+#elif defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
{"disable-accelerated-mjpeg-decode",
flag_descriptions::kAcceleratedMjpegDecodeName,
- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
---- chrome/browser/chromeos/login/chrome_restart_request.cc.orig 2019-07-29 16:35:47.000000000 -0400
-+++ chrome/browser/chromeos/login/chrome_restart_request.cc 2019-07-31 13:58:47.201085960 -0400
-@@ -20,6 +20,7 @@
- #include "base/system/sys_info.h"
- #include "base/timer/timer.h"
- #include "base/values.h"
-+#include "build/build_config.h"
- #include "cc/base/switches.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/chromeos/boot_times_recorder.h"
-@@ -84,9 +85,14 @@
- ::switches::kBlinkSettings,
- ::switches::kDisable2dCanvasImageChromium,
- ::switches::kDisableAccelerated2dCanvas,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ ::switches::kEnableAcceleratedMjpegDecode,
-+ ::switches::kEnableAcceleratedVideo,
-+#else
- ::switches::kDisableAcceleratedMjpegDecode,
- ::switches::kDisableAcceleratedVideoDecode,
- ::switches::kDisableAcceleratedVideoEncode,
-+#endif
- ::switches::kDisableBlinkFeatures,
- ::switches::kDisableGpu,
- ::switches::kDisableGpuMemoryBufferVideoFrames,
-@@ -158,8 +164,10 @@
- ::switches::kEnableWebGLImageChromium,
- ::switches::kEnableWebVR,
- ::switches::kEnableUnsafeWebGPU,
-+#if (defined(OS_CHROMEOS) || defined(OS_ANDROID))
- ::switches::kDisableWebRtcHWDecoding,
- ::switches::kDisableWebRtcHWEncoding,
-+#endif
- ::switches::kOzonePlatform,
- ash::switches::kAshEnableTabletMode,
- ash::switches::kAshEnableWaylandServer,
-diff -ur chrome/browser/flag_descriptions.cc chromium-69.0.3497.92/chrome/browser/flag_descriptions.cc
---- chrome/browser/flag_descriptions.cc.orig 2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.cc 2019-07-02 12:27:47.137866754 -0400
-@@ -14,6 +14,13 @@
- "Enables the use of the GPU to perform 2d canvas rendering instead of "
- "using software rendering.";
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+const char kAcceleratedVideoName[] = "Hardware-accelerated video";
-+const char kAcceleratedVideoDescription[] =
-+ "Hardware-accelerated video where VA-API driver is installed on the"
-+ "system.";
-+#endif
-+
- const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
- const char kAcceleratedVideoDecodeDescription[] =
- "Hardware-accelerated video decode where available.";
-@@ -2081,6 +2088,7 @@
- const char kWebrtcHybridAgcDescription[] =
- "WebRTC Agc2 digital adaptation with Agc1 analog adaptation.";
-
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
- const char kWebrtcHwDecodingDescription[] =
- "Support in WebRTC for decoding video streams using platform hardware.";
-@@ -2088,6 +2096,7 @@
- const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
- const char kWebrtcHwEncodingDescription[] =
- "Support in WebRTC for encoding video streams using platform hardware.";
-+#endif
-
- const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
- const char kWebrtcHwH264EncodingDescription[] =
-@@ -2943,14 +2952,16 @@
+- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
++ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
+ SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
+ #endif // OS_CHROMEOS
+ {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
+Index: dev/chrome/browser/flag_descriptions.cc
+===================================================================
+--- chrome/browser/flag_descriptions.cc
++++ chrome/browser/flag_descriptions.cc
+@@ -2880,9 +2880,7 @@ const char kMacSystemMediaPermissionsInf
- // Chrome OS -------------------------------------------------------------------
+ #endif
+-// Chrome OS -------------------------------------------------------------------
+-
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
- const char kAcceleratedMjpegDecodeDescription[] =
+@@ -2890,6 +2888,12 @@ const char kAcceleratedMjpegDecodeDescri
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
-+#endif
++#endif
++
++// Chrome OS -------------------------------------------------------------------
++
+#if defined(OS_CHROMEOS)
++
const char kAppServiceAshName[] = "App Service Ash";
const char kAppServiceAshDescription[] =
"Use the App Service to provide data to the Ash UI, such as the shelf and "
-diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser/flag_descriptions.h
---- chrome/browser/flag_descriptions.h.orig 2019-06-18 11:47:50.000000000 -0400
-+++ chrome/browser/flag_descriptions.h 2019-07-02 12:29:46.200214795 -0400
-@@ -43,6 +43,10 @@
- extern const char kAccelerated2dCanvasName[];
- extern const char kAccelerated2dCanvasDescription[];
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+extern const char kAcceleratedVideoName[];
-+extern const char kAcceleratedVideoDescription[];
-+#endif
- extern const char kAcceleratedVideoDecodeName[];
- extern const char kAcceleratedVideoDecodeDescription[];
-
-@@ -1765,13 +1769,17 @@
+Index: dev/chrome/browser/flag_descriptions.h
+===================================================================
+--- chrome/browser/flag_descriptions.h
++++ chrome/browser/flag_descriptions.h
+@@ -1715,13 +1715,17 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)
-// Chrome OS ------------------------------------------------------------------
-
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
@@ -173,234 +115,32 @@ diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser
extern const char kAppServiceAshName[];
extern const char kAppServiceAshDescription[];
-diff -ur content/browser/gpu/compositor_util.cc chromium-69.0.3497.92/content/browser/gpu/compositor_util.cc
---- content/browser/gpu/compositor_util.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/gpu/compositor_util.cc 2018-09-13 22:10:34.072012092 +0530
-@@ -149,7 +149,11 @@
- {"video_decode",
- SafeGetFeatureStatus(gpu_feature_info,
- gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ !command_line.HasSwitch(switches::kEnableAcceleratedVideo),
-+#else
- command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
-+#endif
- "Accelerated video decode has been disabled, either via blacklist, "
- "about:flags or the command line.",
- true, true},
---- content/browser/gpu/gpu_process_host.cc.orig 2019-07-31 14:16:52.304849119 -0400
-+++ content/browser/gpu/gpu_process_host.cc 2019-07-31 14:19:22.567480008 -0400
-@@ -208,7 +208,9 @@
- switches::kDisableLogging,
- switches::kDisableShaderNameHashing,
- switches::kDisableSkiaRuntimeOpts,
-+#if !defined(OS_LINUX)
- switches::kDisableWebRtcHWEncoding,
-+#endif
- switches::kEnableGpuRasterization,
- switches::kEnableLogging,
- switches::kEnableVizDevTools,
-diff -ur content/browser/renderer_host/media/video_capture_browsertest.cc chromium-69.0.3497.92/content/browser/renderer_host/media/video_capture_browsertest.cc
---- content/browser/renderer_host/media/video_capture_browsertest.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/renderer_host/media/video_capture_browsertest.cc 2018-09-13 22:10:34.124010499 +0530
-@@ -165,8 +165,13 @@
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kUseFakeJpegDecodeAccelerator);
- } else {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
-+ switches::kEnableAcceleratedMjpegDecode);
-+#else
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kDisableAcceleratedMjpegDecode);
-+#endif
- }
- }
-
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-07-29 16:36:09.000000000 -0400
-+++ content/browser/renderer_host/render_process_host_impl.cc 2019-07-31 14:04:18.859680348 -0400
-@@ -2937,7 +2937,11 @@
- switches::kDefaultTileHeight,
- switches::kDisable2dCanvasImageChromium,
- switches::kDisableYUVImageDecoding,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ switches::kEnableAcceleratedVideo,
-+#else
- switches::kDisableAcceleratedVideoDecode,
-+#endif
- switches::kDisableBackgroundTimerThrottling,
- switches::kDisableBestEffortTasks,
- switches::kDisableBreakpad,
-@@ -3077,8 +3081,10 @@
- #if BUILDFLAG(ENABLE_PLUGINS)
- switches::kEnablePepperTesting,
- #endif
-+#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
- switches::kDisableWebRtcHWDecoding,
- switches::kDisableWebRtcHWEncoding,
-+#endif
- switches::kEnableWebRtcSrtpAesGcm,
- switches::kEnableWebRtcSrtpEncryptedHeaders,
- switches::kEnableWebRtcStunOrigin,
-diff -ur content/browser/utility_process_host.cc chromium-69.0.3497.92/content/browser/utility_process_host.cc
---- content/browser/utility_process_host.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/utility_process_host.cc 2018-09-13 22:10:34.296005227 +0530
-@@ -296,7 +296,11 @@
- switches::kOverrideUseSoftwareGLForTests,
- switches::kOverrideEnabledCdmInterfaceVersion,
- switches::kProxyServer,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ switches::kEnableAcceleratedMjpegDecode,
-+#else
- switches::kDisableAcceleratedMjpegDecode,
-+#endif
- switches::kUseFakeDeviceForMediaStream,
- switches::kUseFakeJpegDecodeAccelerator,
- switches::kUseFileForFakeVideoCapture,
-diff -ur content/browser/webrtc/webrtc_media_recorder_browsertest.cc chromium-69.0.3497.92/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
---- content/browser/webrtc/webrtc_media_recorder_browsertest.cc 2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/webrtc/webrtc_media_recorder_browsertest.cc 2018-09-13 22:10:34.143009916 +0530
-@@ -66,7 +66,12 @@
- return;
- // This flag is also used for encoding, https://crbug.com/616640.
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
-- switches::kDisableAcceleratedVideoDecode);
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ switches::kEnableAcceleratedVideo
-+#else
-+ switches::kDisableAcceleratedVideoDecode
-+#endif
-+ );
- }
-
- private:
-diff -ur content/gpu/BUILD.gn chromium-69.0.3497.92/content/gpu/BUILD.gn
---- content/gpu/BUILD.gn 2018-09-12 00:39:41.000000000 +0530
-+++ content/gpu/BUILD.gn 2018-09-13 22:10:34.148009763 +0530
-@@ -133,4 +133,8 @@
+Index: dev/content/gpu/BUILD.gn
+===================================================================
+--- content/gpu/BUILD.gn
++++ content/gpu/BUILD.gn
+@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
+ import("//build/config/ui.gni")
+ import("//gpu/vulkan/features.gni")
+ import("//media/media_options.gni")
++import("//media/gpu/args.gni")
+ import("//ui/ozone/ozone.gni")
+
+ # See //content/BUILD.gn for how this works.
+@@ -128,4 +129,8 @@ target(link_target_type, "gpu_sources")
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
+
-+ if (is_desktop_linux) {
-+ public_configs = [ "//media/gpu:libva_config" ]
++ if (is_desktop_linux && use_vaapi) {
++ public_configs = [ "//build/config/linux/libva" ]
+ }
}
-diff -ur content/gpu/gpu_main.cc chromium-69.0.3497.92/content/gpu/gpu_main.cc
---- content/gpu/gpu_main.cc 2019-07-02 09:50:13.403486804 -0400
-+++ content/gpu/gpu_main.cc 2019-07-02 09:55:07.256818723 -0400
-@@ -288,7 +288,7 @@
-
- base::PlatformThread::SetName("CrGpuMain");
-
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
- // Set thread priority before sandbox initialization.
- base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
- #endif
-@@ -321,7 +321,7 @@
- GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
-
- base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(USE_OZONE)
-+#if defined(OS_LINUX)
- io_thread_priority = base::ThreadPriority::DISPLAY;
- #endif
-
-diff -ur content/public/browser/gpu_utils.cc chromium-69.0.3497.92/content/public/browser/gpu_utils.cc
---- content/public/browser/gpu_utils.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/browser/gpu_utils.cc 2018-09-13 22:10:34.164009273 +0530
-@@ -57,9 +57,17 @@
- gpu_preferences.in_process_gpu =
- command_line->HasSwitch(switches::kInProcessGPU);
- gpu_preferences.disable_accelerated_video_decode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
- command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
-+#endif
- gpu_preferences.disable_accelerated_video_encode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
- command_line->HasSwitch(switches::kDisableAcceleratedVideoEncode);
-+#endif
- #if defined(OS_WIN)
- uint32_t enable_accelerated_vpx_decode_val =
- gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
-diff -ur content/public/common/content_switches.cc chromium-69.0.3497.92/content/public/common/content_switches.cc
---- content/public/common/content_switches.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.cc 2018-09-13 22:10:34.172009028 +0530
-@@ -79,6 +79,11 @@
- // Disable gpu-accelerated 2d canvas.
- const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas";
-
-+#if defined(OS_LINUX)
-+// Enables hardware acceleration of video for Linux only. VA-API driver
-+// is required to be present on the system installation.
-+const char kEnableAcceleratedVideo[] = "enable-accelerated-video";
-+#endif
- // Disables hardware acceleration of video decode, where available.
- const char kDisableAcceleratedVideoDecode[] =
- "disable-accelerated-video-decode";
-@@ -868,11 +873,13 @@
- // ignores this switch on its stable and beta channels.
- const char kDisableWebRtcEncryption[] = "disable-webrtc-encryption";
-
-+#if defined(OS_CHROMEOS)
- // Disables HW decode acceleration for WebRTC.
- const char kDisableWebRtcHWDecoding[] = "disable-webrtc-hw-decoding";
-
- // Disables HW encode acceleration for WebRTC.
- const char kDisableWebRtcHWEncoding[] = "disable-webrtc-hw-encoding";
-+#endif
-
- // Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC.
- // See https://tools.ietf.org/html/rfc7714 for further information.
-diff -ur content/public/common/content_switches.h chromium-69.0.3497.92/content/public/common/content_switches.h
---- content/public/common/content_switches.h 2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.h 2018-09-13 22:10:34.172009028 +0530
-@@ -104,6 +104,9 @@
- CONTENT_EXPORT extern const char kDomAutomationController[];
- extern const char kDisable2dCanvasClipAntialiasing[];
- CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+CONTENT_EXPORT extern const char kEnableAcceleratedVideo[];
-+#endif
- CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[];
- CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
- CONTENT_EXPORT extern const char kEnableAutomation[];
-@@ -241,8 +244,10 @@
- CONTENT_EXPORT extern const char kWaitForDebuggerChildren[];
-
- CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
-+#if defined(OS_CHROMEOS)
- CONTENT_EXPORT extern const char kDisableWebRtcHWDecoding[];
- CONTENT_EXPORT extern const char kDisableWebRtcHWEncoding[];
-+#endif
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
- CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
-diff -ur content/renderer/render_thread_impl.cc chromium-69.0.3497.92/content/renderer/render_thread_impl.cc
---- content/renderer/render_thread_impl.cc 2018-09-12 00:39:42.000000000 +0530
-+++ content/renderer/render_thread_impl.cc 2018-09-13 22:10:34.192008415 +0530
-@@ -1441,7 +1441,11 @@
- kGpuStreamPriorityMedia);
-
- const bool enable_video_accelerator =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+ cmd_line->HasSwitch(switches::kEnableAcceleratedVideo) &&
-+#else
- !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-+#endif
- (gpu_channel_host->gpu_feature_info()
- .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
- gpu::kGpuFeatureStatusEnabled);
-Only in content/renderer: render_thread_impl.cc.orig
-diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/config/software_rendering_list.json
---- gpu/config/software_rendering_list.json 2018-09-12 00:39:44.000000000 +0530
-+++ gpu/config/software_rendering_list.json 2018-09-13 22:10:34.193008384 +0530
-@@ -377,17 +377,6 @@
+Index: dev/gpu/config/software_rendering_list.json
+===================================================================
+--- gpu/config/software_rendering_list.json
++++ gpu/config/software_rendering_list.json
+@@ -369,17 +369,6 @@
]
},
{
@@ -418,119 +158,241 @@ diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/confi
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
"cr_bugs": [145531, 332596, 571899, 629434],
-diff -ur media/base/media_switches.cc chromium-69.0.3497.92/media/base/media_switches.cc
---- media/base/media_switches.cc.orig 2019-06-18 11:48:14.000000000 -0400
-+++ media/base/media_switches.cc 2019-07-02 12:32:22.370983036 -0400
-@@ -103,10 +103,15 @@
- const char kUseFakeMjpegDecodeAccelerator[] =
- "use-fake-mjpeg-decode-accelerator";
-
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+// Enable hardware accelerated mjpeg decode on linux
-+const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode";
-+#else
- // Disable hardware acceleration of mjpeg decode for captured frame, where
- // available.
- const char kDisableAcceleratedMjpegDecode[] =
- "disable-accelerated-mjpeg-decode";
-+#endif
-
- // When running tests on a system without the required hardware or libraries,
- // this flag will cause the tests to fail. Otherwise, they silently succeed.
-@@ -503,15 +508,21 @@
- };
-
- bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-+ switches::kEnableAcceleratedMjpegDecode)
-+#else
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-- switches::kDisableAcceleratedMjpegDecode)) {
-+ switches::kDisableAcceleratedMjpegDecode)
-+#endif
-+ ) {
- return false;
- }
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+Index: dev/media/base/media_switches.cc
+===================================================================
+--- media/base/media_switches.cc
++++ media/base/media_switches.cc
+@@ -544,7 +544,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
switches::kUseFakeMjpegDecodeAccelerator)) {
return true;
}
-#if defined(OS_CHROMEOS)
-+#if !defined(OS_ANDROID) && defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_ANDROID)
return true;
#endif
return false;
-diff -ur media/base/media_switches.h chromium-69.0.3497.92/media/base/media_switches.h
---- media/base/media_switches.h.orig 2019-07-02 12:20:39.902984488 -0400
-+++ media/base/media_switches.h 2019-07-02 12:33:45.441923602 -0400
-@@ -60,7 +60,11 @@
- MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
- MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[];
- MEDIA_EXPORT extern const char kUseFakeMjpegDecodeAccelerator[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+MEDIA_EXPORT extern const char kEnableAcceleratedMjpegDecode[];
-+#else
- MEDIA_EXPORT extern const char kDisableAcceleratedMjpegDecode[];
-+#endif
-
- MEDIA_EXPORT extern const char kRequireAudioHardwareForTesting[];
- MEDIA_EXPORT extern const char kMuteAudio[];
---- media/gpu/BUILD.gn.orig 2019-07-29 16:36:19.000000000 -0400
-+++ media/gpu/BUILD.gn 2019-07-31 14:09:28.093032826 -0400
-@@ -495,6 +495,14 @@
+Index: dev/media/filters/BUILD.gn
+===================================================================
+--- media/filters/BUILD.gn
++++ media/filters/BUILD.gn
+@@ -5,6 +5,7 @@
+ import("//build/config/jumbo.gni")
+ import("//media/media_options.gni")
+ import("//third_party/libaom/options.gni")
++import("//media/gpu/args.gni")
+
+ jumbo_source_set("filters") {
+ # Do not expand the visibility here without double-checking with OWNERS, this
+@@ -196,7 +197,7 @@ jumbo_source_set("filters") {
+ deps += [ "//media/base/android" ]
}
- }
-+if (is_desktop_linux && use_vaapi) {
-+ import("//build/config/linux/pkg_config.gni")
-+
-+ pkg_config("libva_config") {
-+ packages = [ "libva" ]
-+ }
-+}
-+
- if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
- test("video_encode_accelerator_unittest") {
- deps = [
-@@ -525,6 +533,10 @@
+- if (current_cpu != "arm" && is_linux) {
++ if (use_vaapi) {
+ sources += [
+ "h264_bitstream_buffer.cc",
+ "h264_bitstream_buffer.h",
+Index: dev/media/gpu/BUILD.gn
+===================================================================
+--- media/gpu/BUILD.gn
++++ media/gpu/BUILD.gn
+@@ -531,6 +531,7 @@ if (use_v4l2_codec || use_vaapi || is_ma
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
-+
-+ if (is_desktop_linux) {
-+ public_configs = [ ":libva_config" ]
-+ }
++ public_configs = [ "//build/config/linux/libva" ]
}
}
---- content/renderer/media/webrtc/video_codec_factory.cc.orig 2019-07-02 16:39:57.973241977 -0400
-+++ content/renderer/media/webrtc/video_codec_factory.cc 2019-07-02 17:00:00.656342711 -0400
-@@ -187,8 +187,11 @@
- std::unique_ptr<webrtc::VideoEncoderFactory> encoder_factory;
+Index: dev/media/gpu/gpu_video_decode_accelerator_factory.cc
+===================================================================
+--- media/gpu/gpu_video_decode_accelerator_factory.cc
++++ media/gpu/gpu_video_decode_accelerator_factory.cc
+@@ -171,6 +171,8 @@ GpuVideoDecodeAcceleratorFactory::Create
+ vda = (this->*create_vda_function)(workarounds, gpu_preferences, media_log);
+ if (vda && vda->Initialize(config, client))
+ return vda;
++ else
++ LOG(ERROR) << "Initialization of one or more VDAs failed.";
+ }
- const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-- if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
-- !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
-+ if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()
-+#if defined(OS_CHROMEOS)
-+ && !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)
+ return nullptr;
+@@ -229,6 +231,7 @@ GpuVideoDecodeAcceleratorFactory::Create
+ const gpu::GpuDriverBugWorkarounds& workarounds,
+ const gpu::GpuPreferences& gpu_preferences,
+ MediaLog* media_log) const {
++ LOG(WARNING) << "Initializing VAAPI VDA.";
+ std::unique_ptr<VideoDecodeAccelerator> decoder;
+ decoder.reset(new VaapiVideoDecodeAccelerator(make_context_current_cb_,
+ bind_image_cb_));
+Index: dev/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/ipc/service/gpu_video_decode_accelerator.cc
++++ media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+@@ -380,6 +380,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+ LOG(ERROR) << "Failed creating the VDA factory";
+ return false;
+ }
++ LOG(WARNING) << "Created the VDA factory";
+
+ const gpu::GpuDriverBugWorkarounds& gpu_workarounds =
+ stub_->channel()->gpu_channel_manager()->gpu_driver_bug_workarounds();
+@@ -393,6 +394,7 @@ bool GpuVideoDecodeAccelerator::Initiali
+ << (config.is_encrypted() ? " with encryption" : "");
+ return false;
+ }
++ LOG(WARNING) << "Created VDA";
+
+ // Attempt to set up performing decoding tasks on IO thread, if supported by
+ // the VDA.
+Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_video_decode_accelerator.cc
++++ media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+@@ -64,6 +64,7 @@ void ReportToUMA(VAVDADecoderFailure fai
+ VAVDA_DECODER_FAILURES_MAX + 1);
+ }
+
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
+ // Lake) Cpu platform id's are referenced from the following file in kernel
+ // source arch/x86/include/asm/intel-family.h
+@@ -76,6 +77,7 @@ bool IsGeminiLakeOrLater() {
+ cpuid.model() >= kGeminiLakeModelId;
+ return is_geminilake_or_later;
+ }
+#endif
-+ ) {
- encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
+
+ } // namespace
+
+@@ -632,6 +634,10 @@ void VaapiVideoDecodeAccelerator::Assign
+ va_surface_format_ = GetVaFormatForVideoCodecProfile(profile_);
+ std::vector<VASurfaceID> va_surface_ids;
+
++ // Nvidia doesn't support VAProfileNone, so don't try to create a temporary
++ // copy buffer there. It's not needed anyways for hardware video decoding
++ // to work.
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // If we aren't in BufferAllocationMode::kNone, we have to allocate a
+ // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
+ // internal decoded frame.
+@@ -645,15 +651,20 @@ void VaapiVideoDecodeAccelerator::Assign
+ NotifyError(PLATFORM_FAILURE);
+ }
}
++#endif
-@@ -205,8 +208,11 @@
- std::unique_ptr<webrtc::VideoDecoderFactory> decoder_factory;
+ for (size_t i = 0; i < buffers.size(); ++i) {
+ // If we aren't in BufferAllocationMode::kNone, this |picture| is
+ // only used as a copy destination. Therefore, the VaapiWrapper used and
+ // owned by |picture| is |vpp_vaapi_wrapper_|.
+ std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++ vaapi_wrapper_,
++#else
+ (buffer_allocation_mode_ == BufferAllocationMode::kNone)
+ ? vaapi_wrapper_
+ : vpp_vaapi_wrapper_,
++#endif
+ make_context_current_cb_, bind_image_cb_, buffers[i]);
+ RETURN_AND_NOTIFY_ON_FAILURE(picture, "Failed creating a VaapiPicture",
+ PLATFORM_FAILURE, );
+@@ -1078,6 +1089,9 @@ VaapiVideoDecodeAccelerator::GetSupporte
+
+ VaapiVideoDecodeAccelerator::BufferAllocationMode
+ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
++#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
++ return BufferAllocationMode::kNormal;
++#else
+ // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
+ // |output_mode_| as well.
+ if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
+@@ -1113,6 +1127,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+ return BufferAllocationMode::kReduced;
- const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-- if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
-- !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)) {
-+ if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()
-+#if defined(OS_CHROMEOS)
-+ && !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)
+ return BufferAllocationMode::kSuperReduced;
+#endif
-+ ) {
- decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
+ }
+
+ bool VaapiVideoDecodeAccelerator::IsBufferAllocationModeReducedOrSuperReduced()
+Index: dev/media/gpu/vaapi/vaapi_wrapper.cc
+===================================================================
+--- media/gpu/vaapi/vaapi_wrapper.cc
++++ media/gpu/vaapi/vaapi_wrapper.cc
+@@ -324,6 +324,11 @@ void VADisplayState::PreSandboxInitializ
+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+ if (drm_file.IsValid())
+ VADisplayState::Get()->SetDrmFd(drm_file.GetPlatformFile());
++
++ const char kNvidiaPath[] = "/dev/dri/nvidiactl";
++ base::File nvidia_file = base::File(
++ base::FilePath::FromUTF8Unsafe(kNvidiaPath),
++ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
+ }
+
+ VADisplayState::VADisplayState()
+@@ -351,10 +356,6 @@ bool VADisplayState::Initialize() {
+ }
+
+ bool VADisplayState::InitializeOnce() {
+- static_assert(
+- VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
+- "Requires VA-API >= 1.1.0");
+-
+ switch (gl::GetGLImplementation()) {
+ case gl::kGLImplementationEGLGLES2:
+ va_display_ = vaGetDisplayDRM(drm_fd_.get());
+@@ -362,10 +363,10 @@ bool VADisplayState::InitializeOnce() {
+ case gl::kGLImplementationDesktopGL:
+ #if defined(USE_X11)
+ va_display_ = vaGetDisplay(gfx::GetXDisplay());
+-#else
+- LOG(WARNING) << "VAAPI video acceleration not available without "
+- "DesktopGL (GLX).";
++ if (vaDisplayIsValid(va_display_))
++ break;
+ #endif // USE_X11
++ va_display_ = vaGetDisplayDRM(drm_fd_.get());
+ break;
+ // Cannot infer platform from GL, try all available displays
+ case gl::kGLImplementationNone:
+@@ -398,8 +399,19 @@ bool VADisplayState::InitializeOnce() {
+ int major_version, minor_version;
+ VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
+ if (va_res != VA_STATUS_SUCCESS) {
+- LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res);
+- return false;
++ LOG(ERROR) << "vaInitialize failed (ignore if using Wayland desktop environment): " << vaErrorStr(va_res);
++ va_display_ = vaGetDisplayDRM(drm_fd_.get());
++ if (!vaDisplayIsValid(va_display_)) {
++ LOG(ERROR) << "Could not get a valid DRM VA display";
++ return false;
++ }
++ va_res = vaInitialize(va_display_, &major_version, &minor_version);
++ if (va_res != VA_STATUS_SUCCESS) {
++ LOG(ERROR) << "vaInitialize failed using DRM: " << vaErrorStr(va_res);
++ return false;
++ } else {
++ LOG(WARNING) << "vaInitialize succeeded for DRM";
++ }
}
+ va_initialized_ = true;
+@@ -407,7 +419,7 @@ bool VADisplayState::InitializeOnce() {
+ va_vendor_string_ = vaQueryVendorString(va_display_);
+ DLOG_IF(WARNING, va_vendor_string_.empty())
+ << "Vendor string empty or error reading.";
+- DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
++ VLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
+ << va_vendor_string_;
+
+ // The VAAPI version is determined from what is loaded on the system by
+@@ -742,7 +754,7 @@ bool VASupportedProfiles::AreAttribsSupp
+ 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
++ VLOG(1) << "Unsupported value " << required_attribs[i].value
+ << " for attribute type " << required_attribs[i].type;
+ return false;
+ }
diff --git a/srcpkgs/chromium/patches/harfbuzz-subset.patch b/srcpkgs/chromium/patches/harfbuzz-subset.patch
new file mode 100644
index 00000000000..6f228b774d4
--- /dev/null
+++ b/srcpkgs/chromium/patches/harfbuzz-subset.patch
@@ -0,0 +1,49 @@
+From 27e25336b8316ff3ec4e464058682ed85801fd06 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Mon, 29 Jul 2019 10:54:28 +0000
+Subject: [PATCH] Also link against libharfbuzz-subset when use_system_harfbuzz is true
+
+When building HarfBuzz as part of Chromium, there is a single source set
+with all the files we need in the build.
+
+Upstream HarfBuzz, on the other hand, produces a few different libraries:
+harfbuzz, harfbuzz-icu and harfbuzz-subset. When |use_system_harfbuzz| is
+true, we were only looking for (and using) harfbuzz.pc with pkg-config even
+though we also use symbols from libharfbuzz-subset.so. This resulted in
+errors when linking:
+
+ ld: obj/skia/skia/SkPDFSubsetFont.o: in function `SkPDFSubsetFont(sk_sp<SkData>, SkPDFGlyphUse const&, SkPDF::Metadata::Subsetter, char const*, int)':
+ SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x48a): undefined reference to `hb_subset_input_create_or_fail'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x4af): undefined reference to `hb_subset_input_glyph_set'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5d7): undefined reference to `hb_subset_input_set_retain_gids'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5e4): undefined reference to `hb_subset_input_set_drop_hints'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5f3): undefined reference to `hb_subset'
+ ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x66f): undefined reference to `hb_subset_input_destroy'
+
+as reported in
+https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ
+
+Change-Id: I997af075c7b7263cd7cc71a63db5b0f93bd1ab59
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715288
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Commit-Queue: Dominik Röttsches <drott@chromium.org>
+Reviewed-by: Dominik Röttsches <drott@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#681760}
+---
+
+diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
+index 37d8e33..72013eb1d 100644
+--- third_party/harfbuzz-ng/BUILD.gn
++++ third_party/harfbuzz-ng/BUILD.gn
+@@ -16,7 +16,10 @@
+ "//third_party:freetype_harfbuzz",
+ "//third_party/freetype:freetype_source",
+ ]
+- packages = [ "harfbuzz" ]
++ packages = [
++ "harfbuzz",
++ "harfbuzz-subset",
++ ]
+ }
+ } else {
+ config("harfbuzz_config") {
diff --git a/srcpkgs/chromium/patches/linked-hash-set.patch b/srcpkgs/chromium/patches/linked-hash-set.patch
new file mode 100644
index 00000000000..24b13d8a5c0
--- /dev/null
+++ b/srcpkgs/chromium/patches/linked-hash-set.patch
@@ -0,0 +1,130 @@
+From 74138b9febd37eac0fc26b8efb110014a83a52c6 Mon Sep 17 00:00:00 2001
+From: Jeremy Roman <jbroman@chromium.org>
+Date: Wed, 07 Aug 2019 13:26:48 +0000
+Subject: [PATCH] WTF: Make LinkedHashSet understand values for which memset initialization would be bad.
+
+Includes a unit test which fails before, and uses this to fix FontCacheKeyTraits.
+
+Bug: 980025
+Change-Id: If41f97444c7fd37b9b95d6dadaf3da5689079e9e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739948
+Reviewed-by: Kentaro Hara <haraken@chromium.org>
+Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
+Commit-Queue: Jeremy Roman <jbroman@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#684731}
+---
+
+diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h b/third_party/blink/renderer/platform/fonts/font_cache_key.h
+index 0efc8fb..90063cb 100644
+--- third_party/blink/renderer/platform/fonts/font_cache_key.h
++++ third_party/blink/renderer/platform/fonts/font_cache_key.h
+@@ -133,6 +133,10 @@
+
+ struct FontCacheKeyTraits : WTF::SimpleClassHashTraits<FontCacheKey> {
+ STATIC_ONLY(FontCacheKeyTraits);
++
++ // std::string's empty state need not be zero in all implementations,
++ // and it is held within FontFaceCreationParams.
++ static const bool kEmptyValueIsZero = false;
+ };
+
+ } // namespace blink
+diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h
+index b35b6e9..77e524c 100644
+--- third_party/blink/renderer/platform/wtf/linked_hash_set.h
++++ third_party/blink/renderer/platform/wtf/linked_hash_set.h
+@@ -146,6 +146,11 @@
+ LinkedHashSetNodeBase* next)
+ : LinkedHashSetNodeBase(prev, next), value_(value) {}
+
++ LinkedHashSetNode(ValueArg&& value,
++ LinkedHashSetNodeBase* prev,
++ LinkedHashSetNodeBase* next)
++ : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {}
++
+ LinkedHashSetNode(LinkedHashSetNode&& other)
+ : LinkedHashSetNodeBase(std::move(other)),
+ value_(std::move(other.value_)) {}
+@@ -445,10 +450,13 @@
+
+ // The slot is empty when the next_ field is zero so it's safe to zero
+ // the backing.
+- static const bool kEmptyValueIsZero = true;
++ static const bool kEmptyValueIsZero = ValueTraits::kEmptyValueIsZero;
+
+ static const bool kHasIsEmptyValueFunction = true;
+ static bool IsEmptyValue(const Node& node) { return !node.next_; }
++ static Node EmptyValue() {
++ return Node(ValueTraits::EmptyValue(), nullptr, nullptr);
++ }
+
+ static const int kDeletedValue = -1;
+
+diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+index 4c3f899..cd1be00 100644
+--- third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
++++ third_party/blink/renderer/platform/wtf/list_hash_set_test.cc
+@@ -487,6 +487,7 @@
+ };
+
+ struct Complicated {
++ Complicated() : Complicated(0) {}
+ Complicated(int value) : simple_(value) { objects_constructed_++; }
+
+ Complicated(const Complicated& other) : simple_(other.simple_) {
+@@ -495,9 +496,6 @@
+
+ Simple simple_;
+ static int objects_constructed_;
+-
+- private:
+- Complicated() = delete;
+ };
+
+ int Complicated::objects_constructed_ = 0;
+@@ -731,4 +729,45 @@
+
+ } // anonymous namespace
+
++// A unit type which objects to its state being initialized wrong.
++struct InvalidZeroValue {
++ InvalidZeroValue() = default;
++ InvalidZeroValue(WTF::HashTableDeletedValueType) : deleted_(true) {}
++ ~InvalidZeroValue() { CHECK(ok_); }
++ bool IsHashTableDeletedValue() const { return deleted_; }
++
++ bool ok_ = true;
++ bool deleted_ = false;
++};
++
++template <>
++struct HashTraits<InvalidZeroValue> : SimpleClassHashTraits<InvalidZeroValue> {
++ static const bool kEmptyValueIsZero = false;
++};
++
++template <>
++struct DefaultHash<InvalidZeroValue> {
++ struct Hash {
++ static unsigned GetHash(const InvalidZeroValue&) { return 0; }
++ static bool Equal(const InvalidZeroValue&, const InvalidZeroValue&) {
++ return true;
++ }
++ };
++};
++
++template <typename Set>
++class ListOrLinkedHashSetInvalidZeroTest : public testing::Test {};
++
++using InvalidZeroValueSetTypes =
++ testing::Types<ListHashSet<InvalidZeroValue>,
++ ListHashSet<InvalidZeroValue, 1>,
++ LinkedHashSet<InvalidZeroValue>>;
++TYPED_TEST_SUITE(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValueSetTypes);
++
++TYPED_TEST(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValue) {
++ using Set = TypeParam;
++ Set set;
++ set.insert(InvalidZeroValue());
++}
++
+ } // namespace WTF
diff --git a/srcpkgs/chromium/patches/one_euro_filter.patch b/srcpkgs/chromium/patches/one_euro_filter.patch
new file mode 100644
index 00000000000..357babf1668
--- /dev/null
+++ b/srcpkgs/chromium/patches/one_euro_filter.patch
@@ -0,0 +1,11 @@
+--- third_party/one_euro_filter/src/one_euro_filter.h.orig 2019-09-29 21:21:03.958633609 -0400
++++ third_party/one_euro_filter/src/one_euro_filter.h 2019-09-29 21:21:54.128270940 -0400
+@@ -3,6 +3,8 @@
+
+ #include "low_pass_filter.h"
+
++#include <memory>
++
+ namespace one_euro_filter {
+ namespace test {
+ class OneEuroFilterTest;
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 6a35ada420d..304251bf6c9 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See http://www.chromium.org/developers/calendar for the latest version
-version=76.0.3809.132
+version=77.0.3865.90
revision=1
archs="i686 x86_64*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=d54e4640b5e399d170dffbc5bcff65157eb1b29314b94b5d808f727d9ce45241
+checksum=004cfdb1df74847bea8659bcaf8e039d51fe1101d42b6cf1c6cc346073fdefc3
lib32disabled=yes
nodebug=yes
@@ -246,7 +246,7 @@ do_install() {
vinstall out/Release/icudtl.dat 0644 usr/lib/chromium
- for size in 22 24 48 64 128 256; do
+ for size in 24 48 64 128 256; do
install -Dm644 "chrome/app/theme/chromium/product_logo_${size}.png" \
${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
done
From 853290d711ee5d31780c6c0ad38d87ffcc530612 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Sep 2019 20:24:50 -0400
Subject: [PATCH 2/2] chromium-widevine: update to 77.0.3865.90.
[ci skip]
---
srcpkgs/chromium-widevine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index a8e074fd168..ed8edd483e5 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
_channel="stable"
pkgname=chromium-widevine
-version=75.0.3770.142
+version=77.0.3865.90
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -17,7 +17,7 @@ depends="chromium binutils xz"
homepage="https://www.google.com/chrome"
repository=nonfree
distfiles="https://dl.google.com/linux/direct/google-chrome-${_channel}_${_chromeVersion}_amd64.deb"
-checksum=8a39e922d9d0f12b79949efc46c22021f89a8207670fa9493a366ad8231b343f
+checksum=f443503c88164f018ddb88247d2824431efcb863935ae476f4ada6218f41fdda
do_extract() {
:
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: chromium: update to 77.0.3865.90.
2019-10-01 0:05 [PR PATCH] chromium: update to 77.0.3865.90 voidlinux-github
` (3 preceding siblings ...)
2019-10-01 0:26 ` voidlinux-github
@ 2019-10-01 19:42 ` voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-01 19:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
There's a merged pull request on the void-packages repository
chromium: update to 77.0.3865.90.
https://github.com/void-linux/void-packages/pull/14862
Description:
[ci skip]
- Update vaapi patch from Ubuntu/Debian patch.
- Add two build fix patches.
- Built for x86_64, x86_64-musl, i686
- Tested on x86_64
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-01 19:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-01 0:05 [PR PATCH] chromium: update to 77.0.3865.90 voidlinux-github
2019-10-01 0:24 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-01 0:24 ` voidlinux-github
2019-10-01 0:26 ` voidlinux-github
2019-10-01 0:26 ` voidlinux-github
2019-10-01 19:42 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).