updated to version 81.0.4044.92

13 files changed, 89 insertions, 719 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5ff3c75f0eb..c0231d380f2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ungoogled-chromium-ozone
 	pkgdesc = A lightweight approach to removing Google web service dependency with patches for wayland support via Ozone
-	pkgver = 80.0.3987.163
+	pkgver = 81.0.4044.92
 	pkgrel = 1
 	url = https://ungoogled-software.github.io/
 	install = chromium.install
@@ -61,45 +61,29 @@ pkgbase = ungoogled-chromium-ozone
 	optdepends = libva-vdpau-driver: for hardware video acceleration with NVIDIA GPUs
 	provides = chromium
 	conflicts = chromium
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-80.0.3987.163.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-81.0.4044.92.tar.xz
 	source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
-	source = cros-search-service-Include-cmath-for-std-pow.patch
-	source = move-RemoteTreeNode-declaration.patch
-	source = sync-enable-USSPasswords-by-default.patch
-	source = fix-shim-header-generation-when-unbundling-ICU.patch
-	source = fix-building-with-system-zlib.patch
-	source = remove-verbose-logging-in-local-unique-font-matching.patch
-	source = fix-building-with-unbundled-libxml.patch
 	source = rename-Relayout-in-DesktopWindowTreeHostPlatform.patch
 	source = rebuild-Linux-frame-button-cache-when-activation.patch
 	source = chromium-widevine.patch
 	source = chromium-skia-harmony.patch
-	source = ungoogled-chromium-80.0.3987.163-1.zip::https://github.com/Eloston/ungoogled-chromium/archive/80.0.3987.163-1.zip
+	source = ungoogled-chromium-81.0.4044.92-2.zip::https://github.com/Eloston/ungoogled-chromium/archive/81.0.4044.92-2.zip
 	source = flags.archlinux.gn
 	source = chromium-drirc-disable-10bpc-color-configs.conf
-	source = vaapi-fix.patch
-	source = vaapi-fix-wayland-init.patch
-	source = 0001-Add-missing-algorithm-header-in-bitmap_cursor_factor.patch
+	source = vdpau-support.patch
+	source = vaapi-build-fix.patch
 	source = fix-vaapi-ozone-build.patch
-	sha256sums = b6ddefa9434877a9b923631b7525f7f2f80118dd986ecdac87f2c9f11f237346
+	sha256sums = a2cf3fd07a66330b189724cdcb4549ddac72705fba6adb33020bc6444efb1a44
 	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
-	sha256sums = 0a8d1af2a3734b5f99ea8462940e332db4acee7130fe436ad3e4b7ad133e5ae5
-	sha256sums = 21f631851cdcb347f40793485b168cb5d0da65ae26ae39ba58d624c66197d0a5
-	sha256sums = 08ef82476780e0864b5bf7f20eb19db320e73b9a5d4f595351e12e97dda8746f
-	sha256sums = e477aa48a11ca4d53927f66a9593567fcd053325fb38af30ac3508465f1dd1f6
-	sha256sums = 18276e65c68a0c328601b12fefb7e8bfc632346f34b87e64944c9de8c95c5cfa
-	sha256sums = 5bc775c0ece84d67855f51b30eadcf96fa8163b416d2036e9f9ba19072f54dfe
-	sha256sums = e530d1b39504c2ab247e16f1602359c484e9e8be4ef6d4824d68b14d29a7f60b
 	sha256sums = ae3bf107834bd8eda9a3ec7899fe35fde62e6111062e5def7d24bf49b53db3db
 	sha256sums = 46f7fc9768730c460b27681ccf3dc2685c7e1fd22d70d3a82d9e57e3389bb014
 	sha256sums = 709e2fddba3c1f2ed4deb3a239fc0479bfa50c46e054e7f32db4fb1365fed070
 	sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1
-	sha256sums = b3de413dfd363e9a77c625ecd96d3dcbb6c12201856bd31f91b1be31fad06031
-	sha256sums = 53e8a314da1f33b99d4286cc3c2e4cb2d43132b75af8a282414fda950bd493e9
+	sha256sums = d05b18cb06e815bb0d3976da5ba3f78ee31c6dae75e4553999e63c29f6614739
+	sha256sums = c6ca2806ffb45cf55c0320f9985e605c105d717e140eb8786d8e292796aec35d
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 	sha256sums = 0ec6ee49113cc8cc5036fa008519b94137df6987bf1f9fbffb2d42d298af868a
-	sha256sums = a4c022263b474ae14abd899b8e453f7d9ed9c0715b0b248b8a423aa2777095c4
-	sha256sums = d8a57adf4b3106ab4d7ecdf5b050e02b87901b61c33cfa8810a7143c483e1fe4
+	sha256sums = fad5e678d62de0e45db1c2aa871628fdc981f78c26392c1dccc457082906a350
 	sha256sums = 9aebd800e5fe191cd5f4bd82c33419eefdd80919e6c6f5a3a9346a224625f094
 
 pkgname = ungoogled-chromium-ozone
diff --git a/PKGBUILD b/PKGBUILD
index 201cd3d15025..ef6c405602b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,11 @@
 # Contributor: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=ungoogled-chromium-ozone
-pkgver=80.0.3987.163
+pkgver=81.0.4044.92
 pkgrel=1
 _pkgname=ungoogled-chromium
 _launcher_ver=6
-_ungoogled_ver=80.0.3987.163-1
+_ungoogled_ver=81.0.4044.92-2
 pkgdesc="A lightweight approach to removing Google web service dependency with patches for wayland support via Ozone"
 arch=('x86_64')
 url="https://ungoogled-software.github.io/"
@@ -31,13 +31,6 @@ optdepends=('pepper-flash: support for Flash content'
 install=chromium.install
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
         chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
-        cros-search-service-Include-cmath-for-std-pow.patch
-        move-RemoteTreeNode-declaration.patch
-        sync-enable-USSPasswords-by-default.patch
-        fix-shim-header-generation-when-unbundling-ICU.patch
-        fix-building-with-system-zlib.patch
-        remove-verbose-logging-in-local-unique-font-matching.patch
-        fix-building-with-unbundled-libxml.patch
         rename-Relayout-in-DesktopWindowTreeHostPlatform.patch
         rebuild-Linux-frame-button-cache-when-activation.patch
         chromium-widevine.patch
@@ -46,30 +39,21 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         $_pkgname-$_ungoogled_ver.zip::https://github.com/Eloston/ungoogled-chromium/archive/$_ungoogled_ver.zip
         flags.archlinux.gn
         chromium-drirc-disable-10bpc-color-configs.conf
-        vaapi-fix.patch
-        vaapi-fix-wayland-init.patch
-        0001-Add-missing-algorithm-header-in-bitmap_cursor_factor.patch
+        vdpau-support.patch
+        vaapi-build-fix.patch
         fix-vaapi-ozone-build.patch)
-sha256sums=('b6ddefa9434877a9b923631b7525f7f2f80118dd986ecdac87f2c9f11f237346'
+sha256sums=('a2cf3fd07a66330b189724cdcb4549ddac72705fba6adb33020bc6444efb1a44'
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
-            '0a8d1af2a3734b5f99ea8462940e332db4acee7130fe436ad3e4b7ad133e5ae5'
-            '21f631851cdcb347f40793485b168cb5d0da65ae26ae39ba58d624c66197d0a5'
-            '08ef82476780e0864b5bf7f20eb19db320e73b9a5d4f595351e12e97dda8746f'
-            'e477aa48a11ca4d53927f66a9593567fcd053325fb38af30ac3508465f1dd1f6'
-            '18276e65c68a0c328601b12fefb7e8bfc632346f34b87e64944c9de8c95c5cfa'
-            '5bc775c0ece84d67855f51b30eadcf96fa8163b416d2036e9f9ba19072f54dfe'
-            'e530d1b39504c2ab247e16f1602359c484e9e8be4ef6d4824d68b14d29a7f60b'
             'ae3bf107834bd8eda9a3ec7899fe35fde62e6111062e5def7d24bf49b53db3db'
             '46f7fc9768730c460b27681ccf3dc2685c7e1fd22d70d3a82d9e57e3389bb014'
             '709e2fddba3c1f2ed4deb3a239fc0479bfa50c46e054e7f32db4fb1365fed070'
             '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1'
             # -----------
-            'b3de413dfd363e9a77c625ecd96d3dcbb6c12201856bd31f91b1be31fad06031'
-            '53e8a314da1f33b99d4286cc3c2e4cb2d43132b75af8a282414fda950bd493e9'
+            'd05b18cb06e815bb0d3976da5ba3f78ee31c6dae75e4553999e63c29f6614739'
+            'c6ca2806ffb45cf55c0320f9985e605c105d717e140eb8786d8e292796aec35d'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb'
             '0ec6ee49113cc8cc5036fa008519b94137df6987bf1f9fbffb2d42d298af868a'
-            'a4c022263b474ae14abd899b8e453f7d9ed9c0715b0b248b8a423aa2777095c4'
-            'd8a57adf4b3106ab4d7ecdf5b050e02b87901b61c33cfa8810a7143c483e1fe4'
+            'fad5e678d62de0e45db1c2aa871628fdc981f78c26392c1dccc457082906a350'
             '9aebd800e5fe191cd5f4bd82c33419eefdd80919e6c6f5a3a9346a224625f094')
 provides=('chromium')
 conflicts=('chromium')
@@ -97,8 +81,7 @@ declare -gA _system_libs=(
   [zlib]=minizip
 )
 _unwanted_bundled_libs=(
-  ${!_system_libs[@]}
-  ${_system_libs[libjpeg]+libjpeg_turbo}
+  $(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/')
 )
 depends+=(${_system_libs[@]})
 
@@ -115,25 +98,6 @@ prepare() {
     third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \
     third_party/libxml/chromium/*.cc
 
-  # https://crbug.com/957519
-  patch -Np1 -i ../cros-search-service-Include-cmath-for-std-pow.patch
-  patch -Np1 -i ../move-RemoteTreeNode-declaration.patch
-
-  # https://crbug.com/1027929
-  patch -Np1 -i ../sync-enable-USSPasswords-by-default.patch
-
-  # https://crbug.com/989153
-  patch -Np1 -i ../fix-shim-header-generation-when-unbundling-ICU.patch
-
-  # https://crbug.com/977964
-  patch -Np1 -i ../fix-building-with-system-zlib.patch
-
-  # https://crbug.com/1005508
-  patch -Np1 -i ../remove-verbose-logging-in-local-unique-font-matching.patch
-
-  # https://crbug.com/1043042
-  patch -Np1 -i ../fix-building-with-unbundled-libxml.patch
-
   # https://crbug.com/1049258
   patch -Np1 -i ../rename-Relayout-in-DesktopWindowTreeHostPlatform.patch
   patch -Np1 -i ../rebuild-Linux-frame-button-cache-when-activation.patch
@@ -145,16 +109,15 @@ prepare() {
   # https://crbug.com/skia/6663#c10
   patch -Np0 -i ../chromium-skia-harmony.patch
 
-  # Fix VA-API on Intel and Nvidia
-  patch -Np1 -i ../vaapi-fix.patch
-  patch -Np1 -i ../vaapi-fix-wayland-init.patch
+  # Fix VA-API on Nvidia
+  patch -Np1 -i ../vdpau-support.patch
+
+  # Fix VAAPI build on chromium 81+
+  patch -Np1 -i ../vaapi-build-fix.patch
 
   # Fix vaapi linkage error
   patch -Np1 -i ../fix-vaapi-ozone-build.patch
 
-  # build fixes
-  patch -Np1 -i ../0001-Add-missing-algorithm-header-in-bitmap_cursor_factor.patch
-
   # Ungoogled chromium stuff
   _ungoogled_repo="$srcdir/$_pkgname-$_ungoogled_ver"
   _utils="${_ungoogled_repo}/utils"
@@ -281,4 +244,4 @@ package() {
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set ts=2 sw=2 et ft=sh:
diff --git a/cros-search-service-Include-cmath-for-std-pow.patch b/cros-search-service-Include-cmath-for-std-pow.patch
deleted file mode 100644
index 410b968d0fe6..000000000000
--- a/cros-search-service-Include-cmath-for-std-pow.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8273f4d3130e06fd8b6bef87b07c936304b971d9 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Date: Tue, 10 Dec 2019 20:59:57 +0000
-Subject: [PATCH] [cros search service]: Include <cmath> for std::pow()
-
-IWYU. Follow up to commit 2b2ea3c09b ("[cros search service] Move shared
-string matching functions to //chrome"), which broke the libstdc++ build:
-
-    ../../chrome/common/string_matching/fuzzy_tokenized_string_match.cc:199:14: error: no member named 'pow' in namespace 'std'
-            std::pow(partial_match_penalty_rate, long_start - current - 1);
-            ~~~~~^
-
-Bug: 957519
-Change-Id: I66f61cb4f93cfa0bfa3d1b00ba391ddd8f31a7fb
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1960310
-Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Reviewed-by: Jia Meng <jiameng@chromium.org>
-Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Cr-Commit-Position: refs/heads/master@{#723499}
----
- chrome/common/string_matching/fuzzy_tokenized_string_match.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/common/string_matching/fuzzy_tokenized_string_match.cc b/chrome/common/string_matching/fuzzy_tokenized_string_match.cc
-index 8351fa701e4..884ef638c61 100644
---- a/chrome/common/string_matching/fuzzy_tokenized_string_match.cc
-+++ b/chrome/common/string_matching/fuzzy_tokenized_string_match.cc
-@@ -5,6 +5,7 @@
- #include "chrome/common/string_matching/fuzzy_tokenized_string_match.h"
- 
- #include <algorithm>
-+#include <cmath>
- #include <iterator>
- 
- #include "base/i18n/case_conversion.h"
diff --git a/fix-building-with-system-zlib.patch b/fix-building-with-system-zlib.patch
deleted file mode 100644
index d488ac20fe13..000000000000
--- a/fix-building-with-system-zlib.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From cda86e34ddadba5f08dea764881bbb6c8ec01e8a Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 25 Jan 2020 02:00:43 +0000
-Subject: [PATCH] Fix building with system zlib
-
-Add zlib_config target because perfetto depends on it.
-
-Bug: 977964
-Change-Id: I2aac5c3704f1274f932a61264d1c26a05f2db55e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019035
-Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
-Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#735201}
----
- build/linux/unbundle/zlib.gn | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/build/linux/unbundle/zlib.gn b/build/linux/unbundle/zlib.gn
-index 1fdd472f35e..97d6aebe6d5 100644
---- a/build/linux/unbundle/zlib.gn
-+++ b/build/linux/unbundle/zlib.gn
-@@ -13,6 +13,10 @@ config("system_zlib") {
-   defines = [ "USE_SYSTEM_ZLIB=1" ]
- }
- 
-+config("zlib_config") {
-+  configs = [ ":system_zlib" ]
-+}
-+
- source_set("zlib") {
-   deps = [ ":zlib_shim" ]
-   libs = [ "z" ]
diff --git a/fix-building-with-unbundled-libxml.patch b/fix-building-with-unbundled-libxml.patch
deleted file mode 100644
index 7b934376e6e4..000000000000
--- a/fix-building-with-unbundled-libxml.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From d3afade220ddb307e16a6dd4f2b0ec88b2af91e7 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 28 Jan 2020 18:16:54 +0000
-Subject: [PATCH] Fix building with unbundled libxml
-
-Add new targets to libxml.gn that were added in
- https://chromium-review.googlesource.com/c/chromium/src/+/1894877
-Adjust includes to use system libxml headers too
-
-Bug: 1043042
-Change-Id: I948c063e212e49b9e7f42fed2b8bf7f4af042ca7
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007110
-Reviewed-by: Robert Sesek <rsesek@chromium.org>
-Reviewed-by: Daniel Cheng <dcheng@chromium.org>
-Reviewed-by: Nico Weber <thakis@chromium.org>
-Commit-Queue: Robert Sesek <rsesek@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#735957}
----
- build/linux/unbundle/libxml.gn             | 41 ++++++++++++++++++++--
- third_party/libxml/chromium/libxml_utils.h |  4 +--
- third_party/libxml/chromium/xml_reader.cc  |  3 +-
- third_party/libxml/chromium/xml_writer.cc  |  3 +-
- 4 files changed, 45 insertions(+), 6 deletions(-)
-
-diff --git a/build/linux/unbundle/libxml.gn b/build/linux/unbundle/libxml.gn
-index c481bd3547b..3587881eea8 100644
---- a/build/linux/unbundle/libxml.gn
-+++ b/build/linux/unbundle/libxml.gn
-@@ -8,11 +8,48 @@ pkg_config("system_libxml") {
-   packages = [ "libxml-2.0" ]
- }
- 
--static_library("libxml") {
-+source_set("libxml") {
-+  public_configs = [ ":system_libxml" ]
-+}
-+
-+static_library("libxml_utils") {
-+  # Do not expand this visibility list without first consulting with the
-+  # Security Team.
-+  visibility = [
-+    ":xml_reader",
-+    ":xml_writer",
-+    "//base/test:test_support",
-+    "//services/data_decoder:xml_parser_fuzzer",
-+  ]
-   sources = [
-     "chromium/libxml_utils.cc",
-     "chromium/libxml_utils.h",
-   ]
--
-   public_configs = [ ":system_libxml" ]
- }
-+
-+static_library("xml_reader") {
-+  # Do not expand this visibility list without first consulting with the
-+  # Security Team.
-+  visibility = [
-+    "//base/test:test_support",
-+    "//components/policy/core/common:unit_tests",
-+    "//services/data_decoder:*",
-+    "//tools/traffic_annotation/auditor:auditor_sources",
-+  ]
-+  sources = [
-+    "chromium/xml_reader.cc",
-+    "chromium/xml_reader.h",
-+  ]
-+  deps = [ ":libxml_utils" ]
-+}
-+
-+static_library("xml_writer") {
-+  # The XmlWriter is considered safe to use from any target.
-+  visibility = [ "*" ]
-+  sources = [
-+    "chromium/xml_writer.cc",
-+    "chromium/xml_writer.h",
-+  ]
-+  deps = [ ":libxml_utils" ]
-+}
-diff --git a/third_party/libxml/chromium/libxml_utils.h b/third_party/libxml/chromium/libxml_utils.h
-index ff969fab540..8b2383f9c8b 100644
---- a/third_party/libxml/chromium/libxml_utils.h
-+++ b/third_party/libxml/chromium/libxml_utils.h
-@@ -5,9 +5,9 @@
- #ifndef THIRD_PARTY_LIBXML_CHROMIUM_LIBXML_UTILS_H_
- #define THIRD_PARTY_LIBXML_CHROMIUM_LIBXML_UTILS_H_
- 
--#include <string>
-+#include <libxml/xmlreader.h>
- 
--#include "third_party/libxml/src/include/libxml/xmlreader.h"
-+#include <string>
- 
- // libxml uses a global error function pointer for reporting errors.
- // A ScopedXmlErrorFunc object lets you change the global error pointer
-diff --git a/third_party/libxml/chromium/xml_reader.cc b/third_party/libxml/chromium/xml_reader.cc
-index 92464f4cbcc..899ccefb7c8 100644
---- a/third_party/libxml/chromium/xml_reader.cc
-+++ b/third_party/libxml/chromium/xml_reader.cc
-@@ -4,10 +4,11 @@
- 
- #include "third_party/libxml/chromium/xml_reader.h"
- 
-+#include <libxml/xmlreader.h>
-+
- #include <vector>
- 
- #include "third_party/libxml/chromium/libxml_utils.h"
--#include "third_party/libxml/src/include/libxml/xmlreader.h"
- 
- using internal::XmlStringToStdString;
- 
-diff --git a/third_party/libxml/chromium/xml_writer.cc b/third_party/libxml/chromium/xml_writer.cc
-index 51fce8ebeb1..7c58031fe2d 100644
---- a/third_party/libxml/chromium/xml_writer.cc
-+++ b/third_party/libxml/chromium/xml_writer.cc
-@@ -4,8 +4,9 @@
- 
- #include "third_party/libxml/chromium/xml_writer.h"
- 
-+#include <libxml/xmlwriter.h>
-+
- #include "third_party/libxml/chromium/libxml_utils.h"
--#include "third_party/libxml/src/include/libxml/xmlwriter.h"
- 
- XmlWriter::XmlWriter() : writer_(nullptr), buffer_(nullptr) {}
- 
diff --git a/fix-shim-header-generation-when-unbundling-ICU.patch b/fix-shim-header-generation-when-unbundling-ICU.patch
deleted file mode 100644
index 04f1ecd3bced..000000000000
--- a/fix-shim-header-generation-when-unbundling-ICU.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From dcad5af090528018599277dc5d7e160fb6b2d68e Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 15 Jan 2020 20:26:40 +0000
-Subject: [PATCH] Fix shim header generation when unbundling ICU
-
-listformatter.h was moved from icuuc to icui18n
-
-Bug: 989153
-Change-Id: I9fcb56f6d5af7787f34ea99b737e2ed8fe741c84
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2000142
-Reviewed-by: Lei Zhang <thestig@chromium.org>
-Commit-Queue: Lei Zhang <thestig@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#732114}
----
- AUTHORS                     | 1 +
- build/linux/unbundle/icu.gn | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/AUTHORS b/AUTHORS
-index 7523e483aae..1618fddc633 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -891,6 +891,7 @@ Soren Dreijer <dreijerbit@gmail.com>
- Sreerenj Balachandran <sreerenj.balachandran@intel.com>
- Srirama Chandra Sekhar Mogali <srirama.m@samsung.com>
- Staphany Park <stapark008@gmail.com>
-+Stephan Hartmann <stha09@googlemail.com>
- Stephen Searles <stephen.searles@gmail.com>
- Steve Sanders <steve@zanderz.com>
- Steven Pennington <spenn@engr.uvic.ca>
-diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn
-index 923bd7f5ac3..e77bc43db87 100644
---- a/build/linux/unbundle/icu.gn
-+++ b/build/linux/unbundle/icu.gn
-@@ -92,6 +92,7 @@ shim_headers("icui18n_shim") {
-     "unicode/fpositer.h",
-     "unicode/gender.h",
-     "unicode/gregocal.h",
-+    "unicode/listformatter.h",
-     "unicode/measfmt.h",
-     "unicode/measunit.h",
-     "unicode/measure.h",
-@@ -174,7 +175,6 @@ shim_headers("icuuc_shim") {
-     "unicode/icudataver.h",
-     "unicode/icuplug.h",
-     "unicode/idna.h",
--    "unicode/listformatter.h",
-     "unicode/localpointer.h",
-     "unicode/locdspnm.h",
-     "unicode/locid.h",
diff --git a/flags.archlinux.gn b/flags.archlinux.gn
index d19ae490bbea..9c174777ccd3 100644
--- a/flags.archlinux.gn
+++ b/flags.archlinux.gn
@@ -1,35 +1,31 @@
-blink_symbol_level=0
 custom_toolchain="//build/toolchain/linux/unbundle:default"
-enable_iterator_debugging=false
-fatal_linker_warnings=false
-ffmpeg_branding="Chrome"
-gold_path=""
-goma_dir=""
-is_official_build=true
 host_toolchain="//build/toolchain/linux/unbundle:default"
-is_clang=true
+is_official_build=true
+ffmpeg_branding="Chrome"
+proprietary_codecs=true
+rtc_use_pipewire=true
 link_pulseaudio=true
+use_gnome_keyring=false
+use_sysroot=false
 linux_use_bundled_binutils=false
-proprietary_codecs=true
-symbol_level=0
-use_cups=true
 use_custom_libcxx=false
-use_gio=true
-use_gnome_keyring=false
+enable_swiftshader=false
+use_vaapi=true
+fatal_linker_warnings=false
+is_clang=true
 use_kerberos=false
 use_libjpeg_turbo=true
-use_lld=true
-use_openh264=false
 use_pulseaudio=true
-use_sysroot=false
 use_system_freetype=true
 use_system_harfbuzz=true
 use_system_lcms2=true
 use_system_libjpeg=true
 use_system_zlib=true
-use_vaapi=true
-enable_swiftshader=false
 icu_use_data_file=false
+# symbol_level = 2 causes OBS to run out of space
+symbol_level=0
+blink_symbol_level=0
+#exclude_unwind_tables=false
 use_ozone=true
 ozone_platform_wayland=true
 ozone_platform_x11=true
diff --git a/move-RemoteTreeNode-declaration.patch b/move-RemoteTreeNode-declaration.patch
deleted file mode 100644
index 50fc78cdb47a..000000000000
--- a/move-RemoteTreeNode-declaration.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-From cdf3e81ff49b200213d67d65558f2919222b60ab Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Date: Mon, 16 Dec 2019 11:39:11 +0000
-Subject: [PATCH] BookmarkModelMerger: Move RemoteTreeNode declaration to
- header.
-
-This fixes the build with libstdc++ after commit 8f5dad93e58 ("Fix CHECK
-failure due to untracked local nodes"):
-
-/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/stl_pair.h:215:11: error: field has incomplete type 'sync_bookmarks::BookmarkModelMerger::RemoteTreeNode'
-      _T2 second;                /// @c second is a copy of the second object
-          ^
-/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/ext/aligned_buffer.h:91:28: note: in instantiation of template class 'std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>' requested here
-    : std::aligned_storage<sizeof(_Tp), __alignof__(_Tp)>
-                           ^
-/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/hashtable_policy.h:233:43: note: in instantiation of template class '__gnu_cxx::__aligned_buffer<std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> >' requested here
-      __gnu_cxx::__aligned_buffer<_Value> _M_storage;
-                                          ^
-/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/hashtable_policy.h:264:39: note: in instantiation of template class 'std::__detail::_Hash_node_value_base<std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> >' requested here
-    struct _Hash_node<_Value, true> : _Hash_node_value_base<_Value>
-                                      ^
-/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/hashtable_policy.h:2028:25: note: in instantiation of template class 'std::__detail::_Hash_node<std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>, true>' requested here
-        rebind_traits<typename __node_type::value_type>;
-                               ^
-/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/hashtable.h:184:15: note: in instantiation of template class 'std::__detail::_Hashtable_alloc<std::allocator<std::__detail::_Hash_node<std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>, true> > >
-' requested here
-      private __detail::_Hashtable_alloc<
-              ^
-/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/unordered_map.h:105:18: note: in instantiation of template class 'std::_Hashtable<std::__cxx11::basic_string<char>, std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>, std::allocator<std::pair<con
-st std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> >, std::__detail::_Select1st, std::equal_to<std::__cxx11::basic_string<char> >, std::hash<std::string>, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__deta
-il::_Hashtable_traits<true, false, true> >' requested here
-      _Hashtable _M_h;
-                 ^
-../../components/sync_bookmarks/bookmark_model_merger.h:146:22: note: in instantiation of template class 'std::unordered_map<std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode, std::hash<std::string>, std::equal_to<std::__cxx11::basic_string<char> >, std::allocator<std::pair<con
-st std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> > >' requested here
-  const RemoteForest remote_forest_;
-                     ^
-../../components/sync_bookmarks/bookmark_model_merger.h:53:9: note: forward declaration of 'sync_bookmarks::BookmarkModelMerger::RemoteTreeNode'
-  class RemoteTreeNode;
-        ^
-
-Essentially, the problem is that libstdc++'s std::unordered_map<T, U>
-implementation requires both T and U to be fully declared. I raised the
-problem in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92770, and GCC's
-position is that we are relying on undefined behavior according to the C++
-standard (https://eel.is/c++draft/requirements#res.on.functions-2.5).
-
-Bug: 957519
-Change-Id: Ife7e435e516932a795bfbe05b2c910c3272878f0
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1960156
-Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Reviewed-by: Mikel Astiz <mastiz@chromium.org>
-Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Cr-Commit-Position: refs/heads/master@{#725070}
----
- .../sync_bookmarks/bookmark_model_merger.cc   | 89 +++++++------------
- .../sync_bookmarks/bookmark_model_merger.h    | 48 +++++++++-
- 2 files changed, 80 insertions(+), 57 deletions(-)
-
-diff --git a/components/sync_bookmarks/bookmark_model_merger.cc b/components/sync_bookmarks/bookmark_model_merger.cc
-index eae153eff95..579848ee664 100644
---- a/components/sync_bookmarks/bookmark_model_merger.cc
-+++ b/components/sync_bookmarks/bookmark_model_merger.cc
-@@ -5,7 +5,6 @@
- #include "components/sync_bookmarks/bookmark_model_merger.h"
- 
- #include <algorithm>
--#include <memory>
- #include <set>
- #include <string>
- #include <utility>
-@@ -205,66 +204,44 @@ UpdatesPerParentId GroupValidUpdatesByParentId(
- 
- }  // namespace
- 
--class BookmarkModelMerger::RemoteTreeNode final {
-- public:
--  // Constructs a tree given |update| as root and recursively all descendants by
--  // traversing |*updates_per_parent_id|. |update| and |updates_per_parent_id|
--  // must not be null. All updates |*updates_per_parent_id| must represent valid
--  // updates. Updates corresponding from descendant nodes are moved away from
--  // |*updates_per_parent_id|.
--  static RemoteTreeNode BuildTree(
--      std::unique_ptr<syncer::UpdateResponseData> update,
--      UpdatesPerParentId* updates_per_parent_id);
--
--  ~RemoteTreeNode() = default;
--
--  // Allow moves, useful during construction.
--  RemoteTreeNode(RemoteTreeNode&&) = default;
--  RemoteTreeNode& operator=(RemoteTreeNode&&) = default;
--
--  const syncer::EntityData& entity() const { return *update_->entity; }
--  int64_t response_version() const { return update_->response_version; }
--
--  // Direct children nodes, sorted by ascending unique position. These are
--  // guaranteed to be valid updates (e.g. IsValidBookmarkSpecifics()).
--  const std::vector<RemoteTreeNode>& children() const { return children_; }
--
--  // Recursively emplaces all GUIDs (this node and descendants) into
--  // |*guid_to_remote_node_map|, which must not be null.
--  void EmplaceSelfAndDescendantsByGUID(
--      std::unordered_map<std::string, const RemoteTreeNode*>*
--          guid_to_remote_node_map) const {
--    DCHECK(guid_to_remote_node_map);
--
--    const std::string& guid = entity().specifics.bookmark().guid();
--    if (!guid.empty()) {
--      DCHECK(base::IsValidGUID(guid));
--
--      // Duplicate GUIDs have been sorted out before.
--      bool success = guid_to_remote_node_map->emplace(guid, this).second;
--      DCHECK(success);
--    }
-+BookmarkModelMerger::RemoteTreeNode::RemoteTreeNode() = default;
- 
--    for (const RemoteTreeNode& child : children_) {
--      child.EmplaceSelfAndDescendantsByGUID(guid_to_remote_node_map);
--    }
--  }
-+BookmarkModelMerger::RemoteTreeNode::~RemoteTreeNode() = default;
-+
-+BookmarkModelMerger::RemoteTreeNode::RemoteTreeNode(
-+    BookmarkModelMerger::RemoteTreeNode&&) = default;
-+BookmarkModelMerger::RemoteTreeNode& BookmarkModelMerger::RemoteTreeNode::
-+operator=(BookmarkModelMerger::RemoteTreeNode&&) = default;
-+
-+void BookmarkModelMerger::RemoteTreeNode::EmplaceSelfAndDescendantsByGUID(
-+    std::unordered_map<std::string, const RemoteTreeNode*>*
-+        guid_to_remote_node_map) const {
-+  DCHECK(guid_to_remote_node_map);
-+
-+  const std::string& guid = entity().specifics.bookmark().guid();
-+  if (!guid.empty()) {
-+    DCHECK(base::IsValidGUID(guid));
- 
-- private:
--  static bool UniquePositionLessThan(const RemoteTreeNode& lhs,
--                                     const RemoteTreeNode& rhs) {
--    const syncer::UniquePosition a_pos =
--        syncer::UniquePosition::FromProto(lhs.entity().unique_position);
--    const syncer::UniquePosition b_pos =
--        syncer::UniquePosition::FromProto(rhs.entity().unique_position);
--    return a_pos.LessThan(b_pos);
-+    // Duplicate GUIDs have been sorted out before.
-+    bool success = guid_to_remote_node_map->emplace(guid, this).second;
-+    DCHECK(success);
-   }
- 
--  RemoteTreeNode() = default;
-+  for (const RemoteTreeNode& child : children_) {
-+    child.EmplaceSelfAndDescendantsByGUID(guid_to_remote_node_map);
-+  }
-+}
- 
--  std::unique_ptr<syncer::UpdateResponseData> update_;
--  std::vector<RemoteTreeNode> children_;
--};
-+// static
-+bool BookmarkModelMerger::RemoteTreeNode::UniquePositionLessThan(
-+    const RemoteTreeNode& lhs,
-+    const RemoteTreeNode& rhs) {
-+  const syncer::UniquePosition a_pos =
-+      syncer::UniquePosition::FromProto(lhs.entity().unique_position);
-+  const syncer::UniquePosition b_pos =
-+      syncer::UniquePosition::FromProto(rhs.entity().unique_position);
-+  return a_pos.LessThan(b_pos);
-+}
- 
- // static
- BookmarkModelMerger::RemoteTreeNode
-diff --git a/components/sync_bookmarks/bookmark_model_merger.h b/components/sync_bookmarks/bookmark_model_merger.h
-index 9b592000dc5..bf0783ecf8e 100644
---- a/components/sync_bookmarks/bookmark_model_merger.h
-+++ b/components/sync_bookmarks/bookmark_model_merger.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_MERGER_H_
- #define COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_MERGER_H_
- 
-+#include <memory>
- #include <string>
- #include <unordered_map>
- #include <vector>
-@@ -50,7 +51,52 @@ class BookmarkModelMerger {
- 
-  private:
-   // Internal representation of a remote tree, composed of nodes.
--  class RemoteTreeNode;
-+  class RemoteTreeNode final {
-+   private:
-+    using UpdatesPerParentId =
-+        std::unordered_map<base::StringPiece,
-+                           syncer::UpdateResponseDataList,
-+                           base::StringPieceHash>;
-+
-+   public:
-+    // Constructs a tree given |update| as root and recursively all descendants
-+    // by traversing |*updates_per_parent_id|. |update| and
-+    // |updates_per_parent_id| must not be null. All updates
-+    // |*updates_per_parent_id| must represent valid updates. Updates
-+    // corresponding from descendant nodes are moved away from
-+    // |*updates_per_parent_id|.
-+    static RemoteTreeNode BuildTree(
-+        std::unique_ptr<syncer::UpdateResponseData> update,
-+        UpdatesPerParentId* updates_per_parent_id);
-+
-+    ~RemoteTreeNode();
-+
-+    // Allow moves, useful during construction.
-+    RemoteTreeNode(RemoteTreeNode&&);
-+    RemoteTreeNode& operator=(RemoteTreeNode&&);
-+
-+    const syncer::EntityData& entity() const { return *update_->entity; }
-+    int64_t response_version() const { return update_->response_version; }
-+
-+    // Direct children nodes, sorted by ascending unique position. These are
-+    // guaranteed to be valid updates (e.g. IsValidBookmarkSpecifics()).
-+    const std::vector<RemoteTreeNode>& children() const { return children_; }
-+
-+    // Recursively emplaces all GUIDs (this node and descendants) into
-+    // |*guid_to_remote_node_map|, which must not be null.
-+    void EmplaceSelfAndDescendantsByGUID(
-+        std::unordered_map<std::string, const RemoteTreeNode*>*
-+            guid_to_remote_node_map) const;
-+
-+   private:
-+    static bool UniquePositionLessThan(const RemoteTreeNode& lhs,
-+                                       const RemoteTreeNode& rhs);
-+
-+    RemoteTreeNode();
-+
-+    std::unique_ptr<syncer::UpdateResponseData> update_;
-+    std::vector<RemoteTreeNode> children_;
-+  };
- 
-   // A forest composed of multiple trees where the root of each tree represents
-   // a permanent node, keyed by server-defined unique tag of the root.
diff --git a/remove-verbose-logging-in-local-unique-font-matching.patch b/remove-verbose-logging-in-local-unique-font-matching.patch
deleted file mode 100644
index a88286181017..000000000000
--- a/remove-verbose-logging-in-local-unique-font-matching.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8500a125e9fba8bb84d185542155747ee7157ff8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= <drott@chromium.org>
-Date: Tue, 28 Jan 2020 13:48:07 +0000
-Subject: [PATCH] Remove verbose logging in local unique font matching on Linux
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixed: 1005508
-Change-Id: I97f5340c6d1881798ba51effc4a9e5c07de12e52
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2023552
-Commit-Queue: Dominik Röttsches <drott@chromium.org>
-Commit-Queue: Kentaro Hara <haraken@chromium.org>
-Auto-Submit: Dominik Röttsches <drott@chromium.org>
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#735854}
----
- content/child/child_process_sandbox_support_impl_linux.cc | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/content/child/child_process_sandbox_support_impl_linux.cc b/content/child/child_process_sandbox_support_impl_linux.cc
-index 693ead7f7a5..c97c8fa197b 100644
---- a/content/child/child_process_sandbox_support_impl_linux.cc
-+++ b/content/child/child_process_sandbox_support_impl_linux.cc
-@@ -76,8 +76,6 @@ bool WebSandboxSupportLinux::MatchFontByPostscriptNameOrFullFontName(
-   std::string family_name;
-   if (!font_loader_->MatchFontByPostscriptNameOrFullFontName(font_unique_name,
-                                                              &font_identity)) {
--    LOG(ERROR) << "FontService unique font name matching request did not "
--                  "receive a response.";
-     return false;
-   }
- 
diff --git a/sync-enable-USSPasswords-by-default.patch b/sync-enable-USSPasswords-by-default.patch
deleted file mode 100644
index 7f3a7005a66c..000000000000
--- a/sync-enable-USSPasswords-by-default.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From eb997db5527c01fd12c321a6abc52b7cff882e50 Mon Sep 17 00:00:00 2001
-From: Mohamed Amir Yosef <mamir@chromium.org>
-Date: Thu, 9 Jan 2020 21:22:19 +0000
-Subject: [PATCH] [Sync] Enable USSPasswords by default
-
-Change-Id: I021cd952d7a2917a8fb7203cabdac612251193df
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1963804
-Auto-Submit: Mohamed Amir Yosef <mamir@chromium.org>
-Reviewed-by: Mikel Astiz <mastiz@chromium.org>
-Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#729902}
----
- components/sync/driver/sync_driver_switches.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/components/sync/driver/sync_driver_switches.cc b/components/sync/driver/sync_driver_switches.cc
-index ddff8b91419..999384aa68a 100644
---- a/components/sync/driver/sync_driver_switches.cc
-+++ b/components/sync/driver/sync_driver_switches.cc
-@@ -55,7 +55,7 @@ const base::Feature kStopSyncInPausedState{"StopSyncInPausedState",
- 
- // Enable USS implementation of Passwords datatype.
- const base::Feature kSyncUSSPasswords{"SyncUSSPasswords",
--                                      base::FEATURE_DISABLED_BY_DEFAULT};
-+                                      base::FEATURE_ENABLED_BY_DEFAULT};
- 
- // Enable USS implementation of Nigori datatype.
- const base::Feature kSyncUSSNigori{"SyncUSSNigori",
diff --git a/vaapi-build-fix.patch b/vaapi-build-fix.patch
new file mode 100644
index 000000000000..2b7851acecbb
--- /dev/null
+++ b/vaapi-build-fix.patch
@@ -0,0 +1,51 @@
+From 5b2ff215473e0526b5b24aeff4ad90d369b21c75 Mon Sep 17 00:00:00 2001
+From: Julien Isorce <julien.isorce@chromium.org>
+Date: Wed, 05 Feb 2020 17:59:59 +0000
+Subject: [PATCH] Fix vaapi with GLX
+
+The signature of ui's gl::GLImageGLX has changed a little bit
+since "mplement GpuMemoryBuffers for EGL and GLX":
+  https://chromium-review.googlesource.com/c/chromium/src/+/1984712
+
+Bug: 1031269
+Test: build with use_vaapi=true and run with --use-gl=desktop, see
+Change-Id: I80b07294b9abdfa8233aaf79f7d9ec4c58117090
+https: //chromium.googlesource.com/chromium/src.git/+/refs/heads/master/docs/gpu/vaapi.md#vaapi-on-linux
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036494
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+Reviewed-by: Miguel Casas <mcasas@chromium.org>
+Commit-Queue: Julien Isorce <julien.isorce@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#738595}
+---
+
+diff --git a/media/gpu/vaapi/vaapi_picture_tfp.cc b/media/gpu/vaapi/vaapi_picture_tfp.cc
+index 227c31b..b42620d 100644
+--- a/media/gpu/vaapi/vaapi_picture_tfp.cc
++++ b/media/gpu/vaapi/vaapi_picture_tfp.cc
+@@ -57,7 +57,7 @@
+   if (make_context_current_cb_ && !make_context_current_cb_.Run())
+     return false;
+
+-  glx_image_ = new gl::GLImageGLX(size_, GL_RGB);
++  glx_image_ = new gl::GLImageGLX(size_, gfx::BufferFormat::BGRX_8888);
+   if (!glx_image_->Initialize(x_pixmap_)) {
+     // x_pixmap_ will be freed in the destructor.
+     DLOG(ERROR) << "Failed creating a GLX Pixmap for TFP";
+--- a/media/mojo/services/gpu_mojo_media_client.cc	2020-04-02 21:11:34.000000000 -0700
++++ b/media/mojo/services/gpu_mojo_media_client.cc	2020-04-09 00:44:58.871366432 -0700
+@@ -158,6 +158,7 @@
+       *d3d11_supported_configs_;
+
+ #elif BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
++#if defined(OS_CHROMEOS)
+   if (base::FeatureList::IsEnabled(kChromeosVideoDecoder)) {
+     if (!cros_supported_configs_) {
+       cros_supported_configs_ =
+@@ -167,6 +168,7 @@
+         *cros_supported_configs_;
+     return supported_config_map;
+   }
++#endif  //defined(OS_CHROMEOS)
+ #endif
+
+   auto& default_configs =
diff --git a/vaapi-fix-wayland-init.patch b/vaapi-fix-wayland-init.patch
deleted file mode 100644
index a07814969f41..000000000000
--- a/vaapi-fix-wayland-init.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 4a04af6bbd5b1a55e2e1a7c22f13f8571c2dd7ed Mon Sep 17 00:00:00 2001
-From: Julien Isorce <julien.isorce@chromium.org>
-Date: Fri, 24 Jan 2020 00:30:33 +0000
-Subject: [PATCH] Reland "Call PreSandboxStartup after GL initialization in GpuInit"
-
-This is a reland of d17c53b341adcfc9e2626162536a08c9f3e24017
-
-Original change's description:
-> Call PreSandboxStartup after GL initialization in GpuInit
-> 
-> Fixes "vaInitialize failed: unknown libva error"
-> on Wayland with LIBVA_DRIVER_NAME=i965
-> 
-> VaapiWrapper relies on the GL implementation to decide
-> which display to use. If the GL implementation is none,
-> then VaapiWrapper is likely to do the wrong guess resulting
-> in the above error.
-> 
-> Bug: 1041229
-> Change-Id: I1255a032a5e14b3aaffe3026a886de7e6d9ff0d7
-> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2011640
-> Reviewed-by: Maggie Chen <magchen@chromium.org>
-> Reviewed-by: Kenneth Russell <kbr@chromium.org>
-> Commit-Queue: Julien Isorce <julien.isorce@chromium.org>
-> Cr-Commit-Position: refs/heads/master@{#733847}
-
-Bug: 1041229
-Change-Id: I8e268596a1e2a1b3da7d7e75b8943accc85dd2d7
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2013806
-Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
-Reviewed-by: Maggie Chen <magchen@chromium.org>
-Reviewed-by: Kenneth Russell <kbr@chromium.org>
-Commit-Queue: Julien Isorce <julien.isorce@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#734746}
----
-
-diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
-index 04883fc..4e63f7a 100644
---- a/gpu/ipc/service/gpu_init.cc
-+++ b/gpu/ipc/service/gpu_init.cc
-@@ -221,10 +221,16 @@
-   delayed_watchdog_enable = true;
- #endif
- 
-+#if defined(OS_LINUX)
-   // PreSandbox is mainly for resource handling and not related to the GPU
-   // driver, it doesn't need the GPU watchdog. The loadLibrary may take long
-   // time that killing and restarting the GPU process will not help.
--  sandbox_helper_->PreSandboxStartup();
-+  if (gpu_preferences_.gpu_sandbox_start_early) {
-+    // The sandbox will be started earlier than usual (i.e. before GL) so
-+    // execute the pre-sandbox steps now.
-+    sandbox_helper_->PreSandboxStartup();
-+  }
-+#endif
- 
-   // Start the GPU watchdog only after anything that is expected to be time
-   // consuming has completed, otherwise the process is liable to be aborted.
-@@ -320,6 +326,23 @@
-     }
-   }
- 
-+  // The ContentSandboxHelper is currently the only one implementation of
-+  // gpu::GpuSandboxHelper and it has no dependency. Except on Linux where
-+  // VaapiWrapper checks the GL implementation to determine which display
-+  // to use. So call PreSandboxStartup after GL initialization. But make
-+  // sure the watchdog is paused as loadLibrary may take a long time and
-+  // restarting the GPU process will not help.
-+  if (!attempted_startsandbox) {
-+    if (watchdog_thread_)
-+      watchdog_thread_->PauseWatchdog();
-+
-+    // The sandbox is not started yet.
-+    sandbox_helper_->PreSandboxStartup();
-+
-+    if (watchdog_thread_)
-+      watchdog_thread_->ResumeWatchdog();
-+  }
-+
-   bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled;
- 
-   // Compute passthrough decoder status before ComputeGpuFeatureInfo below.
diff --git a/vaapi-fix.patch b/vdpau-support.patch
index b5372d1a2556..b5372d1a2556 100644
--- a/vaapi-fix.patch
+++ b/vdpau-support.patch