MIRRORS/meta-raspberrypi
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-raspberrypi.git synced 2025-07-05 05:04:45 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rpidistro-vlc,rpidistro-ffmpeg: Limit scope to just rpi machines

Browse Source 
enable mmal only when using userland graphics

Fixes builds on non-rpi machines e.g.
ERROR: Nothing PROVIDES 'userland' (but /mnt/jenkins/workspace/yocto-world-glibc/sources/meta-raspberrypi/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_4.3.2.bb DEPENDS on or otherwise requires it)
userland was skipped: incompatible with machine qemumips (not in COMPATIBLE_MACHINE)
NOTE: Runtime target 'rpidistro-ffmpeg' is unbuildable, removing...

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2022-09-12 17:17:11 -07:00 committed by Andrei Gherzan
parent e9d70d6b77
commit 1b598573be
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/rpidistro-vlc_3.0.12.bb
View File

@ -51,8 +51,9 @@ EXTRA_OECONF = "\
PACKAGECONFIG ?= "\
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mmal', d)} \
live555 dv1394 notify fontconfig fluidsynth freetype dvdread png udev \
x264 alsa mmal harfbuzz jack neon fribidi dvbpsi a52 v4l2 gles2 \
x264 alsa harfbuzz jack neon fribidi dvbpsi a52 v4l2 gles2 \
"
PACKAGECONFIG[mmal] = "--enable-omxil --enable-omxil-vout --enable-rpi-omxil --enable-mmal --enable-mmal-avcodec,,userland"
@ -151,4 +152,8 @@ FILES:${PN}-staticdev += "\
${libdir}/vlc/libcompat.a \
"
# Only enable it for rpi class of machines
COMPATIBLE_HOST = "null"
COMPATIBLE_HOST:rpi = "'(.*)'"
INSANE_SKIP:${PN} = "dev-so"

8
recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_4.3.2.bb
View File

@ -35,7 +35,8 @@ DEPENDS = "nasm-native"
inherit autotools pkgconfig
PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \
opengl udev sdl2 ffplay alsa bzlib lzma pic pthreads shared theora zlib \
libvorbis x264 gpl mmal sand rpi vout-drm vout-egl \
libvorbis x264 gpl sand rpi vout-drm vout-egl \
${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mmal', d)} \
${@bb.utils.contains('AVAILTUNES', 'mips32r2', 'mips32r2', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}"
@ -186,3 +187,8 @@ INSANE_SKIP:${MLPREFIX}libavresample = "textrel"
INSANE_SKIP:${MLPREFIX}libswscale = "textrel"
INSANE_SKIP:${MLPREFIX}libswresample = "textrel"
INSANE_SKIP:${MLPREFIX}libpostproc = "textrel"
# Only enable it for rpi class of machines
COMPATIBLE_HOST = "null"
COMPATIBLE_HOST:rpi = "'(.*)'"