diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-06-24 01:25:35 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-24 01:25:35 +0100 |
| commit | a152c669e7ec3bb6ae13b747b985e2ece3b58b0a (patch) | |
| tree | d0bc106af803b1687d9959980809b98a2419a2a7 /media-video/ffmpeg/files | |
| parent | e61316437bd8569d122a22afee87973ea4949120 (diff) | |
gentoo auto-resync : 24:06:2023 - 01:25:35
Diffstat (limited to 'media-video/ffmpeg/files')
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch | 26 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/ffmpeg-5.1.2-vulkan.patch | 33 |
2 files changed, 0 insertions, 59 deletions
diff --git a/media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch b/media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch deleted file mode 100644 index ce552893d19b..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-4.2.7-libsdl2-new-version-scheme.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/839f98ff6719cf2db0cbd88cd787a1b19b9cbf47 - -From 839f98ff6719cf2db0cbd88cd787a1b19b9cbf47 Mon Sep 17 00:00:00 2001 -From: Christopher Degawa <ccom@randomderp.com> -Date: Wed, 11 May 2022 15:11:04 -0500 -Subject: [PATCH] configure: extend SDL check to accept all 2.x versions - -sdl2 recently changed their versioning, moving the patch level to minor level -https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff -and have said that they will instead ship sdl3.pc for 3.0.0 - -Fixes ticket 9768 - -Signed-off-by: Christopher Degawa <ccom@randomderp.com> -Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro> ---- a/configure -+++ b/configure -@@ -6383,7 +6383,7 @@ fi - - if enabled sdl2; then - SDL2_CONFIG="${cross_prefix}sdl2-config" -- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent -+ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent - if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then - sdl2_cflags=$("${SDL2_CONFIG}" --cflags) - sdl2_extralibs=$("${SDL2_CONFIG}" --libs) diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.2-vulkan.patch b/media-video/ffmpeg/files/ffmpeg-5.1.2-vulkan.patch deleted file mode 100644 index d7ce57350e4e..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-5.1.2-vulkan.patch +++ /dev/null @@ -1,33 +0,0 @@ -From eb0455d64690eed0068e5cb202f72ecdf899837c Mon Sep 17 00:00:00 2001 -From: Lynne <dev@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 f1db1c7291f1..2a9b5f4aac62 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 */ |