gentoo auto-resync : 04:08:2023 - 09:17:05

3 files changed, 79 insertions, 1 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index adf33603158e..c20e724ebf27 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,6 +3,7 @@ AUX chromium-109-system-zlib.patch 440 BLAKE2B 95bb1099055e3e0e122d4d8a77cddec0a
 AUX chromium-111-InkDropHost-crash.patch 1066 BLAKE2B ee0b42803a59ef4731e4f316849c2062870b92040ff4e339c3f3f2562999b54fa3176b27e432f31ada76559087631fd623d9f57f1961a42acd0684041c322a01 SHA512 dfa3ab6a84b57b6e66053be2597f0d6c7f4caf54b0e45a359774a56dfbe1e65bdea91120134e77b1e7c38c336a4fd8d05a7c26e9d3bf4bdc0fe40ad7cd832a54
 AUX chromium-114-gcc12.patch 1256 BLAKE2B f0e964955ef529c01a9ce53e9cc64733dbf93e531bc7970c817ed3ade73c0095f62318a9d5e2e146b41d0727ecc30cde8c5e4106e8e9f7016d11c04494566979 SHA512 8a8bd49ce4793e20773e76efd472bc9d41f7257e1db99d4406f85faed3ee0af0e2e08688c22fca2807d7c63c016b433b4bb0174461925d992806d7b171855e8f
 AUX chromium-114-remove-evdev-dep.patch 1476 BLAKE2B f3b5f18ce5566af845f855e4adf19a3716dba52dcd5d4352477d568a7ad7824812bfd105d4648e4e3c1c7aa02bf0f1193a80d18cc9f5261ca5ac022e3814895d SHA512 976a21fab6dc5e5272c45abfbb181a431698be23514ad991f68331ae67d687703b9294f4611f22b0908ac9c87db435920e4362f0f96e7833e5944f65a3b2a483
+AUX chromium-115-binutils-2.41.patch 2182 BLAKE2B 4c629957aea52a3fb1a51e0825921a2c390d65a499fbd8d85ad36e3a6bb3cbbcf353bd9bb0be2824de08de24b2485d86cbab01b50c7196a3d949ec4756ad1c60 SHA512 77d9d1acb299d5ded3e4ffc593ebe7025dc165868317342f975edcc380d85f1dab0a30838de82aad6a7125dbb718b60f3710ac8aa6f0817319f554b69adde170
 AUX chromium-98-gtk4-build.patch 3044 BLAKE2B 782dfd31a3a82d62dc0b8ffbb85cf2dbbef1c6cc47dbd8409dc0777be8d019c4ca082d75e6114b09f880f4f3e886d0f4b9631e66d46a3129e41468b70d71404c SHA512 e8acbf85274813ec81d575727b0e5d107749242d1df80e05035c9273ca0466d7358a8d7cece16c09f6996cb49ad3b1e0dcdf052af45023236f53fa6262b4e441
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
@@ -18,5 +19,5 @@ DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b2655123
 DIST chromium_115.0.5790.102-1raptor0~deb11u2.debian.tar.xz 535516 BLAKE2B ee0a3659584ea304fafe334812fa1306e1294fce4a35002f59f66a049713762960dd8b508bed662a4bcc65e7151edda578794eb58866d174d4d67acb369bfb2f SHA512 6e0849d25ed533206404a3e8516e7541c22678d7613e5c2a644540bdc281da3973a9343db590b2bf6e8d09ec3759b57e5870ba0cfc2a5d9f4147542177d984da
 DIST chromium_115.0.5790.98-1raptor0~deb11u2.debian.tar.xz 534584 BLAKE2B 6cc74324b09132feb191bab932ab109a34a6cca6dc2e799f90d1a64b106caa033a7ea73f0f374675f2e014493b92fc86a77ab3678f8a8961122735c9c7b7c84c SHA512 69cc2b0c22a25090fca39af7fb0a60b46cead4848c47e041f36ef0cd47cde1f809ed6d54dd601c95f47332e9f4a6a68b6cf24f38b3d925fdd7d608217ace8f7b
 EBUILD chromium-115.0.5790.102.ebuild 39175 BLAKE2B a3c9626cf828bc444701fdc7ea26433550b9c02492ab3b5a0ef2c11bcbc9d21177f16ce963a10b9c5ed5592086d50cbc80b44ce8cf10b1112c611507a7dc6c0a SHA512 9a388ad5548b5e971ef32d6e98496917db8aec16a5235929fe23ffda3555242ead0a48086753d186445e447b5f05607f34ac64b3d18acabf2d8fd389dbe1b41f
-EBUILD chromium-115.0.5790.170.ebuild 39204 BLAKE2B 819238d7feea74ce551af6e1f131e000ddd467d292637588226f7c5b008e5a05091fc137a545109d240c50f2174bd7d91976d78be138e7ab67af339e2f4f8e8f SHA512 02365036f9f47473f148457dd318bfebe2a3d200e1637a1650e09edb7be60d4a61fb1e4a64d43681f5a656ff81f04569c20ee07bc4d62b423b4b53847b8021e6
+EBUILD chromium-115.0.5790.170.ebuild 39253 BLAKE2B 4b16dc3f6fc0d2f3729e96699856edc2f778f814d9c445d16d70a0b0a0ddc877c11ff3f10e76ced5962ba65f9f978b2bc893b9f94149d10d445160196be7ec70 SHA512 a0cbbee7a3aaa7e52b258de3e792b1aec710aba36b46934cee0c2300c937e7a9655569fed6bbd84e38f41f066ad9de23d4f5172f6b2da2c934ee75cd2742a4aa
 MISC metadata.xml 2350 BLAKE2B 6d5a43505ecd9e3f7bb92d4cb1359157597de4133dba73e9ff3731211f1669ea60447842931ef0911538f967930b67bfbc46e1880734745b6bc83b699a61580b SHA512 96814e86fc01a5600c65cd005cc52b5b3ae440e27092b16021a11f5ca9a3f519a756504de5746095bf581d57acbdde81583d441287368331fb2e02d878b433aa
diff --git a/www-client/chromium/chromium-115.0.5790.170.ebuild b/www-client/chromium/chromium-115.0.5790.170.ebuild
index 665ca347d034..ee04adc672c3 100644
--- a/www-client/chromium/chromium-115.0.5790.170.ebuild
+++ b/www-client/chromium/chromium-115.0.5790.170.ebuild
@@ -341,6 +341,7 @@ src_prepare() {
 		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
 		"${FILESDIR}/chromium-114-gcc12.patch"
 		"${FILESDIR}/chromium-114-remove-evdev-dep.patch"
+		"${FILESDIR}/chromium-115-binutils-2.41.patch"
 	)
 
 	if use ppc64 ; then
diff --git a/www-client/chromium/files/chromium-115-binutils-2.41.patch b/www-client/chromium/files/chromium-115-binutils-2.41.patch
new file mode 100644
index 000000000000..95f65eb6e33e
--- /dev/null
+++ b/www-client/chromium/files/chromium-115-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 a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
+index 6298f5ed19..ca7e2dffc1 100644
+--- a/third_party/ffmpeg/libavcodec/x86/mathops.h
++++ b/third_party/ffmpeg/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
+