summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD11
-rw-r--r--allow-ANGLEImplementation-kVulkan.patch48
-rw-r--r--use-oauth2-client-switches-as-default.patch9
4 files changed, 69 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c9f841fcc6c4..bd635f08193a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = chromium-no-extras
pkgdesc = Chromium without hangout services, widevine, or chromedriver
- pkgver = 124.0.6367.201
+ pkgver = 125.0.6422.141
pkgrel = 1
url = https://www.chromium.org/Home
arch = x86_64
@@ -52,22 +52,24 @@ pkgbase = chromium-no-extras
optdepends = gtk4: for --gtk-version=4 (GTK4 IME might work better on Wayland)
optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
optdepends = kwallet: support for storing passwords in KWallet on Plasma
- provides = chromium=124.0.6367.201
+ provides = chromium=125.0.6422.141
conflicts = chromium
options = !lto
- source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-124.0.6367.201.tar.xz
+ source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-125.0.6422.141.tar.xz
source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
- source = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/124/chromium-patches-124.tar.bz2
+ source = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/125/chromium-patches-125.tar.bz2
source = fix-a-missing-build-dependency.patch
+ source = allow-ANGLEImplementation-kVulkan.patch
source = drop-flag-unsupported-by-clang17.patch
source = compiler-rt-adjust-paths.patch
source = use-oauth2-client-switches-as-default.patch
- sha256sums = 11773c4cfce4b39ae1bbe711b2907cb86e9aa299b7c6a71656edb876f0c85992
+ sha256sums = 9966b50279d0cfaaf4b58570387f0d526388f8d5f6dd990e3f083a55d8d8e603
sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
- sha256sums = c2bc4e65ed2a4e23528dd10d5c15bf99f880b7bbb789cc720d451b78098a7e12
+ sha256sums = 58c8787bd215c4818893405dbb88c17b08bf13039fb5fbcb9dfe95ac51a86f3e
sha256sums = 75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93
+ sha256sums = 8f81059d79040ec598b5fb077808ec69d26d6c9cbebf9c4f4ea48b388a2596c5
sha256sums = 3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1
sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961
- sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
+ sha256sums = 69d2f076223cab0cf1094ae58c39b5687a98f69bf4545414a35f6a4d2708ed83
pkgname = chromium-no-extras
diff --git a/PKGBUILD b/PKGBUILD
index c14a2dfc8cc4..566103e905e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=chromium
pkgname=chromium-no-extras
-pkgver=124.0.6367.201
+pkgver=125.0.6422.141
pkgrel=1
_launcher_ver=8
_manual_clone=0
@@ -32,16 +32,18 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz
https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${pkgver%%.*}/chromium-patches-${pkgver%%.*}.tar.bz2
fix-a-missing-build-dependency.patch
+ allow-ANGLEImplementation-kVulkan.patch
drop-flag-unsupported-by-clang17.patch
compiler-rt-adjust-paths.patch
use-oauth2-client-switches-as-default.patch)
-sha256sums=('11773c4cfce4b39ae1bbe711b2907cb86e9aa299b7c6a71656edb876f0c85992'
+sha256sums=('9966b50279d0cfaaf4b58570387f0d526388f8d5f6dd990e3f083a55d8d8e603'
'213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
- 'c2bc4e65ed2a4e23528dd10d5c15bf99f880b7bbb789cc720d451b78098a7e12'
+ '58c8787bd215c4818893405dbb88c17b08bf13039fb5fbcb9dfe95ac51a86f3e'
'75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93'
+ '8f81059d79040ec598b5fb077808ec69d26d6c9cbebf9c4f4ea48b388a2596c5'
'3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1'
'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
- 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
+ '69d2f076223cab0cf1094ae58c39b5687a98f69bf4545414a35f6a4d2708ed83')
if (( _manual_clone )); then
source[0]=fetch-chromium-release
@@ -120,6 +122,7 @@ prepare() {
# Upstream fixes
patch -Np1 -i ../fix-a-missing-build-dependency.patch
+ patch -Np1 -i ../allow-ANGLEImplementation-kVulkan.patch
# Drop compiler flag that needs newer clang
patch -Np1 -i ../drop-flag-unsupported-by-clang17.patch
diff --git a/allow-ANGLEImplementation-kVulkan.patch b/allow-ANGLEImplementation-kVulkan.patch
new file mode 100644
index 000000000000..5443e1dcbee2
--- /dev/null
+++ b/allow-ANGLEImplementation-kVulkan.patch
@@ -0,0 +1,48 @@
+From 9ca21ac45af570ce11a1b0b96fdb163985b59178 Mon Sep 17 00:00:00 2001
+From: Ho Cheung <hocheung@chromium.org>
+Date: Wed, 29 May 2024 00:10:25 +0000
+Subject: [PATCH] [ozone+wayland] Allow ANGLEImplementation::kVulkan when ozone
+ platform is Wayland
+
+When passing `gl=egl-angle,angle=vulkan` flags on
+a device with an AMD graphics card and using
+`ozone wayland`, since
+`gl::ANGLEImplementation::kVulkan` is not in
+`WaylandSurfaceFactory::GetAllowedGLImplementations`,
+As a result, it cannot be initialized normally.
+
+This CL adds `gl::ANGLEImplementation::kVulkan` to
+`WaylandSurfaceFactory::GetAllowedGLImplementations`
+to ensure that it can be initialized normally.
+
+In addition, the changes made in this CL have been
+verified by many developers or users in the Linux
+community, and should not break other things
+without passing specific flags.
+
+Get VAAPI acceleration working on amdgpus,such as
+Radeon 780M.
+
+Bug: 334275637,40722838,41392107
+Change-Id: Id1c9720159ee6149b620e12e5dc7b9df89d38409
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5568860
+Commit-Queue: Ho Cheung <hocheung@chromium.org>
+Reviewed-by: Kramer Ge <fangzhoug@chromium.org>
+Reviewed-by: Nick Yamane <nickdiego@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#1307136}
+---
+ ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc b/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc
+index b6e99324c02b..7602a6b8e693 100644
+--- a/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc
++++ b/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc
+@@ -214,6 +214,7 @@ WaylandSurfaceFactory::GetAllowedGLImplementations() {
+ impls.emplace_back(gl::ANGLEImplementation::kOpenGL);
+ impls.emplace_back(gl::ANGLEImplementation::kOpenGLES);
+ impls.emplace_back(gl::ANGLEImplementation::kSwiftShader);
++ impls.emplace_back(gl::ANGLEImplementation::kVulkan);
+ impls.emplace_back(gl::kGLImplementationEGLGLES2);
+ }
+ return impls;
diff --git a/use-oauth2-client-switches-as-default.patch b/use-oauth2-client-switches-as-default.patch
index 9d9c57bfb0d2..55289a8ff3f9 100644
--- a/use-oauth2-client-switches-as-default.patch
+++ b/use-oauth2-client-switches-as-default.patch
@@ -1,7 +1,8 @@
-diff -upr chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc chromium-89.0.4389.58/google_apis/google_api_keys.cc
---- chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc 2021-02-24 22:37:18.494007649 +0000
-+++ chromium-89.0.4389.58/google_apis/google_api_keys.cc 2021-02-24 22:35:00.865777600 +0000
-@@ -154,11 +154,11 @@ class APIKeyCache {
+diff --git a/google_apis/google_api_keys-inc.cc b/google_apis/google_api_keys-inc.cc
+index 49c396d69d17..9493e7e5aa48 100644
+--- a/google_apis/google_api_keys-inc.cc
++++ b/google_apis/google_api_keys-inc.cc
+@@ -182,11 +182,11 @@ class APIKeyCache {
std::string default_client_id = CalculateKeyValue(
GOOGLE_DEFAULT_CLIENT_ID,