diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2023-06-28 20:57:52 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2023-06-28 20:57:52 -0300 |
commit | 6e788ed578be2a9f38c150cb2e65e0dd323a82ef (patch) | |
tree | 129f572fea755950e40a1a5ab7cf2379292852ce /conf/machine/include | |
parent | 3020a028398859634adc1dfcc648c823be751dbd (diff) | |
download | meta-freescale-6e788ed578be2a9f38c150cb2e65e0dd323a82ef.tar.gz |
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 <otavio@ossystems.com.br>
Diffstat (limited to 'conf/machine/include')
-rw-r--r-- | conf/machine/include/imx-base.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 5cc1c476..990b965d 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" | |||
527 | PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ??= "1.31.imx" | 527 | PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ??= "1.31.imx" |
528 | PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.31.imx" | 528 | PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.31.imx" |
529 | 529 | ||
530 | PREFERRED_VERSION_wayland:imx-nxp-bsp ??= "1.22.0.imx" | 530 | PREFERRED_VERSION_wayland-native ??= "1.22.0.imx" |
531 | PREFERRED_VERSION_wayland-native:imx-nxp-bsp ??= "1.22.0.imx" | 531 | PREFERRED_VERSION_nativesdk-wayland ??= "1.22.0.imx" |
532 | PREFERRED_VERSION_wayland:imx-nxp-bsp ??= "1.22.0.imx" | ||
532 | PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx" | 533 | PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx" |
533 | 534 | ||
534 | # Use i.MX libdrm Version | 535 | # Use i.MX libdrm Version |