summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorWouter Deconinck <wdconinc@gmail.com>2022-01-03 13:56:11 -0600
committerGitHub <noreply@github.com>2022-01-03 12:56:11 -0700
commitae2509339d6b9d67b6f970bf758f9c41fd3a136f (patch)
treec1b0f28fb8212fc5ad2f2c64e1441649d084f9fd /var
parent7a8862e3166dc2c1a38491e9f0e3dcb3622bc325 (diff)
downloadspack-ae2509339d6b9d67b6f970bf758f9c41fd3a136f.tar.gz
spack-ae2509339d6b9d67b6f970bf758f9c41fd3a136f.tar.bz2
spack-ae2509339d6b9d67b6f970bf758f9c41fd3a136f.tar.xz
spack-ae2509339d6b9d67b6f970bf758f9c41fd3a136f.zip
qt: depends_on assimp@5.0 when @5.14: +opengl (#28191)
* qt: depends_on assimp@5.0 when @5.14: +opengl * [qt] patch for assimp@5.14:5 * [qt] depends_on assimp@5.0.0:5.0 * [qt] remove depends_on gmake again
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py9
-rw-r--r--var/spack/repos/builtin/packages/qt/qt514-quick3d-assimp.patch13
2 files changed, 22 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 8469b493ce..e79a72c842 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -131,6 +131,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',
@@ -173,6 +175,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.0", when='@5.14:+opengl')
depends_on("harfbuzz", when='@5:')
depends_on("double-conversion", when='@5.7:')
@@ -553,6 +556,12 @@ class Qt(Package):
'-no-nis',
])
+ if '+opengl' in spec:
+ if version >= Version('5.14'):
+ use_spack_dep('assimp')
+ else:
+ config_args.append('-no-assimp')
+
# COMPONENTS
if '~examples' in spec:
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)
+ }