git: 199d7e747ba0 - main - multimedia/avidemux: Add patch to fix build with upcoming binutils 2.41

The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=199d7e747ba022efc3964f56b4e55b17db6f04b6

commit 199d7e747ba022efc3964f56b4e55b17db6f04b6
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2023-08-09 02:21:05 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2023-08-29 03:05:56 +0000

    multimedia/avidemux: Add patch to fix build with upcoming binutils 2.41
    
    Obtained from:  https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/effadce6c756247ea8bae32dc13bb3e6f464f0eb
    PR:             273023
    Approved by:    maintainer timeout
---
 multimedia/avidemux/Makefile.common                |  4 ++
 .../ffmpeg_fix_build_with_binutils_2.41.patch      | 76 ++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common
index 5725e2a276fa..4702cc112831 100644
--- a/multimedia/avidemux/Makefile.common
+++ b/multimedia/avidemux/Makefile.common
@@ -304,6 +304,10 @@ USE_GCC=	yes
 NOT_FOR_ARCHS=		powerpc powerpc64 powerpcspe sparc64
 NOT_FOR_ARCHS_REASON=	cmake/admDetermineSystem.cmake:78: CPU not supported
 
+post-extract:
+	@${CP} ${FILESDIR}/ffmpeg_fix_build_with_binutils_2.41.patch \
+	       ${WRKSRC}/avidemux_core/ffmpeg_package/patches
+
 post-patch:
 	@${MKDIR} ${CONFIGURE_WRKSRC}/config
 	@${LN} -s ${LOCALBASE}/include/iconv.h ${CONFIGURE_WRKSRC}/config
diff --git a/multimedia/avidemux/files/ffmpeg_fix_build_with_binutils_2.41.patch b/multimedia/avidemux/files/ffmpeg_fix_build_with_binutils_2.41.patch
new file mode 100644
index 000000000000..a70c93a94a2e
--- /dev/null
+++ b/multimedia/avidemux/files/ffmpeg_fix_build_with_binutils_2.41.patch
@@ -0,0 +1,76 @@
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+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 <jamrial@gmail.com>
+---
+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git libavcodec/x86/mathops.h libavcodec/x86/mathops.h
+index 6298f5ed19..ca7e2dffc1 100644
+--- libavcodec/x86/mathops.h
++++ 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.41.0
+