diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-11-06 22:18:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-06 22:18:32 +0000 |
commit | 0e3680e4c16ff28839745eec6711889fc2e8d7e2 (patch) | |
tree | 6c53e6765a65faa5677ef9555e8b038b752cca85 /dev-qt/qtwebengine/files | |
parent | 9afce155a599e5f4518f3c7913b6424ac13be12e (diff) |
gentoo auto-resync : 06:11:2023 - 22:18:31
Diffstat (limited to 'dev-qt/qtwebengine/files')
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230623-clang16.patch | 15 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230623-ffmpeg-binutils-2.41.patch | 75 |
2 files changed, 0 insertions, 90 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230623-clang16.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230623-clang16.patch deleted file mode 100644 index 2d8f8482e1b4..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230623-clang16.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/903573 ---- a/src/3rdparty/chromium/v8/src/base/bit-field.h -+++ b/src/3rdparty/chromium/v8/src/base/bit-field.h -@@ -39,8 +39,11 @@ - static constexpr int kLastUsedBit = kShift + kSize - 1; - static constexpr U kNumValues = U{1} << kSize; - -+ #pragma clang diagnostic push -+ #pragma clang diagnostic ignored "-Wenum-constexpr-conversion" - // Value for the field with all bits set. - static constexpr T kMax = static_cast<T>(kNumValues - 1); -+ #pragma clang diagnostic pop - - template <class T2, int size2> - using Next = BitField<T2, kShift + kSize, size2, U>; diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230623-ffmpeg-binutils-2.41.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230623-ffmpeg-binutils-2.41.patch deleted file mode 100644 index 6b98df9bf5ae..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.10_p20230623-ffmpeg-binutils-2.41.patch +++ /dev/null @@ -1,75 +0,0 @@ -https://bugs.gentoo.org/911582 -https://bugs.gentoo.org/911688 -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/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h -+++ b/src/3rdparty/chromium/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; - } - |