summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsL1pKn072019-03-09 22:05:17 +0100
committersL1pKn072019-03-09 22:05:17 +0100
commit8cb58d4d1119c7baab5a0463c335f6a66c437b4d (patch)
treef8bee416deb065a6bc046e2dc9ee79fcc7bcd183
parent63b4e48c09bf62d25bc8a610374e71c5f9e76f0e (diff)
downloadaur-8cb58d4d1119c7baab5a0463c335f6a66c437b4d.tar.gz
Update to 74.0.3724.8
-rw-r--r--.SRCINFO16
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD24
-rw-r--r--enable-vaapi.patch289
4 files changed, 21 insertions, 309 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a00746f1b2f..6a6dc5aa809 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Feb 28 14:38:27 UTC 2019
+# Sat Mar 9 21:04:45 UTC 2019
pkgbase = chromium-dev
pkgdesc = The open-source project behind Google Chrome (Dev Channel)
- pkgver = 74.0.3717.0
+ pkgver = 74.0.3724.8
pkgrel = 1
url = http://www.chromium.org
install = chromium-dev.install
@@ -43,19 +43,19 @@ pkgbase = chromium-dev
optdepends = libva-vdpau-driver-chromium: HW video acceleration for NVIDIA users
optdepends = libva-mesa-driver: HW video acceleration for Nouveau, R600 and RadeonSI users
optdepends = libva-intel-driver: HW video acceleration for Intel G45 and HD users
- source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-74.0.3717.0.tar.xz
+ source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-74.0.3724.8.tar.xz
source = git+https://github.com/foutrelis/chromium-launcher.git
source = chromium-dev.svg
- source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-widevine-r4.patch
- source = enable-vaapi.patch
+ source = enable-vaapi.patch::https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/master/debian/patches/enable_vaapi_on_linux_2.diff
source = chromium-ffmpeg-clang.patch
+ source = chromium-widevine-r4.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-widevine.patch?h=packages/chromium
source = chromium-skia-harmony.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-skia-harmony.patch?h=packages/chromium
- sha256sums = 599e49ebf05f14dbefe272c0f0672225967a5f44d5cb4c335a0762194335deb1
+ sha256sums = 0f256fb1ed66bf499fd5d2e20f4b0d3348365cac62910d1fceea86a66dffdca5
sha256sums = SKIP
sha256sums = dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1
- sha256sums = 8c6ecc26aab9f4acc911350d9bb1e40f32cad144b6a08c9d7b188e9598d0f2de
- sha256sums = d218e4df5c5da97672bcc7ff5bc6ab00d06aa8748aab8bc360265ca8032fe675
+ sha256sums = SKIP
sha256sums = 16741344288d200fadf74546855e00aa204122e744b4811a36155efd5537bd95
+ sha256sums = 8c6ecc26aab9f4acc911350d9bb1e40f32cad144b6a08c9d7b188e9598d0f2de
sha256sums = 5887f78b55c4ecbbcba5930f3f0bb7bc0117c2a41c2f761805fcf7f46f1ca2b3
pkgname = chromium-dev
diff --git a/.gitignore b/.gitignore
index 56a2c6a1546..d066d168dd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@
!chromium-dev.install
!chromium-dev.svg
!chromium-ffmpeg-clang.patch
-!enable-vaapi.patch
diff --git a/PKGBUILD b/PKGBUILD
index c6f87fddd40..4f76edc40ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ _use_wayland=0 # Build Wayland NOTE: extremely experimental and don't
## -- Package and components information -- ##
##############################################
pkgname=chromium-dev
-pkgver=74.0.3717.0
+pkgver=74.0.3724.8
pkgrel=1
pkgdesc="The open-source project behind Google Chrome (Dev Channel)"
arch=('x86_64')
@@ -77,11 +77,11 @@ source=( #"https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgv
'git+https://github.com/foutrelis/chromium-launcher.git'
'chromium-dev.svg'
# Patch form Gentoo.
- 'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-widevine-r4.patch'
# Misc Patches.
- 'enable-vaapi.patch' #::https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/enable-vaapi.patch'
+ 'enable-vaapi.patch::https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/master/debian/patches/enable_vaapi_on_linux_2.diff' # Use Saikrishna Arcot patch again
'chromium-ffmpeg-clang.patch'
# Patch from crbug (chromium bugtracker) or Arch chromium package.
+ 'chromium-widevine-r4.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-widevine.patch?h=packages/chromium'
'chromium-skia-harmony.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-skia-harmony.patch?h=packages/chromium'
)
sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgver}.tar.xz.hashes | grep sha256 | cut -d ' ' -f3)"
@@ -89,11 +89,12 @@ sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/
'SKIP'
'dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1'
# Patch form Gentoo
- '8c6ecc26aab9f4acc911350d9bb1e40f32cad144b6a08c9d7b188e9598d0f2de'
+
# Misc Patches
- 'd218e4df5c5da97672bcc7ff5bc6ab00d06aa8748aab8bc360265ca8032fe675'
+ 'SKIP'
'16741344288d200fadf74546855e00aa204122e744b4811a36155efd5537bd95'
# Patch from crbug (chromium bugtracker) or Arch chromium package
+ '8c6ecc26aab9f4acc911350d9bb1e40f32cad144b6a08c9d7b188e9598d0f2de'
'5887f78b55c4ecbbcba5930f3f0bb7bc0117c2a41c2f761805fcf7f46f1ca2b3'
)
install=chromium-dev.install
@@ -289,7 +290,6 @@ _keeplibs=(
_keeplibs+=(
'third_party/icu' # https://crbug.com/678661.
- 'third_party/libjpeg' # https://crbug.com/908298.
)
# Set build flags.
@@ -317,7 +317,8 @@ _flags=(
'enable_nacl=true'
'enable_nacl_nonsfi=true'
'use_custom_libcxx=false'
- 'use_jumbo_build=false' # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md NOTE: gets OOM in my dual xeon (64Gb ram) machine :/
+ 'use_jumbo_build=false' # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+# 'jumbo_file_merge_limit=30' # NOTE: test. more than 40 gets OOM in my dual xeon (64Gb ram) machine :/
'use_vaapi=true'
'enable_hevc_demuxing=true'
'enable_ac3_eac3_audio_demuxing=true'
@@ -348,7 +349,7 @@ _use_system=(
# 'icu' # https://crbug.com/678661.
'libdrm'
# 'libevent' # Get segfaults and other problems https://bugs.gentoo.org/593458.
-# 'libjpeg' # https://crbug.com/908298.
+ 'libjpeg'
'libpng'
# 'libvpx' # Needs update.
# 'libwebp' # Needs update.
@@ -453,6 +454,7 @@ prepare() {
# Enable VAAPI.
patch -p1 -i "${srcdir}/enable-vaapi.patch"
+ sed 's|/dri/|/|g' -i media/gpu/vaapi/vaapi_wrapper.cc
# Patch from crbug (chromium bugtracker) or Arch chromium package.
@@ -557,9 +559,9 @@ package() {
'libGLESv2.so'
'libVkICD_mock_icd.so'
'libVkLayer_core_validation.so'
- 'libVkLayer_object_tracker.so'
- 'libVkLayer_parameter_validation.so'
- 'libVkLayer_threading.so'
+ 'libVkLayer_object_lifetimes.so'
+ 'libVkLayer_stateless_validation.so'
+ 'libVkLayer_thread_safety.so'
'libVkLayer_unique_objects.so'
'swiftshader/libEGL.so'
'swiftshader/libGLESv2.so'
diff --git a/enable-vaapi.patch b/enable-vaapi.patch
deleted file mode 100644
index 6946e786c6c..00000000000
--- a/enable-vaapi.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-From efdd5bdf093e9074c9eba73650ff5ad95b280ec8 Mon Sep 17 00:00:00 2001
-From: Akarshan Biswas <akarshan.biswas@gmail.com>
-Date: Sun, 4 Nov 2018 20:26:54 +0530
-Subject: [PATCH] Enable vaapi on Linux
-
----
- chrome/browser/about_flags.cc | 14 +++++++------
- chrome/browser/flag_descriptions.cc | 22 +++++++++++++-------
- chrome/browser/flag_descriptions.h | 16 +++++++++-----
- components/viz/service/main/viz_main_impl.cc | 2 +-
- content/gpu/BUILD.gn | 6 ++++++
- content/gpu/gpu_main.cc | 4 ++--
- gpu/config/software_rendering_list.json | 11 ----------
- media/base/media_switches.cc | 2 +-
- media/filters/BUILD.gn | 3 ++-
- media/gpu/BUILD.gn | 7 +++++++
- 10 files changed, 52 insertions(+), 35 deletions(-)
-
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index db54ccb61..f32075fb8 100644
---- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -1797,7 +1797,7 @@ const FeatureEntry kFeatureEntries[] = {
- "disable-accelerated-video-decode",
- flag_descriptions::kAcceleratedVideoDecodeName,
- flag_descriptions::kAcceleratedVideoDecodeDescription,
-- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
-+ kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
- },
- #if defined(OS_WIN)
-@@ -2456,12 +2456,12 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
- #endif // ENABLE_ISOLATED_XR_SERVICE
- #endif // ENABLE_VR
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
- {"disable-accelerated-mjpeg-decode",
- flag_descriptions::kAcceleratedMjpegDecodeName,
-- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
-+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
--#endif // OS_CHROMEOS
-+#endif // OS_CHROMEOS OS_LINUX
- {"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
- flag_descriptions::kV8CacheOptionsDescription, kOsAll,
- MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
-@@ -4371,11 +4371,11 @@ const FeatureEntry kFeatureEntries[] = {
- "AutofillDropdownLayout")},
- #endif // OS_ANDROID
-
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
- {"enable-vaapi-jpeg-image-decode-acceleration",
- flag_descriptions::kVaapiJpegImageDecodeAccelerationName,
-- flag_descriptions::kVaapiJpegImageDecodeAccelerationDescription, kOsCrOS,
-+ flag_descriptions::kVaapiJpegImageDecodeAccelerationDescription, kOsCrOS | kOsLinux,
- FEATURE_VALUE_TYPE(features::kVaapiJpegImageDecodeAcceleration)},
- #endif
-
- #if defined(OS_WIN)
-diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
-index 6cc51bbfb..3c4babe3d 100644
---- a/chrome/browser/flag_descriptions.cc
-+++ b/chrome/browser/flag_descriptions.cc
-@@ -2996,9 +2996,9 @@ const char kTextSuggestionsTouchBarDescription[] =
-
- #endif
-
--// Chrome OS -------------------------------------------------------------------
-+// Chrome OS and Linux -------------------------------------------------------------------
-
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
-
- const char kAcceleratedMjpegDecodeName[] =
- "Hardware-accelerated mjpeg decode for captured frame";
-@@ -3006,6 +3006,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
- "Enable hardware-accelerated mjpeg decode for captured frame where "
- "available.";
-
-+const char kVaapiJpegImageDecodeAccelerationName[] =
-+ "VA-API JPEG decode acceleration for images";
-+const char kVaapiJpegImageDecodeAccelerationDescription[] =
-+ "Enable or disable decode acceleration of JPEG images (as opposed to camera"
-+ " captures) using the VA-API.";
-+
-+#endif // defined(OS_CHROMEOS) defined(OS_LINUX) and !defined(OS_ANDROID)
-+
-+// Only Chrome OS ------------------------------------------------------
-+
-+#if defined(OS_CHROMEOS)
-+
- const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
- const char kAllowTouchpadThreeFingerClickDescription[] =
- "Enables touchpad three-finger-click as middle button.";
-@@ -3524,12 +3536,6 @@ const char kUseMonitorColorSpaceDescription[] =
- "Enables Chrome to use the color space information provided by the monitor"
- " instead of the default sRGB color space.";
-
--const char kVaapiJpegImageDecodeAccelerationName[] =
-- "VA-API JPEG decode acceleration for images";
--const char kVaapiJpegImageDecodeAccelerationDescription[] =
-- "Enable or disable decode acceleration of JPEG images (as opposed to camera"
-- " captures) using the VA-API.";
--
- const char kVideoPlayerChromecastSupportName[] =
- "Experimental Chromecast support for Video Player";
- const char kVideoPlayerChromecastSupportDescription[] =
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
-index 944695782..38d8fe144 100644
---- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -1824,13 +1824,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
-
- #endif // defined(OS_MACOSX)
-
--// Chrome OS ------------------------------------------------------------------
-+// Chrome OS and Linux ------------------------------------------------------------------
-
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
-
- extern const char kAcceleratedMjpegDecodeName[];
- extern const char kAcceleratedMjpegDecodeDescription[];
-
-+extern const char kVaapiJpegImageDecodeAccelerationName[];
-+extern const char kVaapiJpegImageDecodeAccelerationDescription[];
-+
-+#endif
-+
-+// Chrome OS ----------------------------------------------------------------------
-+
-+#if defined(OS_CHROMEOS)
-+
- extern const char kAllowTouchpadThreeFingerClickName[];
- extern const char kAllowTouchpadThreeFingerClickDescription[];
-
-@@ -2145,9 +2154,6 @@ extern const char kUseMashDescription[];
- extern const char kUseMonitorColorSpaceName[];
- extern const char kUseMonitorColorSpaceDescription[];
-
--extern const char kVaapiJpegImageDecodeAccelerationName[];
--extern const char kVaapiJpegImageDecodeAccelerationDescription[];
--
- extern const char kVideoPlayerChromecastSupportName[];
- extern const char kVideoPlayerChromecastSupportDescription[];
-
-diff --git a/components/viz/service/main/viz_main_impl.cc b/components/viz/service/main/viz_main_impl.cc
-index 6f5f55de7..b90db3738 100644
---- a/components/viz/service/main/viz_main_impl.cc
-+++ b/components/viz/service/main/viz_main_impl.cc
-@@ -41,7 +41,7 @@ std::unique_ptr<base::Thread> CreateAndStartIOThread() {
- // It should be possible to use |main_task_runner_| for doing IO tasks.
- base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
- thread_options.priority = base::ThreadPriority::NORMAL;
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
-+#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX)
- // TODO(reveman): Remove this in favor of setting it explicitly for each
- // type of process.
- thread_options.priority = base::ThreadPriority::DISPLAY;
-diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
-index 8974e441d..d7eba85a9 100644
---- a/content/gpu/BUILD.gn
-+++ b/content/gpu/BUILD.gn
-@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
- import("//build/config/ui.gni")
- import("//gpu/vulkan/features.gni")
- import("//media/media_options.gni")
-+import("//media/gpu/args.gni")
- import("//ui/ozone/ozone.gni")
-
- # See //content/BUILD.gn for how this works.
-@@ -134,4 +135,9 @@ target(link_target_type, "gpu_sources") {
- (!is_chromecast || is_cast_desktop_build)) {
- configs += [ "//build/config/linux/dri" ]
- }
-+
-+ # Use vaapi on desktop Linux builds when use_vaapi is set
-+ if (is_desktop_linux && use_vaapi) {
-+ public_configs = [ "//media/gpu:libva_config" ]
-+ }
- }
-diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index 8397889b6..188d960a4 100644
---- a/content/gpu/gpu_main.cc
-+++ b/content/gpu/gpu_main.cc
-@@ -284,7 +284,7 @@ int GpuMain(const MainFunctionParams& parameters) {
-
- base::PlatformThread::SetName("CrGpuMain");
-
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
-+#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX)
- // Set thread priority before sandbox initialization.
- base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
- #endif
-@@ -317,7 +317,7 @@ int GpuMain(const MainFunctionParams& parameters) {
- GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
-
- base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
-+#if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX)
- io_thread_priority = base::ThreadPriority::DISPLAY;
- #endif
-
-diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
-index cb6118b6a..7b8ea0f75 100644
---- a/gpu/config/software_rendering_list.json
-+++ b/gpu/config/software_rendering_list.json
-@@ -369,17 +369,6 @@
- "all"
- ]
- },
-- {
-- "id": 48,
-- "description": "Accelerated video decode is unavailable on Linux",
-- "cr_bugs": [137247],
-- "os": {
-- "type": "linux"
-- },
-- "features": [
-- "accelerated_video_decode"
-- ]
-- },
- {
- "id": 50,
- "description": "Disable VMware software renderer on older Mesa",
-diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
-index 41bfa9172..30ca4f40a 100644
---- a/media/base/media_switches.cc
-+++ b/media/base/media_switches.cc
-@@ -495,7 +495,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
- switches::kUseFakeJpegDecodeAccelerator)) {
- return true;
- }
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
- return true;
- #endif
- return false;
-diff --git a/media/filters/BUILD.gn b/media/filters/BUILD.gn
-index d558b537a..9ad090e07 100644
---- a/media/filters/BUILD.gn
-+++ b/media/filters/BUILD.gn
-@@ -5,6 +5,7 @@
- import("//build/config/jumbo.gni")
- import("//media/media_options.gni")
- 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
-@@ -200,7 +201,7 @@ jumbo_source_set("filters") {
- deps += [ "//media/base/android" ]
- }
-
-- if (current_cpu != "arm" && is_linux) {
-+ if (use_vaapi && is_linux) {
- sources += [
- "h264_bitstream_buffer.cc",
- "h264_bitstream_buffer.h",
-diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
-index 07bfdefda..7e33cd747 100644
---- a/media/gpu/BUILD.gn
-+++ b/media/gpu/BUILD.gn
-@@ -508,6 +508,12 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
- }
- }
-
-+import("//build/config/linux/pkg_config.gni")
-+
-+pkg_config("libva_config") {
-+ packages = [ "libva" ]
-+}
-+
- if (use_v4l2_codec || use_vaapi) {
- test("jpeg_encode_accelerator_unittest") {
- deps = [
-@@ -578,6 +584,7 @@ if (is_chromeos || is_linux) {
- if (use_ozone) {
- deps += [ "//ui/ozone" ]
- }
-+ public_configs = [ ":libva_config" ]
- }
- }
-
---
-2.19.2
-