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

morty migration: update QT5 recipes 

As of Yocto 2.2, the shipped QT5 version is 5.7.1 which does not include
'qtbase-fonts' anymore, so remove that package and enable 'fontconfig'
package configuration so the system fontconfig support is used.

Also remove PACKAGECONFIG_GL overrides for CC6UL as they have been added
to upstream 'meta-freescale'.

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2017-02-28 19:12:01 +01:00
parent 9658d54d00
commit ca1ba7b784
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2013 Digi International. # Copyright (C) 2013-2017, Digi International Inc.
# #
SUMMARY = "QT packagegroup for DEY image" SUMMARY = "QT packagegroup for DEY image"
@ -9,7 +9,7 @@ inherit packagegroup
MACHINE_QT5_EXTRA_INSTALL ?= "" MACHINE_QT5_EXTRA_INSTALL ?= ""
MACHINE_QT5_EXTRA_INSTALL_ccimx6 ?= "qtwebengine-examples" MACHINE_QT5_EXTRA_INSTALL_ccimx6 ?= "qtwebengine-examples"
QT5_PKS = "qtbase-fonts qtserialport" QT5_PKS = "qtserialport"
QT5_PKS_append_ccimx6 = " qtdeclarative-tools" QT5_PKS_append_ccimx6 = " qtdeclarative-tools"
QT5_EXAMPLES = "qtbase-examples" QT5_EXAMPLES = "qtbase-examples"

7
meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
View File

@ -1,13 +1,10 @@
# Copyright (C) 2015 Digi International # Copyright (C) 2015-2017, Digi International Inc.
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI_append = " file://qt5.sh" SRC_URI_append = " file://qt5.sh"
PACKAGECONFIG_GL_mx6ul = "gles2" PACKAGECONFIG_append = " accessibility examples fontconfig sql-sqlite"
QT_CONFIG_FLAGS_append_mx6ul = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
PACKAGECONFIG_append = " accessibility examples sql-sqlite"
PACKAGECONFIG_append_ccimx6 = " icu" PACKAGECONFIG_append_ccimx6 = " icu"
PACKAGECONFIG_append_ccimx6ul = " linuxfb" PACKAGECONFIG_append_ccimx6ul = " linuxfb"