mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
community/ffmpeg4: backport binutils 2.43 fix for ARM
This commit is contained in:
parent
1947c8f669
commit
858a269e26
@ -65,6 +65,7 @@ source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
|
||||
32bit.patch
|
||||
ffmpeg-v4l2-configure.patch
|
||||
gcc14-posix-ioctl.patch
|
||||
binutils-2.43-arm.patch
|
||||
"
|
||||
builddir="$srcdir/ffmpeg-$pkgver"
|
||||
|
||||
@ -286,4 +287,5 @@ sha512sums="
|
||||
c8efe229b66575c375d74352fbab20780a70a8e600974db1ccdc45822ad7b975825738bc971ef9c226f01cdf2829a76586fe2863c0cb732238536427d056d8ae 32bit.patch
|
||||
9c258e6cca24f090458b9309f5bc3b61460fbc1a5e0397177d0d3a0c42408d7a7d2df4bc68a2cfe283ff3b4653900d3a9a9181bfc464ced48741a7a9e9c980a5 ffmpeg-v4l2-configure.patch
|
||||
f0a08b14839358db7ec152e8faa677438e42fcd201aed1da994aecd2464865a5d95d433d139bf0da816c60c6c3ee2bde2651a20f2232b727830b47d9cd2448de gcc14-posix-ioctl.patch
|
||||
08b83e64f88f22a340dc3f85f8670ca55a07a546ad29dcc740182e8fa82a39534ca253b2ca1e17abaa374e906e1970b7f8ec75a980f90b873321494410232a53 binutils-2.43-arm.patch
|
||||
"
|
||||
|
58
community/ffmpeg4/binutils-2.43-arm.patch
Normal file
58
community/ffmpeg4/binutils-2.43-arm.patch
Normal file
@ -0,0 +1,58 @@
|
||||
From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@arm.com>
|
||||
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 <ross.burton@arm.com>
|
||||
Signed-off-by: Martin Storsjö <martin@martin.st>
|
||||
---
|
||||
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.25.1
|
||||
|
Loading…
Reference in New Issue
Block a user