wayland-protocols: Upgrade 1.22.imx -> 1.25.imx

This is a pre-release version from upcoming NXP Q2 release added to
kirkstone to fix mesa compatibility problems. The commit does also
update the recipe to align with the one in OE-core.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

2 files changed, 12 insertions, 6 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 46726f53..dc997443 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -420,9 +420,9 @@ PREFERRED_PROVIDER_opencl-icd-loader:imxgpu  ?= "imx-gpu-viv"
 PREFERRED_VERSION_weston:imx-nxp-bsp     ?= "9.0.0.imx"
 PREFERRED_VERSION_weston:imx-mainline-bsp = ""
 
-PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ?= "1.22.imx"
-PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ?= "1.22.imx"
-PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ?= "1.22.imx"
+PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ?= "1.25.imx"
+PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ?= "1.25.imx"
+PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ?= "1.25.imx"
 
 # Use i.MX libdrm Version
 PREFERRED_VERSION_libdrm:mx6-nxp-bsp ?= "2.4.109.imx"
diff --git a/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb
index 8cc2f137..be6cbdb0 100644
--- a/recipes-graphics/wayland/wayland-protocols_1.22.imx.bb
+++ b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb
@@ -9,11 +9,17 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
                     file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53"
 
-SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.22"
-SRCREV = "0f71ffe59cf4c3f050ff79ea18f96345fcf0061e"
+SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.25"
+SRCREV = "a104fb66d1b899dc04077422c2204638675ee4a6"
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig
+UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
+
+# NOTE: For i.MX drop allarch since the recipe is SOCARCH
+#inherit meson pkgconfig allarch
+inherit meson pkgconfig
+
+EXTRA_OEMESON += "-Dtests=false"
 
 PACKAGES = "${PN}"
 FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc"