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 9d2f3a4..858f29b 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1724224191 -commit: 8f9305d13324079959d8c001f4ec842f6bde92cd66688c5eb948803bb30e90fa +mtime: 1725228433 +commit: 943a1c7f2afbdabd32765d443b847eea8f2612bd31918795e3f463461109d359 url: https://src.opensuse.org/jengelh/ffmpeg-6 revision: master diff --git a/ffmpeg-6.changes b/ffmpeg-6.changes index 5c82c38..5674966 100644 --- a/ffmpeg-6.changes +++ b/ffmpeg-6.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Sep 1 18:04:27 UTC 2024 - Jan Engelhardt + +- Add 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch + [boo#1229338] + ------------------------------------------------------------------- Wed Aug 14 14:38:37 UTC 2024 - Manfred Hollstein diff --git a/ffmpeg-6.spec b/ffmpeg-6.spec index 3b00aea..9f1d7ec 100644 --- a/ffmpeg-6.spec +++ b/ffmpeg-6.spec @@ -115,6 +115,7 @@ Patch10: 0001-avfilter-af_dialoguenhance-simplify-channels-copy.patch Patch11: 0001-avfilter-af_dialoguenhance-do-output-scaling-once.patch Patch12: 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch Patch13: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch +Patch14: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch Patch90: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch Patch92: ffmpeg-CVE-2023-50007.patch @@ -844,6 +845,7 @@ Patch10: 0001-avfilter-af_dialoguenhance-simplify-channels-copy.patch Patch11: 0001-avfilter-af_dialoguenhance-do-output-scaling-once.patch Patch12: 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch Patch13: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch +Patch14: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch Patch90: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch Patch92: ffmpeg-CVE-2023-50007.patch