From 1ae68ffa59554629cbf80f31a95d06535c6954e6 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 8 May 2025 14:47:57 +0200
Subject: [PATCH] meta-digi-dey: update wayland for release
 rel_imx_6.6.52_2.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove wayland_1.22.0.bbappend, with changes originally added for Crank
  UI (commit 25c699e05b4b), which we no longer support.
* Update wayland_%.bbappend to align with NXP’s rel_imx_6.6.52_2.2.0
  release.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../recipes-graphics/wayland/wayland_%.bbappend     | 12 +++++++++---
 .../wayland/wayland_1.22.0.bbappend                 | 13 -------------
 2 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland_1.22.0.bbappend

diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland_%.bbappend
index e032e878e..e7f32d698 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland_%.bbappend
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland_%.bbappend
@@ -1,6 +1,9 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:imxgpu:arm = " \
+# Add patches specific to i.MX 6 and 7 with GPU and set package arch accordingly
+SRC_URI += "${SRC_URI_IMXGPU_PATCHES}"
+SRC_URI_IMXGPU_PATCHES                    = ""
+SRC_URI_IMXGPU_PATCHES:imxgpu:mx6-nxp-bsp = " \
     file://0101-Revert-client-Do-not-warn-about-attached-proxies-on-.patch \
     file://0102-Revert-client-Abort-when-trying-to-add-an-event-to-a.patch \
     file://0103-Revert-client-Warn-when-a-queue-is-destroyed-with-at.patch \
@@ -9,5 +12,8 @@ SRC_URI:append:imxgpu:arm = " \
     file://0202-Set-the-default-max-buffer-size-to-unbounded.patch \
     file://0203-Log-the-object-and-methods-when-marshalling-or-sendi.patch \
     file://0204-Fix-buffer-resize-crash.patch \
-    file://0205-connection-avoid-calling-memcpy-on-NULL-0.patch \
-"
+    file://0205-connection-avoid-calling-memcpy-on-NULL-0.patch"
+SRC_URI_IMXGPU_PATCHES:imxgpu:mx7-nxp-bsp = " \
+    ${SRC_URI_IMXGPU_PATCHES:imxgpu:mx6-nxp-bsp}"
+PACKAGE_ARCH:imxgpu:mx6-nxp-bsp = "${MACHINE_SOCARCH}"
+PACKAGE_ARCH:imxgpu:mx7-nxp-bsp = "${MACHINE_SOCARCH}"
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland_1.22.0.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland_1.22.0.bbappend
deleted file mode 100644
index 0e40d655e..000000000
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/wayland_1.22.0.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2020-2024, Digi International Inc.
-
-FILES_SOLIBSDEV = " \
-    ${base_libdir}/lib*${SOLIBSDEV} \
-    ${libdir}/libwayland-client.so \
-    ${libdir}/libwayland-cursor.so \
-    ${libdir}/libwayland-server.so \
-"
-FILES:${PN} += "${libdir}/libwayland-egl.so"
-
-RPROVIDES:${PN} = "libwayland-egl.so()(64bit)"
-
-INSANE_SKIP:${PN} += "dev-so"