From 7abcdfc329e02d3efd80694e682900d3db61e5176c721e3cbbc17de4046e9740 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 31 Jan 2023 16:09:31 +0000 Subject: [PATCH] - Add no-vk-video-decoding.patch to resolve build failure with Vulkan 1.3.239 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=55 --- ffmpeg-5.changes | 6 ++++++ ffmpeg-5.spec | 2 ++ no-vk-video-decoding.patch | 31 +++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 no-vk-video-decoding.patch diff --git a/ffmpeg-5.changes b/ffmpeg-5.changes index f68094b..1d38a7a 100644 --- a/ffmpeg-5.changes +++ b/ffmpeg-5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 31 16:03:09 UTC 2023 - Jan Engelhardt + +- Add no-vk-video-decoding.patch to resolve build failure + with Vulkan 1.3.239 + ------------------------------------------------------------------- Fri Jan 17 11:01:25 UTC 2023 - Manfred Hollstein diff --git a/ffmpeg-5.spec b/ffmpeg-5.spec index 60e33e8..9a2b8f2 100644 --- a/ffmpeg-5.spec +++ b/ffmpeg-5.spec @@ -108,6 +108,7 @@ Patch9: ffmpeg-4.4-CVE-2020-22046.patch Patch10: ffmpeg-chromium.patch Patch11: ffmpeg-CVE-2022-3964.patch Patch91: ffmpeg-dlopen-openh264.patch +Patch92: no-vk-video-decoding.patch %if %{with amf_sdk} BuildRequires: AMF-devel @@ -845,6 +846,7 @@ Patch9: ffmpeg-4.4-CVE-2020-22046.patch Patch10: ffmpeg-chromium.patch Patch11: ffmpeg-CVE-2022-3964.patch Patch91: ffmpeg-dlopen-openh264.patch +Patch92: no-vk-video-decoding.patch BuildRequires: c_compiler %description diff --git a/no-vk-video-decoding.patch b/no-vk-video-decoding.patch new file mode 100644 index 0000000..cb6a2df --- /dev/null +++ b/no-vk-video-decoding.patch @@ -0,0 +1,31 @@ +From: Jan Engelhardt +Date: 2023-01-31 17:02:24.764525660 +0100 + +VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME changed to +VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME between VK 1.3.236 -> 1.3.239, and now +ffmpeg fails to build. Upstream ffmpeg has just removed the optional extensions +again - see commit eb0455d64690eed0068e5cb202f72ecdf899837c . + +--- + libavutil/hwcontext_vulkan.c | 2 ++ + 1 file changed, 2 insertions(+) + +Index: ffmpeg-5.1.2/libavutil/hwcontext_vulkan.c +=================================================================== +--- ffmpeg-5.1.2.orig/libavutil/hwcontext_vulkan.c ++++ ffmpeg-5.1.2/libavutil/hwcontext_vulkan.c +@@ -356,12 +356,14 @@ static const VulkanOptExtension optional + #endif + + /* Video encoding/decoding */ ++#if 0 + { 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 }, ++#endif + }; + + /* Converts return values to strings */