[rpms/ffmpeg] epel9-next: Upstream fix for vulkan-headers 1.3.236.0

[rpms/ffmpeg] epel9-next: Upstream fix for vulkan-headers 1.3.236.0

[Yaakov Selkowitz]

A new commit has been pushed.

Repo   : rpms/ffmpeg
Branch : epel9-next
Commit : 03bf8f14915bf1f42451c1bcc1c7a38aaec6604e
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date   : 2023-02-03T16:06:49-05:00
Stats  : +34/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ffmpeg/c/03bf8f14915bf1f42451c1bcc1c7a38aaec6604e?branch=epel9-next

Log:
Upstream fix for vulkan-headers 1.3.236.0

---
diff --git a/ffmpeg-vulkan-headers.patch b/ffmpeg-vulkan-headers.patch
new file mode 100644
index 0000000..ccf79e6
--- /dev/null
+++ b/ffmpeg-vulkan-headers.patch
@@ -0,0 +1,32 @@
+From: Lynne <dev@lynne.ee>
+Date: Sun, 25 Dec 2022 00:03:30 +0000 (+0100)
+Subject: hwcontext_vulkan: remove optional encode/decode extensions from the list
+X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/eb0455d64690eed0068e5cb202f72ecdf899837c
+
+hwcontext_vulkan: remove optional encode/decode extensions from the list
+
+They're not currently used, so they don't need to be there.
+Vulkan stabilized the decode extensions less than a week ago, and their
+name prefixes were changed from EXT to KHR. It's a bit too soon to be
+depending on it, so rather than bumping, just remove these for now.
+---
+
+diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
+index f1db1c7291..2a9b5f4aac 100644
+--- a/libavutil/hwcontext_vulkan.c
++++ b/libavutil/hwcontext_vulkan.c
+@@ -358,14 +358,6 @@ static const VulkanOptExtension optional_device_exts[] = {
+     { VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME,            FF_VK_EXT_EXTERNAL_WIN32_MEMORY  },
+     { VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME,         FF_VK_EXT_EXTERNAL_WIN32_SEM     },
+ #endif
+-
+-    /* Video encoding/decoding */
+-    { VK_KHR_VIDEO_QUEUE_EXTENSION_NAME,                      FF_VK_EXT_NO_FLAG                },
+-    { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME,               FF_VK_EXT_NO_FLAG                },
+-    { VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME,               FF_VK_EXT_NO_FLAG                },
+-    { VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME,                FF_VK_EXT_NO_FLAG                },
+-    { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME,                FF_VK_EXT_NO_FLAG                },
+-    { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME,                FF_VK_EXT_NO_FLAG                },
+ };
+ 
+ /* Converts return values to strings */

diff --git a/ffmpeg.spec b/ffmpeg.spec
index ebc0b67..0d9a1f4 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -117,6 +117,8 @@ Patch2:         ffmpeg-new-coder-errors.patch
 # Allow to build with fdk-aac-free
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112
 Patch3:         ffmpeg-allow-fdk-aac-free.patch
+# Upstream fix for vulkan-headers 1.3.236.0+
+Patch4:         ffmpeg-vulkan-headers.patch
 
 # Set up dlopen for openh264
 Patch1001:      ffmpeg-dlopen-openh264.patch