From 4a477410fe8b246f3634119c2e26e436608a126d Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Fri, 10 Aug 2018 17:48:35 +0200
Subject: [PATCH] recipes-qt: merge NXP's .bbappend files with ours

This merges our Qt5 recipes with the ones in meta-fsl-bsp-release.

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

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../qt5/nativesdk-qtbase_%.bbappend           |  5 +++
 .../recipes-qt/qt5/qtbase/ccimx8x/qt5.sh      |  4 +--
 .../recipes-qt/qt5/qtbase_%.bbappend          | 34 +++++++++++++++----
 .../recipes-qt/qt5/qtmultimedia_%.bbappend    |  8 ++++-
 .../recipes-qt/qt5/qtwebengine_%.bbappend     | 10 +++++-
 5 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/meta-digi-dey/recipes-qt/qt5/nativesdk-qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
index d114142b3..8fcfd62b4 100644
--- a/meta-digi-dey/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
+++ b/meta-digi-dey/recipes-qt/qt5/nativesdk-qtbase_%.bbappend
@@ -3,3 +3,8 @@
 do_install_append_class-nativesdk() {
    mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
 }
+
+do_generate_qt_environment_file[noexec] = "1"
+do_install_append () {
+    do_generate_qt_environment_file
+}
diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh
index 6ffe8f271..6779c9d12 100644
--- a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh
+++ b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh
@@ -1,2 +1,2 @@
-# Use EGLFS platform plugin for images without X11
-[ -f "/etc/init.d/xserver-nodm" ] || export QT_QPA_PLATFORM="eglfs"
+#!/bin/sh
+export QT_QPA_PLATFORM=wayland
diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
index 81987bfeb..8b78e6616 100644
--- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
+++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
@@ -1,18 +1,40 @@
-# Copyright (C) 2015-2017, Digi International Inc.
+# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
+# Copyright (C) 2016 O.S. Systems Software LTDA.
+# Copyright (C) 2016 Freescale Semiconductor
+# Copyright 2017-2018 NXP
+# Copyright (C) 2015-2018, Digi International Inc.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI_append = " file://qt5.sh"
 
+PACKAGECONFIG_GL_imxpxp   = "gles2"
+PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', '', d)}"
+PACKAGECONFIG_GL_imxgpu3d = "gles2"
 PACKAGECONFIG_append = " accessibility examples fontconfig sql-sqlite"
 PACKAGECONFIG_append_ccimx6 = " icu"
 PACKAGECONFIG_append_ccimx6ul = " linuxfb"
 
-QT_CONFIG_FLAGS += " -optimize-size"
+# -eglfs is conditioned on GPU3D with FrameBuffer only
+# -no-opengl -linuxfb are conditioned on GPU2D only
+# Overwrite the original setting which is in meta-freescale layer
+QT_CONFIG_FLAGS_APPEND_imxpxp = "-no-eglfs"
+QT_CONFIG_FLAGS_APPEND_imxgpu2d = "-no-eglfs -no-opengl -linuxfb"
+QT_CONFIG_FLAGS_APPEND_imxgpu3d = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-no-eglfs', \
+        bb.utils.contains('DISTRO_FEATURES', 'wayland', '-no-eglfs', \
+            '-eglfs', d), d)}"
+QT_CONFIG_FLAGS_append = " ${QT_CONFIG_FLAGS_APPEND} -optimize-size"
+
+PACKAGECONFIG_WAYLAND ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xkbcommon-evdev', '', d)}"
+PACKAGECONFIG += "${PACKAGECONFIG_WAYLAND}"
 
 do_install_append() {
-	install -d ${D}${sysconfdir}/profile.d
-	install -m 0755 ${WORKDIR}/qt5.sh ${D}${sysconfdir}/profile.d/
+	if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then
+		sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc
+	fi
+	install -d ${D}${sysconfdir}/profile.d/
+	install -m 0755 ${WORKDIR}/qt5.sh ${D}${sysconfdir}/profile.d/qt5.sh
 }
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+FILES_${PN} += "${sysconfdir}/profile.d/qt5.sh"
diff --git a/meta-digi-dey/recipes-qt/qt5/qtmultimedia_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtmultimedia_%.bbappend
index 9c2a7034e..738b22a5d 100644
--- a/meta-digi-dey/recipes-qt/qt5/qtmultimedia_%.bbappend
+++ b/meta-digi-dey/recipes-qt/qt5/qtmultimedia_%.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2015 Digi International
+# Copyright (C) 2015-2018 Digi International
 
 PACKAGECONFIG_append = " gstreamer"
 
@@ -8,4 +8,10 @@ pkg_postinst_${PN}_ccimx6() {
 	echo 'export QT_GSTREAMER_CAMERABIN_VIDEOSRC="imxv4l2src"' >> $D${sysconfdir}/profile.d/qt5.sh
 }
 
+do_install_append() {
+	if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then
+		sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc
+	fi
+}
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-digi-dey/recipes-qt/qt5/qtwebengine_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtwebengine_%.bbappend
index 44fc66554..531b2a9c9 100644
--- a/meta-digi-dey/recipes-qt/qt5/qtwebengine_%.bbappend
+++ b/meta-digi-dey/recipes-qt/qt5/qtwebengine_%.bbappend
@@ -1,4 +1,12 @@
-# Copyright (C) 2015 Digi International
+# Copyright (C) 2015-2018 Digi International
+
+do_install_append() {
+	if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then
+		sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc
+	fi
+}
+
+COMPATIBLE_MACHINE_aarch64 = "(.*)"
 
 # Decrease memory used by the linker to avoid being killed due to
 # out of memory.