commit 15750a1b039ca43f518826e372b8c066b9a1098a Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Mon Oct 16 22:54:08 2023 +0200
- upstream patch to fix build with binutils 2.41 ...-mathops-clip-constants-used-with-shift-i.patch | 75 ++++++++++++++++++++++ qt5-qtwebengine.spec | 2 + 2 files changed, 77 insertions(+) --- diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 313b562..d5dba8f 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -23,6 +23,7 @@ Source0: qtwebengine-%{version}.tar.xz # Source0-md5: fa635b1707607b3eafdc7e099b8cc22c Patch0: x32.patch Patch1: %{name}-gn-dynamic.patch +Patch2: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch URL: https://www.qt.io/ BuildRequires: Qt5Core-devel >= %{qtbase_ver} BuildRequires: Qt5Designer-devel >= %{qttools_ver} @@ -279,6 +280,7 @@ Przykłady do biblioteki Qt5 WebEngine. %patch0 -p1 %endif %patch1 -p1 +%patch2 -p1 %{qt5bindir}/syncqt.pl -version %{version} diff --git a/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch b/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch new file mode 100644 index 0000000..5dcc8fb --- /dev/null +++ b/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch @@ -0,0 +1,75 @@ +From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <r...@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 <jamr...@gmail.com> +--- + 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 6298f5ed19..ca7e2dffc1 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.41.0 ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebengine.git/commitdiff/15750a1b039ca43f518826e372b8c066b9a1098a _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit