113 lines
3.8 KiB
Diff
113 lines
3.8 KiB
Diff
|
From 6a83b674531d980a459057a8fd7c8b5050ba2f7c Mon Sep 17 00:00:00 2001
|
||
|
|
From: graysky <therealgraysky AT proton DOT me>
|
||
|
|
Date: Wed, 2 Aug 2023 14:43:24 -0400
|
||
|
|
Subject: [PATCH] ffmpeg: fix build with binutils update
|
||
|
|
|
||
|
|
---
|
||
|
|
cmake/modules/FindFFMPEG.cmake | 5 +-
|
||
|
|
...1-Fixes-assembling-w-binutil-as-2.41.patch | 76 +++++++++++++++++++
|
||
|
|
2 files changed, 80 insertions(+), 1 deletion(-)
|
||
|
|
create mode 100644 tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch
|
||
|
|
|
||
|
|
diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
|
||
|
|
index e53a121..eca8e27 100644
|
||
|
|
--- a/cmake/modules/FindFFMPEG.cmake
|
||
|
|
+++ b/cmake/modules/FindFFMPEG.cmake
|
||
|
|
@@ -85,7 +85,10 @@ macro(buildFFMPEG)
|
||
|
|
-DPKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig)
|
||
|
|
set(PATCH_COMMAND ${CMAKE_COMMAND} -E copy
|
||
|
|
${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/CMakeLists.txt
|
||
|
|
- <SOURCE_DIR>)
|
||
|
|
+ <SOURCE_DIR> &&
|
||
|
|
+ patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch &&
|
||
|
|
+ echo "########################################## patched ffmpeg ##############################"
|
||
|
|
+ )
|
||
|
|
|
||
|
|
if(CMAKE_GENERATOR STREQUAL Xcode)
|
||
|
|
set(FFMPEG_GENERATOR CMAKE_GENERATOR "Unix Makefiles")
|
||
|
|
diff --git a/tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch b/tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch
|
||
|
|
new file mode 100644
|
||
|
|
index 0000000..33fd3d4
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/tools/depends/target/ffmpeg/0001-Fixes-assembling-w-binutil-as-2.41.patch
|
||
|
|
@@ -0,0 +1,76 @@
|
||
|
|
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb 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>
|
||
|
|
+---
|
||
|
|
+ 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.30.2
|
||
|
|
+
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|