diff --git a/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch b/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch new file mode 100644 index 0000000..6549a0e --- /dev/null +++ b/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch @@ -0,0 +1,58 @@ +From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001 +From: Ross Burton +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=UTF-8 +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 +Signed-off-by: Martin Storsjö +--- + 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.46.0 + diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 7fe3c97..d25a217 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1723277105 -commit: 62e69514f7630d78d61eaba08f38722630b84b1cd4a21f572e09cb0b26d8249d +mtime: 1724235149 +commit: f803df26e37180e4cb16e1e5c0a357b23d53b87108ed61cd85ebf6b6e6fb130d url: https://src.opensuse.org/jengelh/ffmpeg-7 revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index e5878b9..18e752c 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbbe70dceb56f3b2613ab3df8bd9310c0e9282365a8a27434d16bce808cc1663 +oid sha256:4bf92aeac4ca09ce9391f9f98bcb8c54a71230abd8e423126cf4496c89543fbd size 256 diff --git a/ffmpeg-7.changes b/ffmpeg-7.changes index a39a81d..2284455 100644 --- a/ffmpeg-7.changes +++ b/ffmpeg-7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 21 09:58:42 UTC 2024 - Jan Engelhardt + +- Add 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch + to resolve build failure on armv7 [boo#1229338] + ------------------------------------------------------------------- Wed Aug 7 07:37:24 UTC 2024 - Cliff Zhao diff --git a/ffmpeg-7.spec b/ffmpeg-7.spec index c43e3a8..72111c5 100644 --- a/ffmpeg-7.spec +++ b/ffmpeg-7.spec @@ -110,6 +110,7 @@ Patch5: work-around-abi-break.patch Patch10: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch Patch95: ffmpeg-7-fix-crashes.patch +Patch96: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel >= 3.98.3 @@ -823,6 +824,7 @@ Patch5: work-around-abi-break.patch Patch10: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch Patch95: ffmpeg-7-fix-crashes.patch +Patch96: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch BuildRequires: c_compiler Requires: this-is-only-for-build-envs