Refresh patches for new release.

2 files changed, 12 insertions, 14 deletions

diff --git a/build/patches/fedora-vaapi/chromium-81.0.4044.92-fix-vaapi-on-intel.patch b/build/patches/fedora-vaapi/chromium-81.0.4044.92-fix-vaapi-on-intel.patch
index a0a4dc2..864f3bb 100644
--- a/build/patches/fedora-vaapi/chromium-81.0.4044.92-fix-vaapi-on-intel.patch
+++ b/build/patches/fedora-vaapi/chromium-81.0.4044.92-fix-vaapi-on-intel.patch
@@ -1,7 +1,6 @@
-diff -up chromium-81.0.4044.113/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix chromium-81.0.4044.113/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
---- chromium-81.0.4044.113/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix	2020-04-15 19:25:53.000000000 -0400
-+++ chromium-81.0.4044.113/media/gpu/vaapi/vaapi_video_decode_accelerator.cc	2020-04-16 14:41:41.303904954 -0400
-@@ -64,6 +64,7 @@ void ReportToUMA(VAVDADecoderFailure fai
+--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+@@ -66,6 +66,7 @@ void ReportToUMA(VAVDADecoderFailure fai
 VAVDA_DECODER_FAILURES_MAX + 1);
 }
 
@@ -9,7 +8,7 @@ diff -up chromium-81.0.4044.113/media/gpu/vaapi/vaapi_video_decode_accelerator.c
 // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
 // Lake) Cpu platform id's are referenced from the following file in kernel
 // source arch/x86/include/asm/intel-family.h
-@@ -76,6 +77,7 @@ bool IsGeminiLakeOrLater() {
+@@ -78,6 +79,7 @@ bool IsGeminiLakeOrLater() {
 cpuid.model() >= kGeminiLakeModelId;
 return is_geminilake_or_later;
 }
@@ -17,7 +16,7 @@ diff -up chromium-81.0.4044.113/media/gpu/vaapi/vaapi_video_decode_accelerator.c
 
 } // namespace
 
-@@ -1171,6 +1173,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+@@ -1169,6 +1171,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
 if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
 return BufferAllocationMode::kNormal;
 
@@ -26,11 +25,11 @@ diff -up chromium-81.0.4044.113/media/gpu/vaapi/vaapi_video_decode_accelerator.c
 // On Gemini Lake, Kaby Lake and later we can pass to libva the client's
 // PictureBuffers to decode onto, which skips the use of the Vpp unit and its
 // associated format reconciliation copy, avoiding all internal buffer
-@@ -1187,6 +1191,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+@@ -1184,6 +1188,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
 num_extra_pics_ = 3;
 return BufferAllocationMode::kNone;
 }
 +#endif 
 
- // If we're here, we have to use the Vpp unit and allocate buffers for
- // |decoder_|; usually we'd have to allocate the |decoder_|s
+ // For H.264 on older devices, another +1 is experimentally needed for
+ // high-to-high resolution changes.
diff --git a/build/patches/fedora-vaapi/chromium-83.0.4103.97-vaapi-i686-fpermissive.patch b/build/patches/fedora-vaapi/chromium-83.0.4103.97-vaapi-i686-fpermissive.patch
index 74fbb7d..bc67fc0 100644
--- a/build/patches/fedora-vaapi/chromium-83.0.4103.97-vaapi-i686-fpermissive.patch
+++ b/build/patches/fedora-vaapi/chromium-83.0.4103.97-vaapi-i686-fpermissive.patch
@@ -1,6 +1,5 @@
-diff -up chromium-83.0.4103.97/media/gpu/vaapi/BUILD.gn.i686permissive chromium-83.0.4103.97/media/gpu/vaapi/BUILD.gn
---- chromium-83.0.4103.97/media/gpu/vaapi/BUILD.gn.i686permissive	2020-06-07 10:58:00.309383632 -0400
-+++ chromium-83.0.4103.97/media/gpu/vaapi/BUILD.gn	2020-06-07 10:58:47.532340933 -0400
+--- a/media/gpu/vaapi/BUILD.gn
++++ b/media/gpu/vaapi/BUILD.gn
 @@ -13,6 +13,10 @@ import("//ui/ozone/ozone.gni")
 assert(is_linux) # is_chromeos is a subset of is_linux
 assert(use_vaapi)
@@ -12,12 +11,12 @@ diff -up chromium-83.0.4103.97/media/gpu/vaapi/BUILD.gn.i686permissive chromium-
 generate_stubs("libva_stubs") {
 extra_header = "va_stub_header.fragment"
 sigs = [ "va.sigs" ]
-@@ -108,6 +112,8 @@ source_set("vaapi") {
+@@ -109,6 +113,8 @@ source_set("vaapi") {
 ]
 }
 
 + configs += [ ":vaapi_permissive" ]
 +
 if (use_x11) {
- configs += [ "//build/config/linux:x11" ]
 deps += [ "//ui/gfx/x" ]
+ sources += [