From 4637021ecd018da667a2e8ae16216f43bf94c637 Mon Sep 17 00:00:00 2001 From: Vincent Davis Jr Date: Sun, 16 Jun 2024 18:02:08 -0400 Subject: [PATCH 1/2] rpi-default-providers: remove vlc,ffmpeg PREFFERED_PROVIDER Switch to defaulting to OE core ffmpeg & meta-openembedded vlc. Upgrades to newer rpi-distro VLC version in an OE environment have proven to be tedious due to all the PI foundation patches. Some patches aren't fully pushed into github and require updates to build. Maintaining patches have also proven to be unstable. Defualt to stable builds of both so that. Peoples builds aren't broken. If rpi-distro rpi-distro version of ffmpeg & vlc wanted users may switch by setting PREFFERED_PROVIDER. Signed-off-by: Vincent Davis Jr --- conf/machine/include/rpi-default-providers.inc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conf/machine/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc index 3f810264b..c02d24879 100644 --- a/conf/machine/include/rpi-default-providers.inc +++ b/conf/machine/include/rpi-default-providers.inc @@ -7,10 +7,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" PREFERRED_PROVIDER_virtual/libgbm ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" -PREFERRED_PROVIDER_vlc ?= "rpidistro-vlc" -PREFERRED_PROVIDER_ffmpeg ?= "rpidistro-ffmpeg" -PREFERRED_PROVIDER_libav ?= "rpidistro-ffmpeg" -PREFERRED_PROVIDER_libpostproc ?= "rpidistro-ffmpeg" PREFERRED_PROVIDER_jpeg ?= "jpeg" PREFERRED_PROVIDER_virtual/libomxil ?= "userland" From faea953f9004dc162fa1004a4f7f3f3f0b9da9ac Mon Sep 17 00:00:00 2001 From: Vincent Davis Jr Date: Sun, 16 Jun 2024 18:18:14 -0400 Subject: [PATCH 2/2] docs: include PREFERRED_PROVIDER_ffmpeg,vlc change Signed-off-by: Vincent Davis Jr --- docs/extra-build-config.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/extra-build-config.md b/docs/extra-build-config.md index dfb86f169..a8a84adff 100644 --- a/docs/extra-build-config.md +++ b/docs/extra-build-config.md @@ -487,14 +487,15 @@ MMAL is not enabled by default. To enable it add DISABLE_VC4GRAPHICS = "1" -to `local.conf`. Adding `vlc` to `IMAGE_INSTALL` will then default to building the Raspberry -Pi's Distro implementation of VLC with HW accelerated video decode through MMAL into the system -image. It also defaults to building VLC with Raspberry PI's Distro implementation of ffmpeg. The -oe-core implementation of ffmpeg and the meta-openembedded/meta-multimedia implementation of VLC -can however be selected via: - - PREFERRED_PROVIDER_ffmpeg = "ffmpeg" - PREFERRED_PROVIDER_vlc = "vlc" +to `local.conf`. Adding `vlc` to `IMAGE_INSTALL` will then default to building the oe-core +implementation of ffmpeg and the meta-openembedded/meta-multimedia implementation of VLC. +The Raspberry Pi's Distro implementation of VLC with HW accelerated video decode through +MMAL and the Raspberry PI's Distro implementation of ffmpeg. Can however be selected via: + + PREFERRED_PROVIDER_vlc = "rpidistro-vlc" + PREFERRED_PROVIDER_ffmpeg = "rpidistro-ffmpeg" + PREFERRED_PROVIDER_libav = "rpidistro-ffmpeg" + PREFERRED_PROVIDER_libpostproc = "rpidistro-ffmpeg" Usage example: Start VLC with mmal_vout plugin and without an active display server.