summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt5/qt3d_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt/qt5/qt3d_git.bb')
-rw-r--r--meta/recipes-qt/qt5/qt3d_git.bb28
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"