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

5 files changed, 84 insertions, 3 deletions

diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index dc24fffb9e21..64350e77a2ea 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -1,10 +1,11 @@
 AUX chromium.patch 1536 BLAKE2B 8caf1ff11f8da710138cbb857bd42e8679f98f3c30a3eaddb51611b7c39fb48c23890257997d3ddfee47244e6ffc0abb241e3118e0e8bcbf63442885445bcee3 SHA512 711b338178fe042aff92375d6593197337529986ea55ac6288df4c725145dd06c41fcfc11df4843e03eeaa4bad90ed558acf8f6945b9b96c9751fff92a41811a
 AUX ffmpeg-chromium-100.patch 1653 BLAKE2B 4d0b025b024aa9ce9e325487c09bb3a566b453198626a2178b119eab56adb73d392a8f4499735310108838f73d48c50f54c9c4b1b19db66c98ef15b39e38c3d4 SHA512 89cbf0cd5c4337e4633af7c814002cb4e909b4d4d385d5a3e265882cf1c4e24e4057512bffe7311e53b8a7886c882929221b07961ae86d115803f9b991ef6a05
+AUX ffmpeg-chromium-binutils-2.41.patch 2248 BLAKE2B 16bdc9642b6662d8213814ca3fe7daac7cb74ac62223e0c91fefa7f694fbef7f7f6043d578fb59899b6bf40d79e44e2edae16ff148200a3f6dec654b3b318838 SHA512 3b630b2d8b892eb3f72d2021d9dd9710c435d4b70db2ada7d86446330900e64ae047eca58335750c9b2854654d00c74f486ac73929ac6a7afa4c6971f63bb40e
 AUX ffmpeg-chromium-vk-headers.patch 1733 BLAKE2B 8d6e7b72d1dbfcd21d3549be4c54c76a0fa72c3b4bf9882e4e9baa7e69e00739ed9a6c65ff1e21cb6abc00fa09941713ee090b9538c7a4665cd79e4be4e5f4d9 SHA512 2f424c344fcfa24048dcefa082b6216375ff8fb28f830cdfaeb1e84dc84146640b0243741b3688b4ea614a0d91e2cb858cf3251baafbdc412bad595d2e71518e
 DIST ffmpeg-chromium-102.tar.gz 15165192 BLAKE2B ecf9b9ff538730d8a265e25e3d30900b119bfa5baa8e097e58151d744c95b3e768b96f477f6394015cd77a8ae35991c7cdaee5fb2f700d129b6c6d7ee87b34d9 SHA512 f5aa4c47e801d2547321c7995240e004706f9b5835610f9726ac45a63ac58a62de64d463ddeb8c1a001d31d89a4dbaee3a1be568c33316f29dc2b675b2f3161a
 DIST ffmpeg-chromium-106.tar.xz 9707176 BLAKE2B 8ab9b006328e15faa38b8014f2870e7a9fd9eaacc723cd6079bfaadc05db4d1f8c542dff5a331e1f93c9c877eea6d2ed0dc2bf567c77680227b22b2a9baf8834 SHA512 9f04feee42bf548cbda542be16f186bfe0d8179289a1512cf77ec492a8608b2c9d5c758f93fb6d229be67c20762075dd266fa4b203556f8b7ec4bf66579f2b6b
 DIST ffmpeg-chromium-114.tar.xz 9934024 BLAKE2B cc11bd00bcf6bef5f946a16f1544881c71503207ba3c6ec57cdc37124ea562366dced2e029f31e57a6f78ec7073412ac0b8ec470d14975a3cc40fad2e96ec5df SHA512 1b1743664d58f5b92971d113ea441604e0b46f28b22df1b02ab0431b8e884789fb6d81b4f50ff1526f716381abcc63e1b336d23edd9ea28abe8b3526fba08ce9
-EBUILD ffmpeg-chromium-102.ebuild 6527 BLAKE2B e84cdc84679deb93ea5629a3984e755573883f77fac56b60a425e12d9060f53accea2ca05da585d55c54c42262e31abf6fc1c1f4d4648e3e43aa2293222250fc SHA512 e89096753dec835beaa37a2b3c5838dd247518c72e4bcb8b277c9c480d250944e8452c341689c927376e3a4a06f83d26a58f71a9b44a75dc4fb89221f35bb091
-EBUILD ffmpeg-chromium-106.ebuild 6334 BLAKE2B 4222019adfa1bbc7246bc4ea3015c2bf53349d9c7e56081e82a14dda3b23feb6aa37fb9aa4c74f38a1896c92506a64e16db5816de5b5921b82faab403e769e8a SHA512 9dfbef0a57b24d0dc7cb1e99202bcc4e0b1fe6e4f1f660285255d5fd35445d7bb710c367d3bb7a41bc65c3a32784eae2b418de07c78e23a2b40a4ed88c75ef87
-EBUILD ffmpeg-chromium-114.ebuild 6296 BLAKE2B 1e3ee40c1d873e541e59667ba803c7af7fa8859c7cfb94eb6d8319495c4bca8dc7702ded479123f716389ca2a70ad12c7560899bab98275dd4e2a8e144e9d996 SHA512 b7797d932d6246a359bd15f2ce0a2695d33f77bbe23e769bebcf2bcd97cc29a770340c6818194e952106f658471a8fd7b33b321bee8b0d47f3636f13b09f15e8
+EBUILD ffmpeg-chromium-102.ebuild 6568 BLAKE2B 4fb0b1eb3b5b33eacae0e331e0ac62941f7bf1af141b414eebf180301963018b9bbd4f11475896547f35a55ac717d5e03fd74749a0be4dc71c3ea3f93de241a0 SHA512 9433050d419d40b775207d32aac5c51a21e369ab3ffa054d64c22599e268f209fc8cad991de898eb45ee9609d880117a599236d56316a98f23199a72e3b23c3c
+EBUILD ffmpeg-chromium-106.ebuild 6375 BLAKE2B b739abb24ef35d799393b42923d9272767ee60fc53830204e34ecc39f22d5263bd1d08025427135c928d656a7916183b0e85dafe3e18d64936714e91a3a64784 SHA512 0fc260be8b235fdbe2efa44ead6d6706aa86cc306d12135c8638f7477f0672fe7d6848458347809b4dea606470336914f27cf7b415690615615f2f353fe927c6
+EBUILD ffmpeg-chromium-114.ebuild 6337 BLAKE2B 25965fa55c63e29022d7ad61c707090bb2ead24a94b168a51d5aa741e2de91bfdb4266b11d1e8fea762d57f0ace237ae1191465b1f2ae5db661ede8eed345fa5 SHA512 141d4a6e951dcf523062e18a274207b139a26356ac957ac0d4ee4d5f165cff635e25a20999614ed67b47c73d458d2a3d9918bd0639fa6230d38e9ae6de75b36d
 MISC metadata.xml 589 BLAKE2B 60a8f7a2eca511672dc67487956c589fffbb86ca6500d61c266916be92d1cde6c26246516289f129bbce05b07b811bdfcc0136d56676ce4097e5f19b361f375a SHA512 3953c626bb570af8cceedbf8b4035a0259e789823c296d11e6823237d05bd5d25a08260c6a8815bcea02bee56a522b0bb8da2b8aacd6be417b1992c4b0d22964
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild
index 5c5350f293b1..6e4409a5274b 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild
@@ -116,6 +116,7 @@ S="${WORKDIR}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-100.patch
 	"${FILESDIR}"/${PN}-vk-headers.patch
+	"${FILESDIR}"/${PN}-binutils-2.41.patch
 	"${FILESDIR}"/chromium.patch
 )
 
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild
index 39b454aa1a07..a25fa2fc9cdb 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild
@@ -114,6 +114,7 @@ RESTRICT="
 PATCHES=(
 	"${FILESDIR}"/${PN}-100.patch
 	"${FILESDIR}"/${PN}-vk-headers.patch
+	"${FILESDIR}"/${PN}-binutils-2.41.patch
 	"${FILESDIR}"/chromium.patch
 )
 
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild
index a550da7245bf..da89ecc4a215 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-114.ebuild
@@ -113,6 +113,7 @@ RESTRICT="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-100.patch
+	"${FILESDIR}"/${PN}-binutils-2.41.patch
 	"${FILESDIR}"/chromium.patch
 )
 
diff --git a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-binutils-2.41.patch b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-binutils-2.41.patch
new file mode 100644
index 000000000000..81d544625919
--- /dev/null
+++ b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-binutils-2.41.patch
@@ -0,0 +1,77 @@
+https://bugs.gentoo.org/911582
+https://bugs.gentoo.org/911839
+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)
+--- 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