diff --git a/extra/chromium/.SRCINFO b/extra/chromium/.SRCINFO index ef70ef9a4..8102d9884 100644 --- a/extra/chromium/.SRCINFO +++ b/extra/chromium/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = chromium pkgdesc = A web browser built for speed, simplicity, and security - pkgver = 127.0.6533.119 + pkgver = 128.0.6613.36 pkgrel = 1 url = https://www.chromium.org/Home arch = x86_64 @@ -55,19 +55,15 @@ pkgbase = chromium optdepends = kwallet: support for storing passwords in KWallet on Plasma optdepends = upower: Battery Status API support options = !lto - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-127.0.6533.119.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-128.0.6613.36.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/127/chromium-patches-127.tar.bz2 source = allow-ANGLEImplementation-kVulkan.patch - source = chromium-browser-ui-missing-deps.patch source = compiler-rt-adjust-paths.patch source = increase-fortify-level.patch source = use-oauth2-client-switches-as-default.patch - sha256sums = acc9e3f9fd2d180b8831865a1ac4f5cdd9ffe6211f47f467296d9ee1be2a577e + sha256sums = 3e9bdb12600e7f03cda9e0e60df027227752f339a45e680ca1a689e595c7d7a8 sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a - sha256sums = 0887d215c47085013d09252409964a5eedec453561db1f2b133914e349b8a0b2 - sha256sums = 8f81059d79040ec598b5fb077808ec69d26d6c9cbebf9c4f4ea48b388a2596c5 - sha256sums = 75f9c3ccdcc914d029ddcc5ca181df90177db35a343bf44ff541ff127bcea43d + sha256sums = 1a5bc75a90abad153c8eb6dbdce138132a5f11190b0a40c925958a72d706b2aa sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961 sha256sums = d634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342 sha256sums = a9b417b96daec33c9059065e15b3a92ae1bf4b59f89d353659b335d9e0379db6 diff --git a/extra/chromium/0001-widevine-support-for-arm.patch b/extra/chromium/0001-widevine-support-for-arm.patch index 7fe449079..a39e5cedd 100644 --- a/extra/chromium/0001-widevine-support-for-arm.patch +++ b/extra/chromium/0001-widevine-support-for-arm.patch @@ -1,4 +1,4 @@ -From 416586b0eb79d60fe73257bc76895f9f9bde560d Mon Sep 17 00:00:00 2001 +From 6b48d76f7866b5a681646959ffe44365186df95c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 18 Feb 2021 19:35:58 -0700 Subject: [PATCH 1/3] widevine support for arm diff --git a/extra/chromium/0002-Run-blink-bindings-generation-single-threaded.patch b/extra/chromium/0002-Run-blink-bindings-generation-single-threaded.patch index 38fb2f8dd..13f461f52 100644 --- a/extra/chromium/0002-Run-blink-bindings-generation-single-threaded.patch +++ b/extra/chromium/0002-Run-blink-bindings-generation-single-threaded.patch @@ -1,4 +1,4 @@ -From fd683f14fd16382908f4634546d5f22bd3ce6566 Mon Sep 17 00:00:00 2001 +From 56d856d30a5bb8e56d0b28325f3d8ad78aa7eae2 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 2 Feb 2021 13:58:59 -0700 Subject: [PATCH 2/3] Run blink bindings generation single threaded diff --git a/extra/chromium/0003-Fix-eu-strip-build-for-newer-GCC.patch b/extra/chromium/0003-Fix-eu-strip-build-for-newer-GCC.patch index 5cf1bb26f..f0705ce36 100644 --- a/extra/chromium/0003-Fix-eu-strip-build-for-newer-GCC.patch +++ b/extra/chromium/0003-Fix-eu-strip-build-for-newer-GCC.patch @@ -1,4 +1,4 @@ -From 543184806c62524de2ceee423c8f8cccc73e7399 Mon Sep 17 00:00:00 2001 +From a7894053235761ee41ac1f16cea5667de7103e37 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 21 Jul 2021 21:37:31 -0600 Subject: [PATCH 3/3] Fix eu-strip build for newer GCC diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD index d917d81ea..8b109e740 100644 --- a/extra/chromium/PKGBUILD +++ b/extra/chromium/PKGBUILD @@ -15,7 +15,7 @@ highmem=1 pkgname=chromium -pkgver=127.0.6533.119 +pkgver=128.0.6613.36 pkgrel=1 _launcher_ver=8 _manual_clone=0 @@ -39,26 +39,22 @@ optdepends=('pipewire: WebRTC desktop sharing under Wayland' options=('!lto') # Chromium adds its own flags for ThinLTO source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz 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 allow-ANGLEImplementation-kVulkan.patch - chromium-browser-ui-missing-deps.patch compiler-rt-adjust-paths.patch increase-fortify-level.patch use-oauth2-client-switches-as-default.patch 0001-widevine-support-for-arm.patch 0002-Run-blink-bindings-generation-single-threaded.patch 0003-Fix-eu-strip-build-for-newer-GCC.patch) -sha256sums=('acc9e3f9fd2d180b8831865a1ac4f5cdd9ffe6211f47f467296d9ee1be2a577e' +sha256sums=('3e9bdb12600e7f03cda9e0e60df027227752f339a45e680ca1a689e595c7d7a8' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' - '0887d215c47085013d09252409964a5eedec453561db1f2b133914e349b8a0b2' - '8f81059d79040ec598b5fb077808ec69d26d6c9cbebf9c4f4ea48b388a2596c5' - '75f9c3ccdcc914d029ddcc5ca181df90177db35a343bf44ff541ff127bcea43d' + '1a5bc75a90abad153c8eb6dbdce138132a5f11190b0a40c925958a72d706b2aa' 'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961' 'd634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342' 'a9b417b96daec33c9059065e15b3a92ae1bf4b59f89d353659b335d9e0379db6' - '31179a8b1c132fa0c8679eb212c0b51ac2da2ccfb3ee1f8153bbed2e3cecaa97' - '68dafa0c0d6abcd2004d21e8582647e25d83a00ad608786fdfd630e84f04e3d7' - 'b0969b3103321950ffd622c8440d73c9d30e7ef60b3ea242fc688bb4cee6c7c3') + '28618102510072556746324583a2a2d98eacc0cff4c5ba79eca807713d993c39' + '2a93b02d6cac6be6ce7de2f17dc4f2ee9e2b44822ad221536a22a1266f2261f6' + '1e6fda49c714b7e09d9e9e53f7a26c0a96504e0351a269832c6a8e1fb5dcab2f') if (( _manual_clone )); then source[0]=fetch-chromium-release @@ -78,7 +74,7 @@ declare -gA _system_libs=( [icu]=icu #[jsoncpp]=jsoncpp # needs libstdc++ #[libaom]=aom - #[libavif]=libavif # needs https://github.com/AOMediaCodec/libavif/commit/5410b23f76 + #[libavif]=libavif # needs -DAVIF_ENABLE_EXPERIMENTAL_GAIN_MAP=ON [libdrm]= [libjpeg]=libjpeg [libpng]=libpng @@ -146,9 +142,6 @@ prepare() { # Upstream fixes patch -Np1 -i ../allow-ANGLEImplementation-kVulkan.patch - # https://issues.chromium.org/issues/351157339 - patch -Np1 -i ../chromium-browser-ui-missing-deps.patch - # Allow libclang_rt.builtins from compiler-rt >= 16 to be used patch -Np1 -i ../compiler-rt-adjust-paths.patch @@ -156,7 +149,6 @@ prepare() { patch -Np1 -i ../increase-fortify-level.patch # Fixes for building with libstdc++ instead of libc++ - patch -Np1 -i ../chromium-patches-*/chromium-117-material-color-include.patch # Link to system tools required by the build rm third_party/node/linux/node-linux-x64/bin/node diff --git a/extra/chromium/allow-ANGLEImplementation-kVulkan.patch b/extra/chromium/allow-ANGLEImplementation-kVulkan.patch index 5443e1dcb..a98cf1c9e 100644 --- a/extra/chromium/allow-ANGLEImplementation-kVulkan.patch +++ b/extra/chromium/allow-ANGLEImplementation-kVulkan.patch @@ -1,48 +1,44 @@ -From 9ca21ac45af570ce11a1b0b96fdb163985b59178 Mon Sep 17 00:00:00 2001 +From 1d408de1538427653f776b5e5e646503d0d0f0c5 Mon Sep 17 00:00:00 2001 From: Ho Cheung -Date: Wed, 29 May 2024 00:10:25 +0000 -Subject: [PATCH] [ozone+wayland] Allow ANGLEImplementation::kVulkan when ozone - platform is Wayland +Date: Fri, 2 Aug 2024 00:10:43 +0000 +Subject: [PATCH] Reland "[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 reverts commit 49aad997bfc37ab236c4cb593ebc2306960a43f5. -This CL adds `gl::ANGLEImplementation::kVulkan` to -`WaylandSurfaceFactory::GetAllowedGLImplementations` -to ensure that it can be initialized normally. +Reason: This CL has caused failed tests in at +least two tryjobs of Lacros FYI and Linux Tests +(dbg). -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. +These failed tests seem to be related to the +Vulkan field trial. Now the Vulkan field trial has +been disabled and the related failed tests have +also been suppressed. -Get VAAPI acceleration working on amdgpus,such as -Radeon 780M. +Based on the above, all blockers have been +removed, and we can try to merge this CL again. Bug: 334275637,40722838,41392107 -Change-Id: Id1c9720159ee6149b620e12e5dc7b9df89d38409 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5568860 -Commit-Queue: Ho Cheung +Change-Id: I5fcafff1d3dad431a64c9b429c807c996f6a0d74 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5740783 Reviewed-by: Kramer Ge +Commit-Queue: Ho Cheung Reviewed-by: Nick Yamane -Cr-Commit-Position: refs/heads/main@{#1307136} +Reviewed-by: Vasiliy Telezhnikov +Cr-Commit-Position: refs/heads/main@{#1336353} --- 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 +index 051e26171012..dcb947ae88f4 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() { +@@ -213,6 +213,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/extra/chromium/chromium-browser-ui-missing-deps.patch b/extra/chromium/chromium-browser-ui-missing-deps.patch deleted file mode 100644 index 81c419c50..000000000 --- a/extra/chromium/chromium-browser-ui-missing-deps.patch +++ /dev/null @@ -1,59 +0,0 @@ -Source: Tom Briden -Upstream: No - -diff --git a/chrome/browser/ui/views/side_panel/BUILD.gn b/chrome/browser/ui/views/side_panel/BUILD.gn -index ea57f9b16f6b8..20d8681ee9af2 100644 ---- a/chrome/browser/ui/views/side_panel/BUILD.gn -+++ b/chrome/browser/ui/views/side_panel/BUILD.gn -@@ -142,18 +142,30 @@ static_library("side_panel") { - } - public_deps = [ - "//base", -+ "//chrome/browser/cart:mojo_bindings", - "//chrome/browser/companion/core/mojom:mojo_bindings", - "//chrome/browser/profiles:profile", - "//chrome/browser/ui/actions:actions_headers", - "//chrome/browser/ui/color:color_headers", -+ "//chrome/browser/ui/webui/side_panel/customize_chrome:mojo_bindings", -+ "//chrome/browser/ui/webui/side_panel/bookmarks:mojo_bindings", - "//chrome/browser/ui/webui/side_panel/performance_controls:mojo_bindings", -+ "//chrome/browser/ui/webui/side_panel/reading_list:mojo_bindings", -+ "//chrome/browser/ui:webui_name_variants", - "//chrome/common", - "//chrome/common/accessibility:mojo_bindings", -+ "//chrome/common/companion:mojo_bindings", -+ "//components/enterprise/buildflags:buildflags", -+ "//components/enterprise/common/proto:connectors_proto", - "//components/lens", - "//components/lens:buildflags", - "//components/omnibox/browser", -+ "//components/page_image_service/mojom:mojo_bindings", -+ "//components/paint_preview/buildflags:buildflags", - "//components/prefs", - "//components/search_engines", -+ "//components/segmentation_platform/public/proto:proto", -+ "//components/webapps/common:mojo_bindings", - "//content/public/browser", - "//extensions/browser", - "//extensions/common", -@@ -165,6 +177,8 @@ static_library("side_panel") { - "//ui/gfx/geometry", - "//ui/views", - "//ui/views/controls/webview", -+ "//ui/webui/resources/cr_components/commerce:mojo_bindings", -+ "//ui/webui/resources/cr_components/help_bubble:mojo_bindings", - "//url", - ] - deps = [ -diff --git a/chrome/browser/ui/webui/top_chrome/BUILD.gn b/chrome/browser/ui/webui/top_chrome/BUILD.gn -index 5830f1f5e234a..6749b8fd0da56 100644 ---- a/chrome/browser/ui/webui/top_chrome/BUILD.gn -+++ b/chrome/browser/ui/webui/top_chrome/BUILD.gn -@@ -19,6 +19,7 @@ source_set("top_chrome") { - deps = [ - "//base", - "//chrome/browser/profiles:profile", -+ "//chrome/browser/ui:webui_name_variants", - "//components/site_engagement/content:content", - "//content/public/browser", - "//ui/webui",