From 3e0d3bd18dd864e3e875223d565bc5072b5f6c7c Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 9 Jan 2023 16:19:20 +0100 Subject: [PATCH] qtwayland: update to support ccimx93 Native X11 is not supported for ccimx93 (dropped by NXP), so remove xcomposite-egl and xcomposite-glx packageconfig options. Signed-off-by: Javier Viguera --- ...ion-Do-not-include-shm-emulation-ser.patch | 43 ------------------- .../recipes-qt/qt5/qtwayland_%.bbappend | 7 +-- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland/0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland/0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland/0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch deleted file mode 100644 index 66eb765df..000000000 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland/0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 39847456fd69ede802d88af5106f608d49038ab1 Mon Sep 17 00:00:00 2001 -From: Neena Busireddy -Date: Thu, 9 Aug 2018 19:01:45 +0000 -Subject: [PATCH] hardwareintegration: Do not include shm-emulation-server - -shm-emulation-server is failing on sololite because of its dependency on -opengl - -qtwayland/5.10.1+gitAUTOINC+db36bc0d9c-r0/git/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp:81:10: - error: 'QOpenGLContext' has not been declared - if (!QOpenGLContext::currentContext()) - ^~~~~~~~~~~~~~ -Signed-off-by: Neena Busireddy ---- - src/plugins/hardwareintegration/client/client.pro | 2 +- - src/plugins/hardwareintegration/compositor/compositor.pro | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro -index f1c71f0..b90610d 100644 ---- a/src/plugins/hardwareintegration/client/client.pro -+++ b/src/plugins/hardwareintegration/client/client.pro -@@ -15,4 +15,4 @@ qtConfig(libhybris-egl-server): \ - SUBDIRS += libhybris-egl-server - - ### TODO: make shm-emulation configurable --SUBDIRS += shm-emulation-server -+#SUBDIRS += shm-emulation-server -diff --git a/src/plugins/hardwareintegration/compositor/compositor.pro b/src/plugins/hardwareintegration/compositor/compositor.pro -index 22301d0..45b7e0e 100644 ---- a/src/plugins/hardwareintegration/compositor/compositor.pro -+++ b/src/plugins/hardwareintegration/compositor/compositor.pro -@@ -15,6 +15,6 @@ qtConfig(libhybris-egl-server): \ - SUBDIRS += libhybris-egl-server - - ### TODO: make shm-emulation configurable --SUBDIRS += shm-emulation-server -+#SUBDIRS += shm-emulation-server - - SUBDIRS += hardwarelayer --- -1.9.1 - diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland_%.bbappend index e123a14b8..65d1f88c3 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland_%.bbappend @@ -1,10 +1,5 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI:append:mx6sl-nxp-bsp = " file://0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch" - PACKAGECONFIG:remove:mx6sl-nxp-bsp = "wayland-egl" - -PACKAGECONFIG:remove:mx8mm-nxp-bsp = "wayland-vulkan-server-buffer" +PACKAGECONFIG:remove:mx9-nxp-bsp = "xcomposite-egl xcomposite-glx" do_install:append() { if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then