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/qt3d_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/qt3d_git.bb')
| -rw-r--r-- | meta/recipes-qt/qt5/qt3d_git.bb | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/meta/recipes-qt/qt5/qt3d_git.bb b/meta/recipes-qt/qt5/qt3d_git.bb index dbd1b27916..5bf79f8e53 100644 --- a/meta/recipes-qt/qt5/qt3d_git.bb +++ b/meta/recipes-qt/qt5/qt3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "LGPL-3.0 | GPL-2.0 | The-Qt-Company-Commercial" +LICENSE = "LGPL-3.0 | GPL-2.0+" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ @@ -11,32 +11,24 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" DEPENDS_class-target += "qtdeclarative qt3d-native" -# Patches from https://github.com/meta-qt5/qt3d/commits/b5.10 -# 5.10.meta-qt5.2 +# Patches from https://github.com/meta-qt5/qt3d/commits/b5.6 +# 5.6.meta-qt5.1 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ - file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ " PACKAGECONFIG ??= "" PACKAGECONFIG_class-native ??= "tools-only" PACKAGECONFIG_class-nativesdk ??= "tools-only" -PACKAGECONFIG[tools-only] = "" -PACKAGECONFIG[system-assimp] = "-feature-system-assimp,-no-feature-system-assimp,assimp" -PACKAGECONFIG[qtgamepad] = ",,qtgamepad" +PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" -EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" +EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tools-only', 'CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib', '', d)}" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtgamepad', 'CONFIG+=OE_QTGAMEPAD_ENABLED', '', d)}" - -do_configure_prepend() { - # disable qtgamepad test if it isn't enabled by PACKAGECONFIG - sed -e 's/^\(qtHaveModule(gamepad)\)/OE_QTGAMEPAD_ENABLED:\1/' -i \ - ${S}/src/input/frontend/frontend.pri \ - ${S}/src/quick3d/imports/input/importsinput.pro -} +FILES_${PN}-qmlplugins += " \ + ${OE_QMAKE_PATH_QML}/*/*/*.bez \ + ${OE_QMAKE_PATH_QML}/*/*/*.obj \ +" -SRCREV = "31f424bb81cd2583920d3d521e1e01f01c2d28e2" +SRCREV = "fc781fa42287a4f5db62a346ad6eb8bcbb9f49c0" BBCLASSEXTEND += "native nativesdk" |