From b412b6013f2a1320b502f1694dbd83c243e51ac2 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 21 Jan 2021 14:03:57 +0200 Subject: [PATCH] qtquick3d, qt3d: update recipes for new assimp SRC_URI Assimp submodule has been moved from github to code.qt.io mirror. Change-Id: I23cb8a24c01e0cd1b805e41bae329351707c374b Reviewed-by: Samuli Piippo --- recipes-qt/qt6/qt3d_git.bb | 2 +- recipes-qt/qt6/qtquick3d_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index 13b1536..d9619fc 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -14,7 +14,7 @@ include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc SRC_URI += " \ - git://github.com/assimp/assimp.git;name=assimp;branch=assimp_5.0_release;protocol=https;destsuffix=git/src/3rdparty/assimp/src \ + ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=upstream/assimp_5.0_release;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \ " DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native" diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index 840e73d..eb4ce3b 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -9,7 +9,7 @@ include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc SRC_URI += " \ - git://github.com/assimp/assimp.git;name=assimp;branch=master;protocol=https;destsuffix=git/src/3rdparty/assimp/src \ + ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=upstream/master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \ file://0001-CMake-allow-tools-build-without-opengl.patch \ "