From 493077e3e6a757f03d90a80411397b14000395dc Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 14 Jan 2025 14:39:00 -0800 Subject: [PATCH] fixup! fsl-base.inc: Fix gstreamer preferred version Prior commit was incomplete. Finish the changes. The main point here is to override the default for 6 and 7 so the i.MX forks/copies are used. Note that 8 and 9 are already set to use the forks in imx-base.inc. Signed-off-by: Tom Hochstein --- conf/distro/include/fsl-base.inc | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/conf/distro/include/fsl-base.inc b/conf/distro/include/fsl-base.inc index c505187..9393446 100644 --- a/conf/distro/include/fsl-base.inc +++ b/conf/distro/include/fsl-base.inc @@ -29,28 +29,18 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx9-nxp-bsp = "imx-gst1.0-plugin" PREFERRED_VERSION_ffmpeg = "4.4.1" # GStreamer forked recipes -PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0 ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good ??= "1.24.0.imx" # GStreamer copied recipes -PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.24.0.imx" -PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp ??= "1.24.0.imx" +PREFERRED_VERSION_gst-devtools ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-libav ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-ugly ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-python ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-rtsp-server ??= "1.24.0.imx" +PREFERRED_VERSION_gstreamer1.0-vaapi ??= "1.24.0.imx" # Enable allow-autospawn-for-root as default PACKAGECONFIG:append:pn-pulseaudio = " autospawn-for-root"