From a2f9d421786cef0fd0b377c81259dee9c78f4b4a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 15 Aug 2025 10:47:50 -0500 Subject: wayland-protocols: Upgrade 1.37.imx -> 1.41.imx Signed-off-by: Tom Hochstein --- conf/machine/include/imx-base.inc | 2 +- .../wayland/wayland-protocols_1.37.imx.bb | 31 ---------------------- .../wayland/wayland-protocols_1.41.imx.bb | 31 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 recipes-graphics/wayland/wayland-protocols_1.37.imx.bb create mode 100644 recipes-graphics/wayland/wayland-protocols_1.41.imx.bb diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 5966da36c..6d1671a77 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -582,7 +582,7 @@ PREFERRED_VERSION_weston:mx6-nxp-bsp ??= "10.0.5.imx" PREFERRED_VERSION_weston:mx7-nxp-bsp ??= "10.0.5.imx" PREFERRED_VERSION_weston:imx-mainline-bsp = "" -PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.37.imx" +PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.41.imx" PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "24.1.6.imx" diff --git a/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb deleted file mode 100644 index f360706be..000000000 --- a/recipes-graphics/wayland/wayland-protocols_1.37.imx.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Collection of additional Wayland protocols" -DESCRIPTION = "Wayland protocols that add functionality not \ -available in the Wayland core protocol. Such protocols either add \ -completely new functionality, or extend the functionality of some other \ -protocol either in Wayland core, or some other protocol in \ -wayland-protocols." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c7b12b6702da38ca028ace54aae3d484 \ - file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" - -SRC_URI = "${WAYLAND_PROTOCOLS_SRC};branch=${SRCBRANCH}" -WAYLAND_PROTOCOLS_SRC ?= "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https" -SRCBRANCH = "wayland-protocols-imx-${@oe.utils.trim_version("${PV}", 2)}" -SRCREV = "831a5389062e56dcb1aac4a5419e55e3002aafaf" - -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" - -BBCLASSEXTEND = "native nativesdk" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp|mx9-nxp-bsp)" diff --git a/recipes-graphics/wayland/wayland-protocols_1.41.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.41.imx.bb new file mode 100644 index 000000000..3350a4795 --- /dev/null +++ b/recipes-graphics/wayland/wayland-protocols_1.41.imx.bb @@ -0,0 +1,31 @@ +SUMMARY = "Collection of additional Wayland protocols" +DESCRIPTION = "Wayland protocols that add functionality not \ +available in the Wayland core protocol. Such protocols either add \ +completely new functionality, or extend the functionality of some other \ +protocol either in Wayland core, or some other protocol in \ +wayland-protocols." +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c7b12b6702da38ca028ace54aae3d484 \ + file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" + +SRC_URI = "${WAYLAND_PROTOCOLS_SRC};branch=${SRCBRANCH}" +WAYLAND_PROTOCOLS_SRC ?= "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https" +SRCBRANCH = "wayland-protocols-imx-1.41" +SRCREV = "7213a4e09837c77112bce2d241491600e00dd095" + +UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tags" +UPSTREAM_CHECK_REGEX = "releases/(?P.+)" + +DEPENDS += "wayland-native" + +# NOTE: For i.MX drop allarch since the recipe is SOCARCH +#inherit meson pkgconfig allarch +inherit meson pkgconfig + +EXTRA_OEMESON += "-Dtests=false" + +BBCLASSEXTEND = "native nativesdk" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp|mx9-nxp-bsp)" -- cgit v1.2.3-54-g00ecf