From b1670756feef96f3b9f71e2f3a3db301b3fadf88 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 7 Apr 2021 12:33:58 +0300 Subject: [PATCH] qtquick3d/qt3d: fix assimp handling Use correct branch for assimp on QtQuick3D and Qt3D and include the assimp lisense file. Fix system-assimp PACKAGECONFIG, but don't enable it since the the default assimp available in oe-core is too old for QtQuick3D. Change-Id: Iee959777b8f192a6512b2568ba7f6fa94a120535 Reviewed-by: Mikko Gronoff (cherry picked from commit 4325285fb9ff8fe92c9cf4ef7392441f277c31a5) --- recipes-qt/qt6/qt3d_git.bb | 12 +++++++----- recipes-qt/qt6/qtquick3d_git.bb | 10 ++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index fc82d0b..832944b 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -1,8 +1,9 @@ -LICENSE = "LGPL-3.0 | GPL-2.0 | The-Qt-Company-Commercial" +LICENSE = "BSD-3-Clause & ( GFDL-1.3 & BSD & ( LGPL-3.0 | GPL-2.0 ) | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \ + file://src/3rdparty/assimp/src/LICENSE;md5=de63670479d9e7a0c4bbf593b7e1c1cd \ " inherit qt6-cmake @@ -13,15 +14,16 @@ REQUIRED_DISTRO_FEATURES = "opengl" include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc +ASSIMP_BRANCH = "qt6.1_assimp" + SRC_URI += " \ - ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=qt6.1_assimp;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \ + ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \ " DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native" -PACKAGECONFIG ??= "" -PACKAGECONFIG_class-target ?= "system-assimp" -PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_assimp=OFF,assimp" +PACKAGECONFIG ?= "system-assimp" +PACKAGECONFIG[system-assimp] = "-DFEATURE_qt3d_system_assimp=ON,-DQT_FEATURE_qt3d_system_assimp=OFF,assimp" PACKAGECONFIG[qtgamepad] = ",,qtgamepad" SRCREV_FORMAT = "qt3d_assimp" diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index 9cbe7d6..068322a 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -1,6 +1,7 @@ -LICENSE = "GFDL-1.3 & BSD & GPL-3.0 | The-Qt-Company-Commercial" +LICENSE = "BSD-3-Clause & ( GFDL-1.3 & BSD & GPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/3rdparty/assimp/src/LICENSE;md5=de63670479d9e7a0c4bbf593b7e1c1cd \ " inherit qt6-cmake @@ -8,8 +9,10 @@ inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc +ASSIMP_BRANCH = "qt6.1_assimp" + SRC_URI += " \ - ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=qt6.1_assimp;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \ + ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \ file://0001-CMake-allow-tools-build-without-opengl.patch \ " @@ -17,8 +20,7 @@ DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native qtquick3d-nat BBCLASSEXTEND =+ "native nativesdk" -PACKAGECONFIG ??= "" -PACKAGECONFIG[system-assimp] = "-DFEATURE_system-assimp=ON,-DFEATURE_system-assimp=OFF,assimp" +PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DFEATURE_system_assimp=OFF,assimp" FILES_${PN}-qmlplugins += " \ ${QT6_INSTALL_QMLDIR}/QtQuick3D/Helpers/meshes/*.mesh \