CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qtquick3d/qt3d: fix assimp handling

Browse Source 
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 <mikko.gronoff@qt.io>
(cherry picked from commit 4325285fb9)
This commit is contained in:
Samuli Piippo 2021-04-07 12:33:58 +03:00
parent e7b13a20c6
commit b1670756fe
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
recipes-qt/qt6/qt3d_git.bb
View File

@ -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"

10
recipes-qt/qt6/qtquick3d_git.bb
View File

@ -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 \