From cbc85581a682d4a864bd2711b760f933a6516fa0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 10 Apr 2023 11:29:28 -0700 Subject: wayland-protocols: Upgrade to 1.31 on imx fork Fixes https://github.com/Freescale/meta-freescale/issues/1490 Signed-off-by: Khem Raj --- conf/machine/include/imx-base.inc | 8 +++---- .../wayland/wayland-protocols_1.25.imx.bb | 28 ---------------------- .../wayland/wayland-protocols_1.31.imx.bb | 28 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 recipes-graphics/wayland/wayland-protocols_1.25.imx.bb create mode 100644 recipes-graphics/wayland/wayland-protocols_1.31.imx.bb diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 10c3601a..b8190abf 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -517,10 +517,10 @@ PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" PREFERRED_VERSION_weston:imx-nxp-bsp ??= "10.0.1.imx" PREFERRED_VERSION_weston:imx-mainline-bsp = "" -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" -PREFERRED_VERSION_wayland-protocols:mx9-nxp-bsp ??= "1.25.imx" +PREFERRED_VERSION_wayland-protocols:mx6-nxp-bsp ??= "1.31.imx" +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" # Use i.MX libdrm Version PREFERRED_VERSION_libdrm:mx6-nxp-bsp ??= "2.4.109.imx" diff --git a/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb deleted file mode 100644 index b31267c1..00000000 --- a/recipes-graphics/wayland/wayland-protocols_1.25.imx.bb +++ /dev/null @@ -1,28 +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://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ - file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" - -SRC_URI = "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.25" -SRCREV = "a104fb66d1b899dc04077422c2204638675ee4a6" -S = "${WORKDIR}/git" - -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" - -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.31.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.31.imx.bb new file mode 100644 index 00000000..294ff920 --- /dev/null +++ b/recipes-graphics/wayland/wayland-protocols_1.31.imx.bb @@ -0,0 +1,28 @@ +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 = "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.31" +SRCREV = "99a2a439fc6b5d25d41bfec9c9b459408a45bf92" +S = "${WORKDIR}/git" + +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" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp|mx9-nxp-bsp)" -- cgit v1.2.3-54-g00ecf