zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use gl and glx version ranges instead of exact versions

Browse Source
This commit is contained in:
Chuck Atkins 2019-02-06 14:24:42 -05:00 committed by Omar Padron
parent 437e435bfc
commit 4a81331c6e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/mesa/package.py
View File

@ -37,8 +37,6 @@ class Mesa(MesonPackage):
variant('swr', values=any_combination_of('avx', 'avx2', 'knl', 'skx'), variant('swr', values=any_combination_of('avx', 'avx2', 'knl', 'skx'),
description="Enable the SWR driver.") description="Enable the SWR driver.")
# conflicts('~llvm', when='~swr=none') # conflicts('~llvm', when='~swr=none')
variant('a', default=True)
variant('b', default=False)
# Front ends # Front ends
variant('osmesa', default=True, description="Enable the OSMesa frontend.") variant('osmesa', default=True, description="Enable the OSMesa frontend.")
@ -57,8 +55,8 @@ class Mesa(MesonPackage):
variant('opengles', default=False, description="Enable OpenGL ES support.") variant('opengles', default=False, description="Enable OpenGL ES support.")
# Provides # Provides
provides('gl@4.5', when='+opengl') provides('gl@:4.5', when='+opengl')
provides('glx@1.4', when='+glx') provides('glx@:1.4', when='+glx')
provides('egl', when='+egl') provides('egl', when='+egl')
# Variant dependencies # Variant dependencies

4
var/spack/repos/builtin/packages/paraview/package.py
View File

@ -47,8 +47,8 @@ class Paraview(CMakePackage):
depends_on('qt@:4', when='@:5.2.0+qt') depends_on('qt@:4', when='@:5.2.0+qt')
depends_on('mesa+osmesa', when='+osmesa') depends_on('mesa+osmesa', when='+osmesa')
depends_on('gl@3.2', when='+opengl2') depends_on('gl@3.2:', when='+opengl2')
depends_on('gl@1.2', when='~opengl2') depends_on('gl@1.2:', when='~opengl2')
depends_on('libxt', when='+qt') depends_on('libxt', when='+qt')
conflicts('+qt', when='+osmesa') conflicts('+qt', when='+osmesa')