From cc665244bc804a773c6603a6dc7d55f3bfb8b05d Mon Sep 17 00:00:00 2001
From: Gijs Peskens <gijs.peskens@munisense.com>
Date: Fri, 9 Jan 2026 11:03:19 +0100
Subject: [PATCH] rpidistro-ffmpeg: Fix compilation on Whinlatter

Backport ffmpeg patch fixing assembler syntax

Signed-off-by: Gijs Peskens <gijs.peskens@munisense.com>
---
 .../2024-fix-compile-newer-binutils.patch     | 33 +++++++++++++++++++
 .../rpidistro-ffmpeg_5.1.4.bb                 |  8 ++---
 2 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 recipes-multimedia/rpidistro-ffmpeg/files/2024-fix-compile-newer-binutils.patch

diff --git a/recipes-multimedia/rpidistro-ffmpeg/files/2024-fix-compile-newer-binutils.patch b/recipes-multimedia/rpidistro-ffmpeg/files/2024-fix-compile-newer-binutils.patch
new file mode 100644
index 0000000..89235ec
--- /dev/null
+++ b/recipes-multimedia/rpidistro-ffmpeg/files/2024-fix-compile-newer-binutils.patch
@@ -0,0 +1,33 @@
+Upstream-Status: Pending
+
+diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
+index 4f9aa485fd21aabff582423703197dc0d05173dc..d31568611c30f67145e89332240dc6a5246e68c7 100644 (file)
+--- 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
+ 
diff --git a/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_5.1.4.bb b/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_5.1.4.bb
index a6626df..46ee797 100644
--- a/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_5.1.4.bb
+++ b/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_5.1.4.bb
@@ -34,18 +34,18 @@ DEPENDS = "nasm-native"
 
 inherit autotools pkgconfig
 PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc ffplay \
-                   v4l2 drm udev alsa bzlib lzma pic pthreads shared theora zlib libvorbis x264 gpl \
+                   v4l2 drm udev alsa bzlib lzma pic pthreads shared theora zlib gpl \
                    ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mmal sand vout-drm', d)} \
                    ${@bb.utils.contains('AVAILTUNES', 'mips32r2', 'mips32r2', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'epoxy vout-egl', '', d)}"
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}"
+ 
 
 SRC_URI = "\
     git://git@github.com/RPi-Distro/ffmpeg;protocol=https;branch=pios/bookworm \
     file://0001-ffmpeg-5.1.4-rpi_24.patch \
     file://2001-configure-setup-for-OE-core-usage.patch \
     file://2004-libavcodec-omx-replace-opt-vc-path-with-usr-lib.patch \
+    file://2024-fix-compile-newer-binutils.patch \
     "
 
 SRCREV = "1c363463c432c5ed492c7b759abb6e015b93b6b5"