From 6e46cfa923185200345c5f9e07c480a375e4342f Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 11 Sep 2023 08:13:05 -0600
Subject: [PATCH] Update ffmpeg to 6.0, patch for binutils 2.41
---
recipes/ffmpeg/binutils-2.41.patch | 76 ++++++++++++++++++++++++++++++
recipes/ffmpeg/recipe.toml | 9 ++--
2 files changed, 80 insertions(+), 5 deletions(-)
create mode 100644 recipes/ffmpeg/binutils-2.41.patch
diff --git a/recipes/ffmpeg/binutils-2.41.patch b/recipes/ffmpeg/binutils-2.41.patch
new file mode 100644
index 000000000..33fd3d484
--- /dev/null
+++ b/recipes/ffmpeg/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?= <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
+
diff --git a/recipes/ffmpeg/recipe.toml b/recipes/ffmpeg/recipe.toml
index e7ee861e6..1ef7aa6c4 100644
--- a/recipes/ffmpeg/recipe.toml
+++ b/recipes/ffmpeg/recipe.toml
@@ -1,10 +1,9 @@
[source]
-#git = "https://git.ffmpeg.org/ffmpeg.git"
-#rev = "eacfcbae690f914a4b1b4ad06999f138540cc3d8"
-tar = "https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz"
-blake3 = "69fddb793c6b4fb6fd1093e54c8228c3c498614be3e48c311bb3f609a12daf5f"
+tar = "https://ffmpeg.org/releases/ffmpeg-6.0.tar.xz"
+blake3 = "4879074c357102f85932673044c57c144b0c188ae58edec2a115965536ee340f"
patches = [
- "ffmpeg.patch"
+ "ffmpeg.patch",
+ "binutils-2.41.patch",
]
[build]
--
GitLab