uppkg -> 116.0.5845.96-1

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = ungoogled-chromium-xdg
 	pkgdesc = A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory
-	pkgver = 116.0.5845.82
+	pkgver = 116.0.5845.96
 	pkgrel = 1
 	url = https://github.com/ungoogled-software/ungoogled-chromium
 	arch = x86_64
@@ -55,36 +55,30 @@ pkgbase = ungoogled-chromium-xdg
 	optdepends = qt5-base: enable Qt5 with --enable-features=AllowQt
 	optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
 	optdepends = kwallet: support for storing passwords in KWallet on Plasma
-	provides = chromium=116.0.5845.82
-	provides = chromedriver=116.0.5845.82
+	provides = chromium=116.0.5845.96
+	provides = chromedriver=116.0.5845.96
 	conflicts = chromium
 	conflicts = chromedriver
 	options = !lto
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-116.0.5845.82.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-116.0.5845.96.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-115-patchset-2/chromium-115-patchset-2.tar.xz
+	source = https://github.com/stha09/chromium-patches/releases/download/chromium-116-patchset-2/chromium-116-patchset-2.tar.xz
 	source = REVERT-disable-autoupgrading-debug-info.patch
 	source = random-build-fixes.patch
 	source = use-oauth2-client-switches-as-default.patch
 	source = xdg-basedir.patch
 	source = no-omnibox-suggestion-autocomplete.patch
 	source = index.html
-	source = ungoogled-chromium-116.0.5845.82-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/refs/tags/116.0.5845.82-1.tar.gz
-	source = ozone-add-va-api-support-to-wayland.patch
-	source = vaapi-add-av1-support.patch
-	source = remove-main-main10-profile-limit.patch
-	sha256sums = 6da04e232fcb3ebffdd4354c4ae382df24db0ddd6cf29eaaa4ed905ae84b47d3
+	source = ungoogled-chromium-116.0.5845.96-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/refs/tags/116.0.5845.96-1.tar.gz
+	sha256sums = 1ec1052a959abced9642b36482549bc2ebefa428ed136289d8e0c54b4ccd1c81
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
 	sha256sums = 4f91bd10a8ae2aa7b040a8b27e01f38910ad33cbe179e39a1ae550c9c1523384
 	sha256sums = 1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69
-	sha256sums = cf8e3db56da0fd45dfd4d4194169067db75b49fd11890f35cf618e6942f3ae43
+	sha256sums = e938c6ee7087eed8f0de83ffb0ca89e328575808fafa4fe3950aeb1bc58b9411
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
 	sha256sums = f97e6cd3c4d2e04f5d9a0ea234fe768d6ba0fa9f4ecd5c7b2ca91030a1249078
 	sha256sums = ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8
 	sha256sums = a4cdd2b86f32d5302c2792be841ff40d982b19bb58a4e63df9d77f4c706b8665
-	sha256sums = 60d03a255289e70ee2f2448520dac80343a0d2ab6054ebdf220deaf4092c89cd
-	sha256sums = e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69
-	sha256sums = e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307
-	sha256sums = be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c
+	sha256sums = 262ffd7551b76c7d527c95a1c3e11e0431ef8627ebcb1d5c2f0d60fb902b82d8
 
 pkgname = ungoogled-chromium-xdg

PKGBUILD

@@ -10,10 +10,10 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ungoogled-chromium-xdg
-pkgver=116.0.5845.82
+pkgver=116.0.5845.96
 pkgrel=1
 _launcher_ver=8
-_gcc_patchset=115-patchset-2
+_gcc_patchset=116-patchset-2
 _manual_clone=0
 pkgdesc="A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory"
 arch=('x86_64')
@@ -32,18 +32,18 @@ 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://github.com/stha09/chromium-patches/releases/download/chromium-$_gcc_patchset/chromium-$_gcc_patchset.tar.xz
+        https://github.com/stha09/chromium-patches/releases/download/chromium-$_gcc_patchset/chromium-$_gcc_patchset.tar.xz
         REVERT-disable-autoupgrading-debug-info.patch
         random-build-fixes.patch
         use-oauth2-client-switches-as-default.patch
         xdg-basedir.patch
         no-omnibox-suggestion-autocomplete.patch
         index.html)
-sha256sums=('6da04e232fcb3ebffdd4354c4ae382df24db0ddd6cf29eaaa4ed905ae84b47d3'
+sha256sums=('1ec1052a959abced9642b36482549bc2ebefa428ed136289d8e0c54b4ccd1c81'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
             '4f91bd10a8ae2aa7b040a8b27e01f38910ad33cbe179e39a1ae550c9c1523384'
             '1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69'
-            'cf8e3db56da0fd45dfd4d4194169067db75b49fd11890f35cf618e6942f3ae43'
+            'e938c6ee7087eed8f0de83ffb0ca89e328575808fafa4fe3950aeb1bc58b9411'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711'
             'f97e6cd3c4d2e04f5d9a0ea234fe768d6ba0fa9f4ecd5c7b2ca91030a1249078'
             'ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8'
@@ -59,16 +59,10 @@ conflicts=('chromium' 'chromedriver')
 _uc_usr=ungoogled-software
 _uc_ver=$pkgver-1
 source=(${source[@]}
-        ${pkgname%-*}-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/refs/tags/$_uc_ver.tar.gz
+        ${pkgname%-*}-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/refs/tags/$_uc_ver.tar.gz)
         #${pkgname%-*}-$_uc_ver.zip::https://github.com/Ahrotahn/${pkgname%-*}/archive/refs/heads/update.zip
-        ozone-add-va-api-support-to-wayland.patch
-        vaapi-add-av1-support.patch
-        remove-main-main10-profile-limit.patch)
 sha256sums=(${sha256sums[@]}
-            '60d03a255289e70ee2f2448520dac80343a0d2ab6054ebdf220deaf4092c89cd'
-            'e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69'
-            'e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307'
-            'be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c')
+            '262ffd7551b76c7d527c95a1c3e11e0431ef8627ebcb1d5c2f0d60fb902b82d8')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
 # Keys are the names in the above script; values are the dependencies in Arch
@@ -143,6 +137,8 @@ prepare() {
   patch -Np1 -i ../patches/chromium-114-ruy-include.patch
   patch -Np1 -i ../patches/chromium-114-vk_mem_alloc-include.patch
   patch -Np1 -i ../patches/chromium-114-maldoca-include.patch
+  patch -Np1 -i ../patches/chromium-116-object_paint_properties_sparse-include.patch
+  patch -Np1 -i ../patches/chromium-116-profile_view_utils-include.patch
 
 
   # move ~/.pki directory to ${XDG_DATA_HOME:-$HOME/.local}/share/pki
@@ -154,10 +150,6 @@ prepare() {
   patch -p1 -i ../no-omnibox-suggestion-autocomplete.patch
 
   # Custom Patches
-  # patch -Np1 -i ../ozone-add-va-api-support-to-wayland.patch
-  # patch -Np1 -i ../vaapi-add-av1-support.patch
-  sed -i '/^bool IsHevcProfileSupported(const VideoType& type) {$/{s++bool IsHevcProfileSupported(const VideoType\& type) { return true;+;h};${x;/./{x;q0};x;q1}' \
-    media/base/supported_types.cc
 
 
   # Ungoogled Chromium changes
@@ -212,11 +204,9 @@ build() {
     'custom_toolchain="//build/toolchain/linux/unbundle:default"'
     'host_toolchain="//build/toolchain/linux/unbundle:default"'
     'clang_base_path="/usr"'
-    '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'
+    #'chrome_pgo_phase=0' # needs newer clang to read the bundled PGO profile
     'disable_fieldtrial_testing_config=true'
     'blink_enable_generated_code_formatting=false'
     'ffmpeg_branding="Chrome"'
@@ -227,23 +217,18 @@ build() {
     'use_gnome_keyring=false'
     'use_sysroot=false'
     'use_system_libffi=true'
-    'enable_hangout_services_extension=true'
     'enable_widevine=true'
     'enable_nacl=false'
     'enable_rust=false'
-    "google_api_key=\"$_google_api_key\""
+    'use_vaapi=true'
+    'enable_platform_hevc=true'
+    'enable_hevc_parser_and_hw_decoder=true'
   )
 
   if [[ -n ${_system_libs[icu]+set} ]]; then
     _flags+=('icu_use_data_file=false')
   fi
 
-  # enable HEVC decoding
-  _flags+=(
-    'enable_platform_hevc=true'
-    'enable_hevc_parser_and_hw_decoder=true'
-  )
-
   # Append ungoogled chromium flags to _flags array
   if [[ -d "$srcdir/${pkgname%xdg*}$_uc_ver" ]]
   then

ozone-add-va-api-support-to-wayland.patch

@@ -1,128 +0,0 @@
-From: Maksim Sisov <msisov@igalia.com>
-Date: Wed, 20 Jan 2021 09:50:22 +0200
-Subject: [PATCH] ozone/wayland: add VA-API support.
-
-This patch ads VA-API support utilizing old VA-API path used for
-ChromeOS, which can be buggy on some devices (currently tested
-on Intel Gen8 and Gen9 with Gen8 having some minor bugs).
-
-It's known that a new VA-API is being developed atm and once it's ready,
-we will switch to a new path, which should be more stable.
-
-Upstream-Status: Inappropriate
-
-The patch is based on the old va-api path. ChromeOS
-team is working on the new path, which will be also employed
-by Wayland later.
-
----
-diff --git a/media/gpu/vaapi/vaapi_picture_factory.cc b/media/gpu/vaapi/vaapi_picture_factory.cc
-index 54825cd..0a57166 100644
---- a/media/gpu/vaapi/vaapi_picture_factory.cc
-+++ b/media/gpu/vaapi/vaapi_picture_factory.cc
-@@ -105,7 +105,7 @@ uint32_t VaapiPictureFactory::GetGLTextureTarget() {
- }
- 
- gfx::BufferFormat VaapiPictureFactory::GetBufferFormat() {
--#if BUILDFLAG(USE_VAAPI_X11)
-+#if BUILDFLAG(IS_LINUX)
-   return gfx::BufferFormat::RGBX_8888;
- #else
-   return gfx::BufferFormat::YUV_420_BIPLANAR;
-diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap.cc b/media/gpu/vaapi/vaapi_picture_native_pixmap.cc
-index 18c6c22..fe614b6 100644
---- a/media/gpu/vaapi/vaapi_picture_native_pixmap.cc
-+++ b/media/gpu/vaapi/vaapi_picture_native_pixmap.cc
-@@ -4,6 +4,7 @@
- 
- #include "media/gpu/vaapi/vaapi_picture_native_pixmap.h"
- 
-+#include "media/gpu/macros.h"
- #include "media/gpu/vaapi/va_surface.h"
- #include "media/gpu/vaapi/vaapi_wrapper.h"
- #include "ui/gfx/buffer_format_util.h"
-@@ -40,7 +41,21 @@ VaapiPictureNativePixmap::~VaapiPictureNativePixmap() = default;
- bool VaapiPictureNativePixmap::DownloadFromSurface(
-     scoped_refptr<VASurface> va_surface) {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
--  return vaapi_wrapper_->BlitSurface(*va_surface, *va_surface_);
-+  if (!vaapi_wrapper_->SyncSurface(va_surface->id())) {
-+    VLOGF(1) << "Cannot sync VPP input surface";
-+    return false;
-+  }
-+  if (!vaapi_wrapper_->BlitSurface(*va_surface, *va_surface_)) {
-+    VLOGF(1) << "Cannot convert decoded image into output buffer";
-+    return false;
-+  }
-+
-+  // Sync target surface since the buffer is returning to client.
-+  if (!vaapi_wrapper_->SyncSurface(va_surface_->id())) {
-+    VLOGF(1) << "Cannot sync VPP output surface";
-+    return false;
-+  }
-+  return true;
- }
- 
- bool VaapiPictureNativePixmap::AllowOverlay() const {
-diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-index 37e3520..9d17122 100644
---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-@@ -560,12 +560,12 @@ void VaapiVideoDecodeAccelerator::InitiateSurfaceSetChange(
-   requested_visible_rect_ = visible_rect;
-   if (buffer_allocation_mode_ == BufferAllocationMode::kSuperReduced) {
-     // Add one to the reference frames for the one being currently egressed.
--    requested_num_reference_frames_ = num_reference_frames + 1;
-+    requested_num_reference_frames_ = num_reference_frames + 4;
-     requested_num_pics_ = num_pics - num_reference_frames;
-   } else if (buffer_allocation_mode_ == BufferAllocationMode::kReduced) {
-     // Add one to the reference frames for the one being currently egressed,
-     // and an extra allocation for both |client_| and |decoder_|.
--    requested_num_reference_frames_ = num_reference_frames + 2;
-+    requested_num_reference_frames_ = num_reference_frames + 5;
-     requested_num_pics_ = num_pics - num_reference_frames + 1;
-   } else {
-     requested_num_reference_frames_ = 0;
-diff --git a/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.cc b/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.cc
-index 1a5016b..eca714b 100644
---- a/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.cc
-+++ b/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.cc
-@@ -32,7 +32,9 @@ GbmPixmapWayland::GbmPixmapWayland(WaylandBufferManagerGpu* buffer_manager)
-       buffer_id_(buffer_manager->AllocateBufferID()) {}
- 
- GbmPixmapWayland::~GbmPixmapWayland() {
--  if (created_wl_buffer_)
-+  // gfx::BufferUsage::SCANOUT_VDA_WRITE doesn't result in creation of
-+  // wl_buffers.
-+  if (created_wl_buffer_ && usage_ != gfx::BufferUsage::SCANOUT_VDA_WRITE)
-     buffer_manager_->DestroyBuffer(buffer_id_);
- }
- 
-diff --git a/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.h b/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.h
-index 84ebcba..dfb2675 100644
---- a/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.h
-+++ b/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.h
-@@ -92,6 +92,9 @@ class GbmPixmapWayland : public gfx::NativePixmap {
- 
-   // Says a wl_buffer has been created and must removed.
-   bool created_wl_buffer_ = false;
-+
-+  // Tells the usage of this pixmap.
-+  gfx::BufferUsage usage_ = gfx::BufferUsage::SCANOUT;
- };
- 
- }  // namespace ui
-diff --git a/ui/ozone/platform/wayland/ozone_platform_wayland.cc b/ui/ozone/platform/wayland/ozone_platform_wayland.cc
-index afbd464..189678f 100644
---- a/ui/ozone/platform/wayland/ozone_platform_wayland.cc
-+++ b/ui/ozone/platform/wayland/ozone_platform_wayland.cc
-@@ -295,6 +295,9 @@ class OzonePlatformWayland : public OzonePlatform,
-       properties->supports_global_screen_coordinates =
-           features::IsWaylandScreenCoordinatesEnabled();
- 
-+      // Let the media know this platform supports va-api.
-+      properties->supports_vaapi = true;
-+
-       initialised = true;
-     }
- 

random-build-fixes.patch

@@ -40,18 +40,6 @@ index d923cdfa322..36ac59ca7ac 100644
  
    if (browser_) {
      auto navigation = chrome::OpenCurrentURL(browser_);
-diff --git a/chrome/browser/ui/profile_view_utils.h b/chrome/browser/ui/profile_view_utils.h
-index 4aa53f094c2..5a7250f3876 100644
---- a/chrome/browser/ui/profile_view_utils.h
-+++ b/chrome/browser/ui/profile_view_utils.h
-@@ -7,6 +7,7 @@
- 
- #include <string>
- #include <utility>
-+#include <vector>
- 
- class Profile;
- class ProfileAttributesEntry;
 diff --git a/chrome/test/chromedriver/capabilities.cc b/chrome/test/chromedriver/capabilities.cc
 index a29dc8e4818..00aaf9b4067 100644
 --- a/chrome/test/chromedriver/capabilities.cc
@@ -148,14 +136,6 @@ diff --git a/third_party/blink/renderer/core/paint/object_paint_properties_spars
 index 8bb1639676c..350bdbd5fde 100644
 --- a/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
 +++ b/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
-@@ -8,6 +8,7 @@
- #include <array>
- #include <memory>
- #include <utility>
-+#include <variant>
- 
- #include "base/dcheck_is_on.h"
- #include "base/memory/ptr_util.h"
 @@ -269,8 +270,8 @@ class CORE_EXPORT ObjectPaintPropertiesSparse : public ObjectPaintProperties {
        NodeList& nodes,
        NodeId node_id,
@@ -195,7 +175,7 @@ index 5a0121510ae..0cf45e0b0da 100644
          end_color, percentage, alpha_multiplier);
  
 -    FontPalette::FontPaletteOverride result_color_record(i, result_color);
-+    FontPalette::FontPaletteOverride result_color_record{(int)i, result_color};
++    FontPalette::FontPaletteOverride result_color_record{static_cast<int>(i), result_color};
      result_color_records.push_back(result_color_record);
    }
    return result_color_records;

remove-main-main10-profile-limit.patch

@@ -1,33 +0,0 @@
-diff --git a/media/base/supported_types.cc b/media/base/supported_types.cc
-index 2ebbdf9..861dc50 100644
---- a/media/base/supported_types.cc
-+++ b/media/base/supported_types.cc
-@@ -205,28 +205,7 @@ bool IsAudioCodecProprietary(AudioCodec codec) {
- #endif  // !BUILDFLAG(USE_PROPRIETARY_CODECS)
- 
- bool IsHevcProfileSupported(const VideoType& type) {
--  if (!IsColorSpaceSupported(type.color_space))
--    return false;
--
--#if BUILDFLAG(ENABLE_PLATFORM_HEVC)
--#if BUILDFLAG(PLATFORM_HAS_OPTIONAL_HEVC_SUPPORT)
--#if BUILDFLAG(IS_CHROMEOS_LACROS)
--  // TODO(b/171813538): For Lacros, the supplemental profile cache will be
--  // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the
--  // codec detection is plumbed through to ash-gpu we can do this extra check
--  // for HEVC support.
--  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
--          switches::kLacrosEnablePlatformHevc)) {
-     return true;
--  }
--#endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
--  return GetSupplementalProfileCache()->IsProfileSupported(type.profile);
--#else
--  return true;
--#endif  // BUIDFLAG(PLATFORM_HAS_OPTIONAL_HEVC_SUPPORT)
--#else
--  return false;
--#endif  // BUILDFLAG(ENABLE_PLATFORM_HEVC)
- }
- 
- bool IsVp9ProfileSupported(const VideoType& type) {

vaapi-add-av1-support.patch

@@ -1,51 +0,0 @@
-From 1245d8c56a0e9197e20f73b33b31f2bf6cfbe4bd Mon Sep 17 00:00:00 2001
-From: Xuanxi Leng <xuanxi.leng@intel.com>
-Date: Fri, 14 Oct 2022 09:36:39 -0400
-Subject: [PATCH] VaVDA: Add 'VDAVideoDecoder' support for AV1.
-
-This CL adds 'VDAVideoDecoder' support for AV1.
-
-Bug: 1325824
-Change-Id: I7787761c080aba680543e173bef12254ab7ccafe
----
-
-diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-index 37e3520..4e77924 100644
---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-@@ -41,6 +41,7 @@
- #include "media/gpu/vaapi/vaapi_utils.h"
- #include "media/gpu/vaapi/vp8_vaapi_video_decoder_delegate.h"
- #include "media/gpu/vaapi/vp9_vaapi_video_decoder_delegate.h"
-+#include "media/gpu/vaapi/av1_vaapi_video_decoder_delegate.h"
- #include "media/gpu/vp8_decoder.h"
- #include "media/gpu/vp9_decoder.h"
- #include "media/video/picture.h"
-@@ -229,6 +230,12 @@
-     decoder_delegate_ = accelerator.get();
-     decoder_.reset(new VP9Decoder(std::move(accelerator), profile,
-                                   config.container_color_space));
-+  } else if (profile >= AV1PROFILE_MIN && profile <= AV1PROFILE_MAX) {
-+    auto accelerator =
-+        std::make_unique<AV1VaapiVideoDecoderDelegate>(this, vaapi_wrapper_);
-+    decoder_delegate_ = accelerator.get();
-+    decoder_.reset(new AV1Decoder(std::move(accelerator), profile,
-+                                  config.container_color_space));
-   } else {
-     VLOGF(1) << "Unsupported profile " << GetProfileName(profile);
-     return false;
-@@ -1196,12 +1203,11 @@
- VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
-   VideoDecodeAccelerator::SupportedProfiles profiles =
-       VaapiWrapper::GetSupportedDecodeProfiles();
--  // VaVDA never supported VP9 Profile 2, AV1 and HEVC, but VaapiWrapper does.
-+  // VaVDA never supported VP9 Profile 2 and HEVC, but VaapiWrapper does.
-   // Filter them out.
-   base::EraseIf(profiles, [](const auto& profile) {
-     VideoCodec codec = VideoCodecProfileToVideoCodec(profile.profile);
--    return profile.profile == VP9PROFILE_PROFILE2 ||
--           codec == VideoCodec::kAV1 || codec == VideoCodec::kHEVC;
-+    return profile.profile == VP9PROFILE_PROFILE2 || codec == VideoCodec::kHEVC;
-   });
-   return profiles;
- }

wayland-egl.patch

@@ -1,22 +0,0 @@
---- a/ui/gl/gl_image_native_pixmap.cc	2020-05-18 11:40:06.000000000 -0700
-+++ b/ui/gl/gl_image_native_pixmap.cc	2020-05-22 02:07:16.007770442 -0700
-@@ -288,6 +288,8 @@
-                                std::move(scoped_fd));
-   }
- 
-+  handle.planes[0].size = size_.GetArea();
-+
-   return handle;
- #endif  // !defined(OS_FUCHSIA)
- }
---- a/gpu/command_buffer/service/error_state.cc	2020-05-18 11:39:22.000000000 -0700
-+++ b/gpu/command_buffer/service/error_state.cc	2020-05-22 13:43:09.181180388 -0700
-@@ -115,6 +115,8 @@
-     // buffer.
-     error = GL_NO_ERROR;
-   }
-+  if (error == GL_INVALID_ENUM)
-+    error = GL_NO_ERROR;
-   return error;
- }
-