Update to 101.0.4951.41-1

5 files changed, 27 insertions, 99 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 42be029c8a6e..afb98e28ec6d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chromium-no-extras
 	pkgdesc = Chromium without hangout services, widevine, pipewire, or chromedriver
-	pkgver = 100.0.4896.127
+	pkgver = 101.0.4951.41
 	pkgrel = 1
 	url = https://www.chromium.org/Home
 	arch = x86_64
@@ -46,24 +46,22 @@ pkgbase = chromium-no-extras
 	optdepends = kdialog: support for native dialogs in Plasma
 	optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
 	optdepends = kwallet: support for storing passwords in KWallet on Plasma
-	provides = chromium=100.0.4896.127
+	provides = chromium=101.0.4951.41
 	conflicts = chromium
 	options = debug
 	options = !lto
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-100.0.4896.127.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-101.0.4951.41.tar.xz
 	source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
-	source = https://github.com/stha09/chromium-patches/releases/download/chromium-100-patchset-4/chromium-100-patchset-4.tar.xz
-	source = webcodecs-stop-using-AudioOpusEncoder.patch
-	source = webrtc-check-existence-of-cursor-metadata.patch
+	source = https://github.com/stha09/chromium-patches/releases/download/chromium-101-patchset-4/chromium-101-patchset-4.tar.xz
 	source = enable-GlobalMediaControlsCastStartStop.patch
+	source = chromium-libxml-unbundle.patch
 	source = sql-make-VirtualCursor-standard-layout-type.patch
 	source = use-oauth2-client-switches-as-default.patch
-	sha256sums = 4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d
+	sha256sums = 099863882e88b9a035fcb6b63dd5288554f6b27558e0ebce93e0d804465efa37
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
-	sha256sums = a6120e7d4eb5e131b87b6ab3b922e0c6cd78e15501e54cfb2019875173688d80
-	sha256sums = 064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af
-	sha256sums = 88b2c8d9c6c1917f6632453f18aad7a3fd94d605eecb6c77ae2394ac5856ba95
+	sha256sums = 8ed519d21ccd8b382ddd384e9c15306a60d2e3495f48a62dea07c9be9bbffebd
 	sha256sums = 779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6
+	sha256sums = fd3bf124aacc45f2d0a4f1dd86303fa7f2a3d4f4eeaf33854631d6cb39e12485
 	sha256sums = b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
 
diff --git a/PKGBUILD b/PKGBUILD
index 903a9f0a3e2a..0c62fa8c5cd4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgname=chromium-no-extras
 _pkgname=chromium
-pkgver=100.0.4896.127
+pkgver=101.0.4951.41
 pkgrel=1
 _launcher_ver=8
 _gcc_patchset=4
@@ -33,17 +33,15 @@ options=('debug' '!lto') # Chromium adds its own flags for ThinLTO
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/$_pkgname-$pkgver.tar.xz
         https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz
         https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz
-        webcodecs-stop-using-AudioOpusEncoder.patch
-        webrtc-check-existence-of-cursor-metadata.patch
         enable-GlobalMediaControlsCastStartStop.patch
+        chromium-libxml-unbundle.patch
         sql-make-VirtualCursor-standard-layout-type.patch
         use-oauth2-client-switches-as-default.patch)
-sha256sums=('4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d'
+sha256sums=('099863882e88b9a035fcb6b63dd5288554f6b27558e0ebce93e0d804465efa37'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
-            'a6120e7d4eb5e131b87b6ab3b922e0c6cd78e15501e54cfb2019875173688d80'
-            '064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af'
-            '88b2c8d9c6c1917f6632453f18aad7a3fd94d605eecb6c77ae2394ac5856ba95'
+            '8ed519d21ccd8b382ddd384e9c15306a60d2e3495f48a62dea07c9be9bbffebd'
             '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6'
+            'fd3bf124aacc45f2d0a4f1dd86303fa7f2a3d4f4eeaf33854631d6cb39e12485'
             'b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
 
@@ -101,13 +99,14 @@ prepare() {
   patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
 
   # Upstream fixes
-  patch -Np1 -i ../webcodecs-stop-using-AudioOpusEncoder.patch
-  patch -Np1 -d third_party/webrtc <../webrtc-check-existence-of-cursor-metadata.patch
 
   # Revert kGlobalMediaControlsCastStartStop enabled by default
   # https://crbug.com/1314342
   patch -Rp1 -F3 -i ../enable-GlobalMediaControlsCastStartStop.patch
 
+  # https://chromium-review.googlesource.com/c/chromium/src/+/3488058
+  patch -Np1 -i ../chromium-libxml-unbundle.patch
+
   # https://chromium-review.googlesource.com/c/chromium/src/+/2862724
   patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch
 
@@ -152,6 +151,7 @@ build() {
     'clang_use_chrome_plugins=false'
     'is_official_build=true' # implies is_cfi=true on x86_64
     'symbol_level=0' # sufficient for backtraces on x86(_64)
+    'chrome_pgo_phase=0' # needs newer clang to read the bundled PGO profile
     'treat_warnings_as_errors=false'
     'disable_fieldtrial_testing_config=true'
     'blink_enable_generated_code_formatting=false'
diff --git a/chromium-libxml-unbundle.patch b/chromium-libxml-unbundle.patch
new file mode 100644
index 000000000000..5699bc8f8eaf
--- /dev/null
+++ b/chromium-libxml-unbundle.patch
@@ -0,0 +1,10 @@
+--- a/build/linux/unbundle/libxml.gn
++++ b/build/linux/unbundle/libxml.gn
+@@ -19,6 +19,7 @@ static_library("libxml_utils") {
+     ":xml_reader",
+     ":xml_writer",
+     "//base/test:test_support",
++    "//services/data_decoder:lib",
+     "//services/data_decoder:xml_parser_fuzzer_deps",
+   ]
+   sources = [
diff --git a/webcodecs-stop-using-AudioOpusEncoder.patch b/webcodecs-stop-using-AudioOpusEncoder.patch
deleted file mode 100644
index 32957d32fa37..000000000000
--- a/webcodecs-stop-using-AudioOpusEncoder.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3bd46cb9a51773f103ef52b39d6407740eb0d60a Mon Sep 17 00:00:00 2001
-From: Eugene Zemtsov <eugene@chromium.org>
-Date: Thu, 24 Feb 2022 23:17:20 +0000
-Subject: [PATCH] webcodecs: Stop using AudioOpusEncoder as backed for mojo
- audio encoder
-
-AudioOpusEncoder was only used here for testing. Let's not let it get
-comfortable. We'll use MF AAC encoder here when we have it. (Soon...)
-
-Bug: 1259883
-Change-Id: Ia1819395c8c8fd6d403d4b8558c12f9a1bf7e761
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3489449
-Commit-Queue: Eugene Zemtsov <eugene@chromium.org>
-Auto-Submit: Eugene Zemtsov <eugene@chromium.org>
-Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
-Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#974895}
----
- media/mojo/services/gpu_mojo_media_client.cc | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc
-index 8f83a4d6cf6..40cdaff8d3a 100644
---- a/media/mojo/services/gpu_mojo_media_client.cc
-+++ b/media/mojo/services/gpu_mojo_media_client.cc
-@@ -13,7 +13,6 @@
- #include "build/chromeos_buildflags.h"
- #include "gpu/ipc/service/gpu_channel.h"
- #include "media/audio/audio_features.h"
--#include "media/audio/audio_opus_encoder.h"
- #include "media/base/audio_decoder.h"
- #include "media/base/cdm_factory.h"
- #include "media/base/media_switches.h"
-@@ -119,14 +118,7 @@ std::unique_ptr<AudioEncoder> GpuMojoMediaClient::CreateAudioEncoder(
-     scoped_refptr<base::SequencedTaskRunner> task_runner) {
-   if (!base::FeatureList::IsEnabled(features::kPlatformAudioEncoder))
-     return nullptr;
--  // TODO(crbug.com/1259883) Right now Opus encoder is all we have, later on
--  // we'll create a real platform encoder here.
--  auto opus_encoder = std::make_unique<AudioOpusEncoder>();
--  auto encoding_runner = base::ThreadPool::CreateSequencedTaskRunner(
--      {base::TaskPriority::USER_BLOCKING});
--  return std::make_unique<OffloadingAudioEncoder>(std::move(opus_encoder),
--                                                  std::move(encoding_runner),
--                                                  std::move(task_runner));
-+  return nullptr;
- }
- 
- VideoDecoderType GpuMojoMediaClient::GetDecoderImplementationType() {
diff --git a/webrtc-check-existence-of-cursor-metadata.patch b/webrtc-check-existence-of-cursor-metadata.patch
deleted file mode 100644
index 0c7e7310daf5..000000000000
--- a/webrtc-check-existence-of-cursor-metadata.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c2cd814cdd8cbf8dda6ccec2266327a5321fbde8 Mon Sep 17 00:00:00 2001
-From: Jan Grulich <grulja@gmail.com>
-Date: Tue, 15 Mar 2022 14:31:55 +0100
-Subject: [PATCH] PipeWire capturer: check existence of cursor metadata
-
-Check whether there are any cursor metadata before we try to validate
-and use them, otherwise we might crash on this.
-
-Bug: webrtc:13429
-Change-Id: I365da59a189b6b974cebafc94fec49d5b942efae
-Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/255601
-Reviewed-by: Alexander Cooper <alcooper@chromium.org>
-Commit-Queue: Alexander Cooper <alcooper@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#36240}
----
- .../desktop_capture/linux/wayland/shared_screencast_stream.cc   | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
-index a8c86e26..9e81df4c 100644
---- a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
-+++ b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
-@@ -650,7 +650,7 @@ void SharedScreenCastStreamPrivate::ProcessBuffer(pw_buffer* buffer) {
-     const struct spa_meta_cursor* cursor =
-         static_cast<struct spa_meta_cursor*>(spa_buffer_find_meta_data(
-             spa_buffer, SPA_META_Cursor, sizeof(*cursor)));
--    if (spa_meta_cursor_is_valid(cursor)) {
-+    if (cursor && spa_meta_cursor_is_valid(cursor)) {
-       struct spa_meta_bitmap* bitmap = nullptr;
- 
-       if (cursor->bitmap_offset)