remove new patch

3 files changed, 5 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45fc07a3e566..7fcb9e53b771 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -67,7 +67,7 @@ pkgbase = ungoogled-chromium
 	source = use-oauth2-client-switches-as-default.patch
 	source = ungoogled-chromium-112.0.5615.49-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/112.0.5615.49-1.tar.gz
 	source = ozone-add-va-api-support-to-wayland.patch
-	source = vaapi-add-av1-hevc-support.patch
+	source = vaapi-add-av1-support.patch
 	source = remove-main-main10-profile-limit.patch
 	sha256sums = ddfd37373c1fa0f433a6ac11f0baa2b1f3fdfb9c7b5867e32a4300f2eb5aff41
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
@@ -76,7 +76,7 @@ pkgbase = ungoogled-chromium
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
 	sha256sums = 9048669535558d2a6cd264539c6588d0218ba2b12950d3ed057ef3ec5fee1baa
 	sha256sums = e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69
-	sha256sums = dfa5251a649f3e0ab43538a20eefd5747217c2deaf34f8a761af54491356580a
+	sha256sums = e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307
 	sha256sums = be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c
 
 pkgname = ungoogled-chromium
diff --git a/PKGBUILD b/PKGBUILD
index a5c80751369d..32d9cfcdac63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -51,14 +51,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
-        vaapi-add-av1-hevc-support.patch
+        vaapi-add-av1-support.patch
         remove-main-main10-profile-limit.patch)
 sha256sums=(${sha256sums[@]}
             '9048669535558d2a6cd264539c6588d0218ba2b12950d3ed057ef3ec5fee1baa'
             'e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69'
-            #'e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307'
-            'dfa5251a649f3e0ab43538a20eefd5747217c2deaf34f8a761af54491356580a'
+            'e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307'
             'be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c')
  
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -135,8 +133,7 @@ prepare() {
   # Custom Patches
   patch -Np1 -i ../ozone-add-va-api-support-to-wayland.patch
   patch -Np1 -i ../remove-main-main10-profile-limit.patch
-  #patch -Np1 -i ../vaapi-add-av1-support.patch
-  patch -Np1 -i ../vaapi-add-av1-hevc-support.patch
+  patch -Np1 -i ../vaapi-add-av1-support.patch
 
   # Ungoogled Chromium changes
   _ungoogled_repo="$srcdir/$pkgname-$_uc_ver"
diff --git a/vaapi-add-av1-hevc-support.patch b/vaapi-add-av1-hevc-support.patch
deleted file mode 100644
index b992f637db04..000000000000
--- a/vaapi-add-av1-hevc-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-index dd22c7c..dd76a98 100644
---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-@@ -41,6 +41,8 @@
- #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/h265_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"
-@@ -230,6 +232,18 @@ bool VaapiVideoDecodeAccelerator::Initialize(const Config& config,
-     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 if (profile >= H265PROFILE_MIN && profile <= H265PROFILE_MAX) {
-+    auto accelerator =
-+        std::make_unique<H265VaapiVideoDecoderDelegate>(this, vaapi_wrapper_);
-+    decoder_delegate_ = accelerator.get();
-+    decoder_.reset(new H265Decoder(std::move(accelerator), profile,
-+                                  config.container_color_space));
-   } else {
-     VLOGF(1) << "Unsupported profile " << GetProfileName(profile);
-     return false;
-@@ -1201,8 +1215,7 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
-   // 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;
-   });
-   return profiles;
- }