From 6e788ed578be2a9f38c150cb2e65e0dd323a82ef Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 28 Jun 2023 20:57:52 -0300 Subject: wayland: sync wayland, wayland-native and nativesdk-wayland versions When using wayland and an i.MX SoC the recipes ought to be in sync. This fixes a build error in nativesdk-wayland when running in mickledore: ,---- | ../wayland-1.21.0/src/meson.build:81:1: ERROR: Dependency lookup for | wayland-scanner with method 'pkgconfig' failed: Invalid version, need | 'wayland-scanner' ['1.21.0'] found '1.22.0'. `---- Fixes: 60510fbb ("wayland: make local copy of the 1.22.0 recipe") Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'conf/machine/include/imx-base.inc') diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 5cc1c4762..990b965d5 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -527,8 +527,9 @@ PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ??= "1.31.imx" PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ??= "1.31.imx" PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.31.imx" -PREFERRED_VERSION_wayland:imx-nxp-bsp ??= "1.22.0.imx" -PREFERRED_VERSION_wayland-native:imx-nxp-bsp ??= "1.22.0.imx" +PREFERRED_VERSION_wayland-native ??= "1.22.0.imx" +PREFERRED_VERSION_nativesdk-wayland ??= "1.22.0.imx" +PREFERRED_VERSION_wayland:imx-nxp-bsp ??= "1.22.0.imx" PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx" # Use i.MX libdrm Version -- cgit v1.2.3-54-g00ecf