helium-3rd-party/meta-raspberrypi
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-raspberrypi synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpidistro-ffmpeg: Fix compilation on Whinlatter

Browse Source 
Backport ffmpeg patch fixing assembler syntax

Signed-off-by: Gijs Peskens <gijs.peskens@munisense.com>
This commit is contained in:
Gijs Peskens 2026-01-09 11:03:19 +01:00 committed by Andrei Gherzan
parent e00b8ea853
commit cc665244bc
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
recipes-multimedia/rpidistro-ffmpeg/files/2024-fix-compile-newer-binutils.patch Normal file
View File

@ -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

8
recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_5.1.4.bb
View File

@ -34,18 +34,18 @@ DEPENDS = "nasm-native"
inherit autotools pkgconfig inherit autotools pkgconfig
PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc ffplay \ 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('MACHINE_FEATURES', 'vc4graphics', '', 'mmal sand vout-drm', d)} \
${@bb.utils.contains('AVAILTUNES', 'mips32r2', 'mips32r2', '', 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', 'xv xcb', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'epoxy vout-egl', '', d)}"
SRC_URI = "\ SRC_URI = "\
git://git@github.com/RPi-Distro/ffmpeg;protocol=https;branch=pios/bookworm \ git://git@github.com/RPi-Distro/ffmpeg;protocol=https;branch=pios/bookworm \
file://0001-ffmpeg-5.1.4-rpi_24.patch \ file://0001-ffmpeg-5.1.4-rpi_24.patch \
file://2001-configure-setup-for-OE-core-usage.patch \ file://2001-configure-setup-for-OE-core-usage.patch \
file://2004-libavcodec-omx-replace-opt-vc-path-with-usr-lib.patch \ file://2004-libavcodec-omx-replace-opt-vc-path-with-usr-lib.patch \
file://2024-fix-compile-newer-binutils.patch \
" "
SRCREV = "1c363463c432c5ed492c7b759abb6e015b93b6b5" SRCREV = "1c363463c432c5ed492c7b759abb6e015b93b6b5"