commit b8b1dc7aa13367a2250fbfd2acbc8d786839e0fa
Author: Jan Palus <[email protected]>
Date: Mon Sep 16 21:57:55 2024 +0200
upstream patch to fix build on arm with binutils 2.43
binutils-2.43.patch | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++
ffmpeg.spec | 2 ++
2 files changed, 60 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 1400340..84b98e8 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -148,6 +148,7 @@ Patch3: v4l2-request-hwdec.patch
Patch4: ffmpeg-vulkan1.3.280.patch
Patch5: gcc14.patch
Patch6: %{name}-x265-210.patch
+Patch7: binutils-2.43.patch
URL: https://ffmpeg.org/
%{?with_avisynth:BuildRequires: AviSynthPlus-devel >= 3.7.3}
%{?with_decklink:BuildRequires: Blackmagic_DeckLink_SDK >= 10.11}
@@ -577,6 +578,7 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# package the grep result for mplayer, the result formatted as
./mplayer/configure
cat <<EOF > ffmpeg-avconfig
diff --git a/binutils-2.43.patch b/binutils-2.43.patch
new file mode 100644
index 0000000..750f350
--- /dev/null
+++ b/binutils-2.43.patch
@@ -0,0 +1,58 @@
+From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001
+From: Ross Burton <[email protected]>
+Date: Fri, 9 Aug 2024 11:32:00 +0100
+Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with
+ binutils 2.43
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+binutils 2.43 has stricter validation for labels[1] and results in errors
+when building ffmpeg for armv5:
+
+src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first
unrecognized character is `0'
+
+Remove the leading zero in the "01" label to resolve this error.
+
+[1]
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
+
+Signed-off-by: Ross Burton <[email protected]>
+Signed-off-by: Martin Storsjö <[email protected]>
+---
+ libavcodec/arm/mlpdsp_armv5te.S | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
+index 4f9aa485fd..d31568611c 100644
+--- a/libavcodec/arm/mlpdsp_armv5te.S
++++ b/libavcodec/arm/mlpdsp_armv5te.S
+@@ -229,7 +229,7 @@ A .endif
+ .endif
+
+ // Begin loop
+-01:
++1:
+ .if TOTAL_TAPS == 0
+ // Things simplify a lot in this case
+ // In fact this could be pipelined further if it's worth it...
+@@ -241,7 +241,7 @@ A .endif
+ str ST0, [PST, #-4]!
+ str ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
+ str ST0, [PSAMP], #4 * MAX_CHANNELS
+- bne 01b
++ bne 1b
+ .else
+ .if \fir_taps & 1
+ .set LOAD_REG, 1
+@@ -333,7 +333,7 @@ T orr AC0, AC0, AC1
+ str ST3, [PST, #-4]!
+ str ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
+ str ST3, [PSAMP], #4 * MAX_CHANNELS
+- bne 01b
++ bne 1b
+ .endif
+ b 99f
+
+--
+2.30.2
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/b8b1dc7aa13367a2250fbfd2acbc8d786839e0fa
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
