diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-27 13:37:25 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-03-24 11:13:28 +0100 |
| commit | 40f1b73c92731f4e18751d3a499f269c65c21a96 (patch) | |
| tree | 734faeca0e9ccade77c66f04320bf50071ecbf6b /meta/recipes-qt/qt5/qtimageformats_git.bb | |
| parent | e45f3d305e25ff2aef9e42697e583e6f69a9b6e6 (diff) | |
| download | openembedded-core-contrib-40f1b73c92731f4e18751d3a499f269c65c21a96.tar.gz | |
qt5: downgrade to 5.6jansa/pseudo
* webosose isn't compatible with newer Qt
export COMP=qml-webos-framework; for i in `seq -w 1 999`; do echo $i; bitbake -v -v -DDDD -f -c compile ${COMP} 2>${COMP}-logerr.$i >${COMP}-log.$i; bitbake -v -v -DDDD -f -c package_qa ${COMP} 2>${COMP}-logerr.qa.$i >${COMP}-log.qa.$i || { cp -ra tmp-glibc/work/qemux86-oe-linux/${COMP}/ ${COMP}-workdir-$i; bitbake -c cleansstate ${COMP} ; } done
in local.conf I have only this to reproduce the failures:
PRSERV_HOST = "localhost:0"
BB_NUMBER_THREADS = "8"
PARALLEL_MAKE = "-j 32"
DISTRO_FEATURES_append = " wayland opengl"
ERROR_QA_append = " host-user-contaminated"
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-qt/qt5/qtimageformats_git.bb')
| -rw-r--r-- | meta/recipes-qt/qt5/qtimageformats_git.bb | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/meta/recipes-qt/qt5/qtimageformats_git.bb b/meta/recipes-qt/qt5/qtimageformats_git.bb index d804b0194d..2ade382436 100644 --- a/meta/recipes-qt/qt5/qtimageformats_git.bb +++ b/meta/recipes-qt/qt5/qtimageformats_git.bb @@ -1,29 +1,33 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ + file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ " DEPENDS += "qtbase" +ALLOW_EMPTY_${PN} = "1" + +# Patches from https://github.com/meta-qt5/qtimageformats/commits/b5.6 +# 5.6.meta-qt5.1 +SRC_URI += "file://0001-qtimageformats.pro-Make-the-dependencies-determinist.patch" PACKAGECONFIG ?= "libtiff" # Currently we don't have recipe for libmng, but lock it anyway so qtimageformats stay deterministic even when libmng is introduced -PACKAGECONFIG[jasper] = ",CONFIG+=done_config_jasper,jasper" -PACKAGECONFIG[libmng] = ",CONFIG+=done_config_libmng,libmng" -PACKAGECONFIG[libtiff] = ",CONFIG+=done_config_libtiff,tiff" -PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" +PACKAGECONFIG[jasper] = ",,jasper" +PACKAGECONFIG[libmng] = ",,libmng" +PACKAGECONFIG[libtiff] = ",,tiff" +PACKAGECONFIG[libwebp] = ",,libwebp" -EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libmng', 'CONFIG+=OE_LIBMNG_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_JASPER_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" -SRCREV = "892d4a0df7dccc6e70586835bb1211cf1b79bc69" +SRCREV = "a7a998ee6e328babaa0edfee0d156fb28cf1b385" |