commit: 810cb8902cdd9f880104d9d6b99ff3023799a2ca Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Feb 9 21:49:23 2023 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Feb 9 21:49:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=810cb890
media-video/ffmpeg-chromium: Apply upstream fix for newer vulkan-headers Closes: https://bugs.gentoo.org/893502 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> .../ffmpeg-chromium/ffmpeg-chromium-102.ebuild | 1 + .../ffmpeg-chromium/ffmpeg-chromium-106.ebuild | 1 + .../files/ffmpeg-chromium-vk-headers.patch | 36 ++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild index 73cbdcc5ebc1..6f9eaaeb8883 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild @@ -115,6 +115,7 @@ S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${PN}-100.patch + "${FILESDIR}"/${PN}-vk-headers.patch "${FILESDIR}"/chromium.patch ) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild index c344db389d2a..61f550be5940 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild @@ -113,6 +113,7 @@ RESTRICT=" PATCHES=( "${FILESDIR}"/${PN}-100.patch + "${FILESDIR}"/${PN}-vk-headers.patch "${FILESDIR}"/chromium.patch ) diff --git a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-vk-headers.patch b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-vk-headers.patch new file mode 100644 index 000000000000..f3c3c0128920 --- /dev/null +++ b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-vk-headers.patch @@ -0,0 +1,36 @@ +From eb0455d64690eed0068e5cb202f72ecdf899837c Mon Sep 17 00:00:00 2001 +From: Lynne <d...@lynne.ee> +Date: Sun, 25 Dec 2022 01:03:30 +0100 +Subject: [PATCH] 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. +--- + libavutil/hwcontext_vulkan.c | 8 -------- + 1 file changed, 8 deletions(-) + +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 */ +-- +2.39.1 +
