qzhao/ffmpeg-5
SHA256
1
0
Fork 0
forked from jengelh/ffmpeg-5
Code Pull Requests Activity

Accepting request 1062300 from multimedia:libs

Browse Source 
- Add no-vk-video-decoding.patch to resolve build failure with Vulkan 1.3.239

OBS-URL: https://build.opensuse.org/request/show/1062300
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-5?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2023-02-01 15:38:57 +00:00 committed by Git OBS Bridge
commit 3a762682df
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg-5.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 31 16:03:09 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- 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 <manfred.h@gmx.net> Fri Jan 17 11:01:25 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>

2
ffmpeg-5.spec
View File

@ -108,6 +108,7 @@ Patch9: ffmpeg-4.4-CVE-2020-22046.patch
Patch10: ffmpeg-chromium.patch Patch10: ffmpeg-chromium.patch
Patch11: ffmpeg-CVE-2022-3964.patch Patch11: ffmpeg-CVE-2022-3964.patch
Patch91: ffmpeg-dlopen-openh264.patch Patch91: ffmpeg-dlopen-openh264.patch
Patch92: no-vk-video-decoding.patch
%if %{with amf_sdk} %if %{with amf_sdk}
BuildRequires: AMF-devel BuildRequires: AMF-devel
@ -845,6 +846,7 @@ Patch9: ffmpeg-4.4-CVE-2020-22046.patch
Patch10: ffmpeg-chromium.patch Patch10: ffmpeg-chromium.patch
Patch11: ffmpeg-CVE-2022-3964.patch Patch11: ffmpeg-CVE-2022-3964.patch
Patch91: ffmpeg-dlopen-openh264.patch Patch91: ffmpeg-dlopen-openh264.patch
Patch92: no-vk-video-decoding.patch
BuildRequires: c_compiler BuildRequires: c_compiler
%description %description

31
no-vk-video-decoding.patch Normal file
View File

@ -0,0 +1,31 @@
From: Jan Engelhardt <jengelh@inai.de>
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 */