commit: 3ba107dcb61f7eb1a688248dd395d6f084cd426f Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Jul 22 16:46:25 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Tue Aug 20 08:01:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba107dc
media-video/ffmpeg: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch | 76 ---------------------- .../files/ffmpeg-6.0-wint-conversion-vulkan.patch | 43 ------------ 2 files changed, 119 deletions(-) diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch b/media-video/ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch deleted file mode 100644 index a06b9119666f..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch +++ /dev/null @@ -1,76 +0,0 @@ -https://bugs.gentoo.org/911582 -https://trac.ffmpeg.org/ticket/10405 -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=cc703cf60759d9798f440a9417e4efa2fcbe2747 -https://sourceware.org/PR30578 -https://gcc.gnu.org/PR108941 - -From cc703cf60759d9798f440a9417e4efa2fcbe2747 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <[email protected]> -Date: Sun, 16 Jul 2023 18:18:02 +0300 -Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift - instructions within inline assembly - -Fixes assembling with binutil as >= 2.41 - -Signed-off-by: James Almer <[email protected]> -(cherry picked from commit effadce6c756247ea8bae32dc13bb3e6f464f0eb) ---- a/libavcodec/x86/mathops.h -+++ b/libavcodec/x86/mathops.h -@@ -35,12 +35,20 @@ - static av_always_inline av_const int MULL(int a, int b, unsigned shift) - { - int rt, dummy; -+ if (__builtin_constant_p(shift)) - __asm__ ( - "imull %3 \n\t" - "shrdl %4, %%edx, %%eax \n\t" - :"=a"(rt), "=d"(dummy) -- :"a"(a), "rm"(b), "ci"((uint8_t)shift) -+ :"a"(a), "rm"(b), "i"(shift & 0x1F) - ); -+ else -+ __asm__ ( -+ "imull %3 \n\t" -+ "shrdl %4, %%edx, %%eax \n\t" -+ :"=a"(rt), "=d"(dummy) -+ :"a"(a), "rm"(b), "c"((uint8_t)shift) -+ ); - return rt; - } - -@@ -113,19 +121,31 @@ __asm__ volatile(\ - // avoid +32 for shift optimization (gcc should do that ...) - #define NEG_SSR32 NEG_SSR32 - static inline int32_t NEG_SSR32( int32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("sarl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("sarl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - - #define NEG_USR32 NEG_USR32 - static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("shrl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("shrl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - --- -2.30.2 diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch b/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch deleted file mode 100644 index 2c71a189329a..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=58f18df430d48e47a82c5e740d6e63a50c97d75f - -From 58f18df430d48e47a82c5e740d6e63a50c97d75f Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Kacper=20Michaj=C5=82ow?= <[email protected]> -Date: Thu, 2 Mar 2023 17:27:30 +0100 -Subject: [PATCH] lavu/vulkan: fix handle type for 32-bit targets -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Fixes compilation with clang which errors out on Wint-conversion. - -Signed-off-by: Kacper MichajÅow <[email protected]> -Signed-off-by: Martin Storsjö <[email protected]> -(cherry picked from commit cc76e8340d28438c1ac56ee7dfd774d25e944264) -Signed-off-by: Martin Storsjö <[email protected]> ---- a/libavutil/hwcontext_vulkan.c -+++ b/libavutil/hwcontext_vulkan.c -@@ -1149,7 +1149,7 @@ static void free_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd) - - av_freep(&cmd->queues); - av_freep(&cmd->bufs); -- cmd->pool = NULL; -+ cmd->pool = VK_NULL_HANDLE; - } - - static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd) ---- a/libavutil/vulkan.h -+++ b/libavutil/vulkan.h -@@ -122,7 +122,11 @@ typedef struct FFVulkanPipeline { - VkDescriptorSetLayout *desc_layout; - VkDescriptorPool desc_pool; - VkDescriptorSet *desc_set; -+#if VK_USE_64_BIT_PTR_DEFINES == 1 - void **desc_staging; -+#else -+ uint64_t *desc_staging; -+#endif - VkDescriptorSetLayoutBinding **desc_binding; - VkDescriptorUpdateTemplate *desc_template; - int *desc_set_initialized; --- -2.30.2
