Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2023-01-09 16:19:20 +01:00
parent f13ccfac75
commit 3e0d3bd18d
2 changed files with 1 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland/0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch
View File

@ -1,43 +0,0 @@
From 39847456fd69ede802d88af5106f608d49038ab1 Mon Sep 17 00:00:00 2001
From: Neena Busireddy <neenareddy.busireddy@nxp.com>
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 <neenareddy.busireddy@nxp.com>
---
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

7
meta-digi-dey/dynamic-layers/freescale-layer/recipes-qt/qt5/qtwayland_%.bbappend
View File

@ -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