diff --git a/Backport-ffmpeg-avcodec-x86-mathops-clip-constants-used-with-.patch b/Backport-ffmpeg-avcodec-x86-mathops-clip-constants-used-with-.patch new file mode 100644 index 0000000..6c94321 --- /dev/null +++ b/Backport-ffmpeg-avcodec-x86-mathops-clip-constants-used-with-.patch @@ -0,0 +1,73 @@ +From 91a348ac06676ed64a230f08b80ca5f92c92c78c Mon Sep 17 00:00:00 2001 +From: panchenbo +Date: Fri, 15 Mar 2024 10:46:46 +0800 +Subject: [PATCH] ffmpeg: avcodec/x86/mathops: clip constants used with shift + instructions within inline assembly + +--- + .../ffmpeg/libavcodec/x86/mathops.h | 26 ++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +diff --git a/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h +index 6298f5ed1..ca7e2dffc 100644 +--- 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; + } + +-- +2.27.0 + diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 2e47ef3..8056720 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -52,7 +52,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.10 -Release: 4 +Release: 5 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -113,6 +113,8 @@ Patch34: qtwebengine-support-clang-compile.patch Patch35: CVE-2023-6112.patch ## Upstream patches: Patch36: qtwebengine-icu-74.patch +## From: https://git.videolan.org/?p=ffmpeg.git;a=commit;h=effadce6c756247ea8bae32dc13bb3e6f464f0eb +Patch37: Backport-ffmpeg-avcodec-x86-mathops-clip-constants-used-with-.patch # handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches #ExclusiveArch: %{qt5_qtwebengine_arches} @@ -422,6 +424,7 @@ popd %patch35 -p1 %patch36 -p1 +%patch37 -p1 # delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we # never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS @@ -639,6 +642,9 @@ done %changelog +* Fri Mar 15 2024 panchenbo - 5.15.10-5 +- Backport ffmpeg: avcodec/x86/mathops: clip constants used with shift instructions within inline assembly + * Tue Feb 20 2024 peijiankang - 5.15.10-4 - add qtwebengine-icu-74.patch