diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2022-05-02 16:22:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-02 16:22:13 -0400 |
| commit | 4219b89faab3b0e848de45dd6a84ef52ba90e0f2 (patch) | |
| tree | 9d84b04b1edb3f8de2c5a6b48f7f8654fa93bc28 /var | |
| parent | 253b2085373a0357e7ac03e637e8416ef39edc72 (diff) | |
| download | spack-4219b89faab3b0e848de45dd6a84ef52ba90e0f2.tar.gz spack-4219b89faab3b0e848de45dd6a84ef52ba90e0f2.tar.bz2 spack-4219b89faab3b0e848de45dd6a84ef52ba90e0f2.tar.xz spack-4219b89faab3b0e848de45dd6a84ef52ba90e0f2.zip | |
qt: Fix the assimp dependency specification (#30435)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/qt514-quick3d-assimp.patch | 13 |
2 files changed, 3 insertions, 21 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 8bc9e920af..ef660a97ae 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -133,8 +133,6 @@ 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', @@ -183,7 +181,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.14:+opengl') + depends_on("assimp@5.0.0:5", when='@5:+opengl') depends_on("harfbuzz", when='@5:') depends_on("double-conversion", when='@5.7:') @@ -585,11 +583,8 @@ class Qt(Package): '-no-nis', ]) - if '+opengl' in spec: - if version >= Version('5.14'): - use_spack_dep('assimp') - else: - config_args.append('-no-assimp') + if '@5.9: +opengl' in spec: + use_spack_dep('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 deleted file mode 100644 index 68f4e14c60..0000000000 --- a/var/spack/repos/builtin/packages/qt/qt514-quick3d-assimp.patch +++ /dev/null @@ -1,13 +0,0 @@ -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) - } |