From 361cbfdc62aa0e2beb22f4d617bb6318ed4c5830 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 6 Sep 2021 15:08:43 +0200 Subject: distro: tdx-base.inc: prefer gstreamer with a weak assignment Currently the preferred version for the gstreamer components is assigned with '='. Relax that to '?=' to allow for a easier override in other configuration files. Proposed-by: Carlos Rafael Giani Signed-off-by: Max Krummenacher --- conf/distro/include/tdx-base.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/distro/include/tdx-base.inc b/conf/distro/include/tdx-base.inc index 45f4b87..56a5174 100644 --- a/conf/distro/include/tdx-base.inc +++ b/conf/distro/include/tdx-base.inc @@ -79,17 +79,17 @@ PREFERRED_RPROVIDER_u-boot-fw-utils = "libubootenv" PREFERRED_PROVIDER_virtual/dtb ?= "device-tree-overlays" # Use i.MX Gstreamer Version (for PXP DMA-ENGINE Driver) -PREFERRED_VERSION_gstreamer1.0_imx = "1.16.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base_imx = "1.16.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good_imx = "1.16.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad_imx = "1.16.imx" +PREFERRED_VERSION_gstreamer1.0_imx ?= "1.16.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base_imx ?= "1.16.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good_imx ?= "1.16.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad_imx ?= "1.16.imx" # the 1.16.imx variants have their COMPATIBLE set so that they don't build # for use-mainline-bsp -PREFERRED_VERSION_gstreamer1.0_use-mainline-bsp = "1.16%" -PREFERRED_VERSION_gstreamer1.0-plugins-base_use-mainline-bsp = "1.16%" -PREFERRED_VERSION_gstreamer1.0-plugins-good_use-mainline-bsp = "1.16%" -PREFERRED_VERSION_gstreamer1.0-plugins-bad_use-mainline-bsp = "1.16%" +PREFERRED_VERSION_gstreamer1.0_use-mainline-bsp ?= "1.16%" +PREFERRED_VERSION_gstreamer1.0-plugins-base_use-mainline-bsp ?= "1.16%" +PREFERRED_VERSION_gstreamer1.0-plugins-good_use-mainline-bsp ?= "1.16%" +PREFERRED_VERSION_gstreamer1.0-plugins-bad_use-mainline-bsp ?= "1.16%" # Override Wayland/Weston Version set in meta-freescale imx-base.inc PREFERRED_VERSION_wayland-protocols_mx6 = "1.20.imx" -- cgit v1.2.3