[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     934dd4559fd942a55149a964ff3f0fffa018c848
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Jun  1 15:45:47 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 21:28:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=934dd455

media-video/ffmpeg: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31267
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../ffmpeg-4.2.7-libsdl2-new-version-scheme.patch  | 26 -----------------
 media-video/ffmpeg/files/ffmpeg-5.1.2-vulkan.patch | 33 ----------------------
 2 files changed, 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 */