commit ea1f3747717c3032b3d971e62cdf3710ea56032c Author: Jan Palus <at...@pld-linux.org> Date: Tue Oct 17 12:56:11 2023 +0200
upstream patch to fix internal ffmpeg build with binutils >= 2.41 ffmpeg-binutils.patch | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++ qt6.spec | 2 ++ 2 files changed, 87 insertions(+) --- diff --git a/qt6.spec b/qt6.spec index be9d787..c5c7186 100644 --- a/qt6.spec +++ b/qt6.spec @@ -121,6 +121,7 @@ Patch3: no-implicit-sse2.patch Patch4: x32.patch Patch5: qtwebengine-cmake-build-type.patch Patch6: libxkbcommon1.6.patch +Patch7: ffmpeg-binutils.patch URL: https://www.qt.io/ %{?with_directfb:BuildRequires: DirectFB-devel} BuildRequires: EGL-devel @@ -3645,6 +3646,7 @@ narzędzia. %patch4 -p1 %patch5 -p1 %patch6 -p1 -d qtbase +%patch7 -p1 -d qtwebengine/src/3rdparty %{__sed} -i -e 's,usr/X11R6/,usr/,g' qtbase/mkspecs/linux-g++-64/qmake.conf diff --git a/ffmpeg-binutils.patch b/ffmpeg-binutils.patch new file mode 100644 index 0000000..a8e17cb --- /dev/null +++ b/ffmpeg-binutils.patch @@ -0,0 +1,85 @@ +From 29354c7c7def7bdc66bcd25d401677fd9421f657 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: Fix ffmpeg assembly with newer binutil + +avcodec/x86/mathops: clip constants used with shift instructions within inline assembly + +Fixes assembling with binutil as >= 2.41 + +FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb. + +Deals with: "Error: operand type mismatch for `shr'" + +Fixes: QTBUG-116649 +Pick-to: 108-based +Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830 +Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990 +Reviewed-by: Shawn Rutledge <shawn.rutle...@qt.io> +--- + .../third_party/ffmpeg/libavcodec/x86/mathops.h | 26 +++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +diff --git a/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h +index 6298f5ed198..ca7e2dffc10 100644 +--- a/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h ++++ b/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; + } + +-- +cgit v1.2.3 + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt6.git/commitdiff/ea1f3747717c3032b3d971e62cdf3710ea56032c _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit