From 11ce6f30b73dd6d642b7ed7cd853d76fa65f3756 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 22 Sep 2016 12:13:49 +0200
Subject: [PATCH] qtbase: enable 'linuxfb' platform plugin

This plugin uses directly the framebuffer, so it can be used in non
X11-based systems, but it oly supports software rendered content,
no opengl/es.

https://jira.digi.com/browse/DEL-2607

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-dey/recipes-qt/qt5/qtbase/{ => ccimx6}/qt5.sh | 0
 meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh     | 2 ++
 meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend          | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)
 rename meta-digi-dey/recipes-qt/qt5/qtbase/{ => ccimx6}/qt5.sh (100%)
 create mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh

diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6/qt5.sh
similarity index 100%
rename from meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh
rename to meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6/qt5.sh
diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh
new file mode 100644
index 000000000..e64709644
--- /dev/null
+++ b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh
@@ -0,0 +1,2 @@
+# Use LINUXFB platform plugin for images without X11
+[ -f "/etc/init.d/xserver-nodm" ] || export QT_QPA_PLATFORM="linuxfb"
diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
index 71fb9422d..e24b6322b 100644
--- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
+++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
@@ -7,9 +7,11 @@ SRC_URI_append = " file://qt5.sh"
 PACKAGECONFIG_GL_mx6ul = "gles2"
 QT_CONFIG_FLAGS_append_mx6ul = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
 
-PACKAGECONFIG_append = " accessibility examples icu sql-sqlite"
+PACKAGECONFIG_append = " accessibility examples icu linuxfb sql-sqlite"
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/profile.d
 	install -m 0755 ${WORKDIR}/qt5.sh ${D}${sysconfdir}/profile.d/
 }
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"