gentoo auto-resync : 10:08:2023 - 09:32:05

3 files changed, 90 insertions, 2 deletions

diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 66b7125ba34c..1d2a4c405ec6 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,4 +1,5 @@
 AUX avidemux-core-2.7.6-ffmpeg-flags.patch 303 BLAKE2B 9b8a1f14bb7ce12c48f96f732228fb97783e8dd79a9e7f8fa4913a1536f93f0eb384c92946816e78f65ba5cb31a062de95992069d43bc5f28468d017d39a2bcb SHA512 25d41f677c71a76528f2b09ff06643a38cf04de6c32c8c4f272ace7043d373670abbf85cf7219a2a3f65d23f9eba314fdecf1938b9550f6b916b25711a95aea2
+AUX avidemux-core-2.8.1-ffmpeg-2.41.patch 2627 BLAKE2B ca2fc1303d8637a0fa7266993346198174e7e3d4a6d01ee4c2aa310531d340c145a09424603f5637519307ba7e6f6eaa4cc209b235f1ff8cfe3e0a6f037b3159 SHA512 0c39d3ee707530d6336db6b560f5ca181a742c8019a226a12deff17935c5012d2c17a389f1b0066adfa536fc30ebd19c280e68abf1455430b06ec8d44218f6b3
 DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f SHA512 e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3
-EBUILD avidemux-core-2.8.1-r1.ebuild 2645 BLAKE2B b655685a9f40e0c20548a9a6ed469fbc8ccbd486351c119ed39d5dfea918d7773aa58439b5b138c0346c8aece9a290a2f6be6f13758c59d8d390f6bf72cd6bb4 SHA512 61555c094b8aa32ad1e45988f9ddeb74c88779ac40b36bf3b420b67b857b2d985f97e0378e0d2804bf207c3a2a5168f17a41c2a760a6812e631ec36fc0112858
+EBUILD avidemux-core-2.8.1-r1.ebuild 2699 BLAKE2B 9e8f9a3d106bc21aaac49bb23bb1c90a62790c2484c2385daef62e4300d9d66e0685b68231ab8a381fc879e178b9b15b30d63abb062554ffd90822870176bc70 SHA512 b57cd0845dadb43484f8c878cbb13847a71d8abc28db5947bc8ab268ec5c4fee049cfa0d31be11cdb8f7eba984e0d51066a68a621024b4958f526566712a2a94
 MISC metadata.xml 445 BLAKE2B e50f517d52c143a715503c3f235371a7e03de54e6eba1da6eac8101cdf28392247ed4fd80c2abc51639394c5883b9c123810597ac9499bba0760ed34ebb0013a SHA512 414df3edeaa635e37cbab1a7de5edb214f258e16f89bb32f5d820474017e54f2f3eab48929e505ea9fa8b6aca1f7e608cc558ca6147e605272c2fe644798597b
diff --git a/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild
index bc742a9bb980..617721f52e31 100644
--- a/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild
@@ -40,7 +40,10 @@ BDEPEND="
 	!system-ffmpeg? ( dev-lang/yasm[nls=] )
 "
 
-PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch )
+PATCHES=(
+	"${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch
+	"${FILESDIR}"/avidemux-core-2.8.1-ffmpeg-2.41.patch
+)
 
 S="${WORKDIR}/avidemux2-${PV}"
 CMAKE_USE_DIR="${S}/${PN/-/_}"
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.8.1-ffmpeg-2.41.patch b/media-libs/avidemux-core/files/avidemux-core-2.8.1-ffmpeg-2.41.patch
new file mode 100644
index 000000000000..da444e9e1c81
--- /dev/null
+++ b/media-libs/avidemux-core/files/avidemux-core-2.8.1-ffmpeg-2.41.patch
@@ -0,0 +1,84 @@
+diff --git a/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h_binutils_241.patch b/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h_binutils_241.patch
+new file mode 100644
+index 0000000..633b4b6
+--- /dev/null
++++ b/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h_binutils_241.patch
+@@ -0,0 +1,76 @@
++https://bugs.gentoo.org/911582
++https://trac.ffmpeg.org/ticket/10405
++https://git.videolan.org/?p=ffmpeg.git;a=commit;h=25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e
++https://sourceware.org/PR30578
++https://gcc.gnu.org/PR108941
++
++From 25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e Mon Sep 17 00:00:00 2001
++From: =?utf8?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>
++(cherry picked from commit effadce6c756247ea8bae32dc13bb3e6f464f0eb)
++--- 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.30.2
+-- 
+2.41.0