From e301de98cb5adbb07a67df4cb7d771b2c3da8d3c Mon Sep 17 00:00:00 2001 From: "Seth R. Johnson" Date: Tue, 3 May 2022 10:16:56 -0400 Subject: Revert "qt: Fix the assimp dependency specification (#30435)" (#30451) This reverts commit 4219b89faab3b0e848de45dd6a84ef52ba90e0f2. --- var/spack/repos/builtin/packages/qt/package.py | 11 ++++++++--- .../repos/builtin/packages/qt/qt514-quick3d-assimp.patch | 13 +++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 var/spack/repos/builtin/packages/qt/qt514-quick3d-assimp.patch diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index ef660a97ae..8bc9e920af 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -133,6 +133,8 @@ class Qt(Package): patch('qt5-15-gcc-10.patch', when='@5.12.7:5.15 %gcc@8:') patch('qt514.patch', when='@5.14') patch('qt514-isystem.patch', when='@5.14.2') + # https://bugreports.qt.io/browse/QTBUG-84037 + patch('qt514-quick3d-assimp.patch', when='@5.14:5') # https://bugreports.qt.io/browse/QTBUG-90395 patch('https://src.fedoraproject.org/rpms/qt5-qtbase/raw/6ae41be8260f0f5403367eb01f7cd8319779674a/f/qt5-qtbase-gcc11.patch', sha256='9378afd071ad5c0ec8f7aef48421e4b9fab02f24c856bee9c0951143941913c5', @@ -181,7 +183,7 @@ class Qt(Package): depends_on("libpng", when='@4:') depends_on("dbus", when='@4:+dbus') depends_on("gl", when='@4:+opengl') - depends_on("assimp@5.0.0:5", when='@5:+opengl') + depends_on("assimp@5.0.0:5", when='@5.14:+opengl') depends_on("harfbuzz", when='@5:') depends_on("double-conversion", when='@5.7:') @@ -583,8 +585,11 @@ class Qt(Package): '-no-nis', ]) - if '@5.9: +opengl' in spec: - use_spack_dep('assimp') + if '+opengl' in spec: + if version >= Version('5.14'): + use_spack_dep('assimp') + else: + config_args.append('-no-assimp') # COMPONENTS diff --git a/var/spack/repos/builtin/packages/qt/qt514-quick3d-assimp.patch b/var/spack/repos/builtin/packages/qt/qt514-quick3d-assimp.patch new file mode 100644 index 0000000000..68f4e14c60 --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/qt514-quick3d-assimp.patch @@ -0,0 +1,13 @@ +diff --git a/qtquick3d/src/plugins/assetimporters/assimp/assimp.pro b/qtquick3d/src/plugins/assetimporters/assimp/assimp.pro +index ca5c499e..174a075b 100644 +--- a/qtquick3d/src/plugins/assetimporters/assimp/assimp.pro ++++ b/qtquick3d/src/plugins/assetimporters/assimp/assimp.pro +@@ -10,7 +10,7 @@ QT_FOR_CONFIG += assetimporters-private + include($$OUT_PWD/../qtassetimporters-config.pri) + + qtConfig(system-assimp):!if(cross_compile:host_build) { +- QMAKE_USE_PRIVATE += assimp ++ QMAKE_USE_PRIVATE += quick3d-assimp + } else { + include(../../../3rdparty/assimp/assimp.pri) + } -- cgit v1.2.3-70-g09d2