diff --git a/recipes/qt/5.x.x/conandata.yml b/recipes/qt/5.x.x/conandata.yml index db92ab6d5dace..5bf91b2de12c0 100644 --- a/recipes/qt/5.x.x/conandata.yml +++ b/recipes/qt/5.x.x/conandata.yml @@ -108,6 +108,11 @@ patches: patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14" patch_type: "portability" patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392" + - patch_file: "patches/fix_ffmpeg_assembly_for_binutils_2_41.patch" + base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg" + patch_description: "Fix build error with binutils >= 2.41" + patch_type: "portability" + patch_source: "https://trac.ffmpeg.org/ticket/10405" "5.15.10": - "base_path": "qt5/qtbase" "patch_file": "patches/aa2a39dea5.diff" @@ -141,6 +146,11 @@ patches: patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14" patch_type: "portability" patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392" + - patch_file: "patches/fix_ffmpeg_assembly_for_binutils_2_41.patch" + base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg" + patch_description: "Fix build error with binutils >= 2.41" + patch_type: "portability" + patch_source: "https://trac.ffmpeg.org/ticket/10405" "5.15.9": - "base_path": "qt5/qtbase" "patch_file": "patches/aa2a39dea5.diff" @@ -174,6 +184,11 @@ patches: patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14" patch_type: "portability" patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392" + - patch_file: "patches/fix_ffmpeg_assembly_for_binutils_2_41.patch" + base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg" + patch_description: "Fix build error with binutils >= 2.41" + patch_type: "portability" + patch_source: "https://trac.ffmpeg.org/ticket/10405" "5.15.8": - patch_file: "patches/aa2a39dea5.diff" base_path: "qt5/qtbase" @@ -207,6 +222,11 @@ patches: patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14" patch_type: "portability" patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392" + - patch_file: "patches/fix_ffmpeg_assembly_for_binutils_2_41.patch" + base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg" + patch_description: "Fix build error with binutils >= 2.41" + patch_type: "portability" + patch_source: "https://trac.ffmpeg.org/ticket/10405" "5.15.7": - patch_file: "patches/337f28c9ab.patch" base_path: "qt5/qtbase" @@ -248,3 +268,8 @@ patches: patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14" patch_type: "portability" patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392" + - patch_file: "patches/fix_ffmpeg_assembly_for_binutils_2_41.patch" + base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg" + patch_description: "Fix build error with binutils >= 2.41" + patch_type: "portability" + patch_source: "https://trac.ffmpeg.org/ticket/10405" diff --git a/recipes/qt/5.x.x/patches/fix_ffmpeg_assembly_for_binutils_2_41.patch b/recipes/qt/5.x.x/patches/fix_ffmpeg_assembly_for_binutils_2_41.patch new file mode 100644 index 0000000000000..52a93100299cc --- /dev/null +++ b/recipes/qt/5.x.x/patches/fix_ffmpeg_assembly_for_binutils_2_41.patch @@ -0,0 +1,76 @@ +From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 +From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= +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 +--- + 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/libavcodec/x86/mathops.h ++++ b/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.25.1 +