upgpkg: ungoogled-chromium 109.0.5414.119-2

add vaapi patch

3 files changed, 59 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 720ffe5..d36b488 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ungoogled-chromium
 	pkgdesc = A lightweight approach to removing Google web service dependency
 	pkgver = 109.0.5414.119
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ungoogled-software/ungoogled-chromium
 	arch = x86_64
 	license = BSD
@@ -73,6 +73,7 @@ pkgbase = ungoogled-chromium
 	source = use-oauth2-client-switches-as-default.patch
 	source = ungoogled-chromium-109.0.5414.119-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/109.0.5414.119-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 = cbcdef5ee71acb53790ded3adef86871812b46e9f208dce8ec3f8ab04958be2d
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
@@ -86,6 +87,7 @@ pkgbase = ungoogled-chromium
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
 	sha256sums = e10fe46f3f4b7058c278ab86c6795cc2b68459bcb7ced5efad3355ab5c2f5de1
 	sha256sums = e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69
+	sha256sums = e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307
 	sha256sums = fc810e3c495c77ac60b383a27e48cf6a38b4a95b65dd2984baa297c5df83133c
 
 pkgname = ungoogled-chromium
diff --git a/PKGBUILD b/PKGBUILD
index 7619b9c..122d933 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgname=ungoogled-chromium
 pkgver=109.0.5414.119
-pkgrel=1
+pkgrel=2
 _launcher_ver=8
 _gcc_patchset=1
 pkgdesc="A lightweight approach to removing Google web service dependency"
@@ -56,10 +56,12 @@ _uc_ver=$pkgver-1
 source=(${source[@]}
         $pkgname-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/$_uc_ver.tar.gz
         ozone-add-va-api-support-to-wayland.patch
+        vaapi-add-av1-support.patch
         remove-main-main10-profile-limit.patch)
 sha256sums=(${sha256sums[@]}
             'e10fe46f3f4b7058c278ab86c6795cc2b68459bcb7ced5efad3355ab5c2f5de1'
             'e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69'
+            'e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307'
             'fc810e3c495c77ac60b383a27e48cf6a38b4a95b65dd2984baa297c5df83133c')
  
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -141,11 +143,10 @@ prepare() {
   # Fixes for building with libstdc++ instead of libc++
   patch -Np1 -i ../patches/chromium-103-VirtualCursor-std-layout.patch
 
-  # Enable vaapi on wayland
+  # Custom Patches
   patch -Np1 -i ../ozone-add-va-api-support-to-wayland.patch
-
-  # Remove HEVC profile limits
   patch -Np1 -i ../remove-main-main10-profile-limit.patch
+  patch -Np1 -i ../vaapi-add-av1-support.patch
 
   # Ungoogled Chromium changes
   _ungoogled_repo="$srcdir/$pkgname-$_uc_ver"
diff --git a/vaapi-add-av1-support.patch b/vaapi-add-av1-support.patch
new file mode 100644
index 0000000..f1a62eb
--- /dev/null
+++ b/vaapi-add-av1-support.patch
@@ -0,0 +1,51 @@
+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;
+ }