From 8e46a000aac1161c04fdbc13a57abdc0f62aafc4 Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 26 Dec 2025 15:26:06 +0300 Subject: [PATCH] avidemux ver. bump --- .../converter/avidemux/files/effadce6.patch | 73 +++++++++++++++++++ multimedia/converter/avidemux/pspec.xml | 3 + 2 files changed, 76 insertions(+) create mode 100644 multimedia/converter/avidemux/files/effadce6.patch diff --git a/multimedia/converter/avidemux/files/effadce6.patch b/multimedia/converter/avidemux/files/effadce6.patch new file mode 100644 index 0000000000..53a596d0ee --- /dev/null +++ b/multimedia/converter/avidemux/files/effadce6.patch @@ -0,0 +1,73 @@ +From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +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 +--- + libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h +index 6298f5ed1983b..ca7e2dffc1076 100644 +--- 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; + } + diff --git a/multimedia/converter/avidemux/pspec.xml b/multimedia/converter/avidemux/pspec.xml index e23ca39fb0..44f14bdf14 100755 --- a/multimedia/converter/avidemux/pspec.xml +++ b/multimedia/converter/avidemux/pspec.xml @@ -15,6 +15,9 @@ Simple video editing/encoding tool Avidemux is a video editor designed for simple cutting, filtering and encoding tasks. It supports many file types, including AVI, DVD compatible MPEG files, MP4 and ASF using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities. mirrors://sourceforge/avidemux/avidemux_2.8.1.tar.gz + + effadce6.patch + qt5-base-devel qt5-assistant-devel