hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "qt: Fix the assimp dependency specification (#30435)" (#30451)

Browse source 
This reverts commit 4219b89faa.
This commit is contained in:
Seth R. Johnson 2022-05-03 10:16:56 -04:00 committed by GitHub
parent 6ecee4e6d5
commit e301de98cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
var/spack/repos/builtin/packages/qt/package.py
View file

@ -133,6 +133,8 @@ class Qt(Package):
patch('qt5-15-gcc-10.patch', when='@5.12.7:5.15 %gcc@8:') patch('qt5-15-gcc-10.patch', when='@5.12.7:5.15 %gcc@8:')
patch('qt514.patch', when='@5.14') patch('qt514.patch', when='@5.14')
patch('qt514-isystem.patch', when='@5.14.2') 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 # https://bugreports.qt.io/browse/QTBUG-90395
patch('https://src.fedoraproject.org/rpms/qt5-qtbase/raw/6ae41be8260f0f5403367eb01f7cd8319779674a/f/qt5-qtbase-gcc11.patch', patch('https://src.fedoraproject.org/rpms/qt5-qtbase/raw/6ae41be8260f0f5403367eb01f7cd8319779674a/f/qt5-qtbase-gcc11.patch',
sha256='9378afd071ad5c0ec8f7aef48421e4b9fab02f24c856bee9c0951143941913c5', sha256='9378afd071ad5c0ec8f7aef48421e4b9fab02f24c856bee9c0951143941913c5',
@ -181,7 +183,7 @@ class Qt(Package):
depends_on("libpng", when='@4:') depends_on("libpng", when='@4:')
depends_on("dbus", when='@4:+dbus') depends_on("dbus", when='@4:+dbus')
depends_on("gl", when='@4:+opengl') 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("harfbuzz", when='@5:')
depends_on("double-conversion", when='@5.7:') depends_on("double-conversion", when='@5.7:')
@ -583,8 +585,11 @@ def use_spack_dep(spack_pkg, qt_name=None):
'-no-nis', '-no-nis',
]) ])
if '@5.9: +opengl' in spec: if '+opengl' in spec:
if version >= Version('5.14'):
use_spack_dep('assimp') use_spack_dep('assimp')
else:
config_args.append('-no-assimp')
# COMPONENTS # COMPONENTS

13
var/spack/repos/builtin/packages/qt/qt514-quick3d-assimp.patch Normal file
View file

@ -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)
}