summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Atkins <chuck.atkins@kitware.com>2019-05-01 18:57:33 -0400
committerOmar Padron <omar.padron@kitware.com>2019-05-01 17:57:33 -0500
commit9f848205e431c929a54ecf221768591906a0ef67 (patch)
tree1369fdc9ab53d76b8be039fd94fbc0e641e91fc5
parenta698ac9711580743af1edc5e30117ed0b3858c99 (diff)
downloadspack-9f848205e431c929a54ecf221768591906a0ef67.tar.gz
spack-9f848205e431c929a54ecf221768591906a0ef67.tar.bz2
spack-9f848205e431c929a54ecf221768591906a0ef67.tar.xz
spack-9f848205e431c929a54ecf221768591906a0ef67.zip
mesa: re-written to new meson build system (#10482)
* mesa: re-writen to new meson build system * xorg-server: Remove unneeded mesa dependency * glx: provide the virtual GLX package * Convert most "mesa" dependencies to use virtual gl and glx dependencies * mesa: Switch to always building from the git repo instead of a tarball * Use gl and glx version ranges instead of exact versions * glx: provide a default package * add auto to swr variant * Revert "add auto to swr variant" This reverts commit 2e7cd8a8aca07767c00657d0d09985ddd6306883. * update mesa package to version 19.0 * set +glx by default only when running on linux * fix style issues in geant4 package * remove virtual package "egl"
-rw-r--r--etc/spack/defaults/packages.yaml3
-rw-r--r--var/spack/repos/builtin/packages/catalyst/package.py7
-rw-r--r--var/spack/repos/builtin/packages/dislin/package.py3
-rw-r--r--var/spack/repos/builtin/packages/fsl/package.py2
-rw-r--r--var/spack/repos/builtin/packages/geant4/package.py9
-rw-r--r--var/spack/repos/builtin/packages/gplates/package.py2
-rw-r--r--var/spack/repos/builtin/packages/libepoxy/package.py2
-rw-r--r--var/spack/repos/builtin/packages/mesa-glu/package.py4
-rw-r--r--var/spack/repos/builtin/packages/mesa/package.py297
-rw-r--r--var/spack/repos/builtin/packages/mrtrix3/package.py2
-rw-r--r--var/spack/repos/builtin/packages/opengl/package.py5
-rw-r--r--var/spack/repos/builtin/packages/paraview/package.py4
-rw-r--r--var/spack/repos/builtin/packages/r-rgl/package.py10
-rw-r--r--var/spack/repos/builtin/packages/virtualgl/package.py6
-rw-r--r--var/spack/repos/builtin/packages/vtk/package.py9
-rw-r--r--var/spack/repos/builtin/packages/xorg-server/package.py1
16 files changed, 164 insertions, 202 deletions
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml
index 8475abb8a5..d3fcbc6b31 100644
--- a/etc/spack/defaults/packages.yaml
+++ b/etc/spack/defaults/packages.yaml
@@ -23,7 +23,8 @@ packages:
daal: [intel-daal]
elf: [elfutils]
fftw-api: [fftw]
- gl: [mesa, opengl]
+ gl: [mesa+opengl, opengl]
+ glx: [mesa+glx, opengl]
glu: [mesa-glu, openglu]
golang: [gcc]
ipp: [intel-ipp]
diff --git a/var/spack/repos/builtin/packages/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py
index c92ffc9080..ff1ff28eee 100644
--- a/var/spack/repos/builtin/packages/catalyst/package.py
+++ b/var/spack/repos/builtin/packages/catalyst/package.py
@@ -35,14 +35,15 @@ class Catalyst(CMakePackage):
variant('extras', default=False, description='Enable Extras support')
variant('rendering', default=False, description='Enable VTK Rendering support')
variant('osmesa', default=True, description='Use offscreen rendering')
+ conflicts('+osmesa', when='~rendering')
depends_on('git', type='build')
depends_on('mpi')
depends_on('python@2:2.8', when='+python', type=("build", "link", "run"))
depends_on('python', when='~python', type=("build"))
- depends_on('mesa', when='+rendering')
- depends_on('libx11', when='+rendering')
- depends_on('libxt', when='+rendering')
+ depends_on('gl@3.2', when='+rendering')
+ depends_on('mesa+osmesa', when='+rendering+osmesa')
+ depends_on('glx', when='+rendering~osmesa')
depends_on('cmake@3.3:', type='build')
@when('@5.5.0:5.5.2')
diff --git a/var/spack/repos/builtin/packages/dislin/package.py b/var/spack/repos/builtin/packages/dislin/package.py
index 797b50f5d6..53d0e901b2 100644
--- a/var/spack/repos/builtin/packages/dislin/package.py
+++ b/var/spack/repos/builtin/packages/dislin/package.py
@@ -18,7 +18,8 @@ class Dislin(Package):
version('11.0.linux.i586_64', '6fb099b54f41db009cafc702eebb5bc6')
depends_on('motif')
- depends_on('mesa')
+ depends_on('gl')
+ depends_on('glx')
@property
def libs(self):
diff --git a/var/spack/repos/builtin/packages/fsl/package.py b/var/spack/repos/builtin/packages/fsl/package.py
index e223f85ff7..5b115dcbc0 100644
--- a/var/spack/repos/builtin/packages/fsl/package.py
+++ b/var/spack/repos/builtin/packages/fsl/package.py
@@ -26,7 +26,7 @@ class Fsl(Package):
depends_on('python', type=('build', 'run'))
depends_on('expat')
depends_on('libx11')
- depends_on('mesa-glu')
+ depends_on('glu')
depends_on('zlib')
depends_on('libpng')
depends_on('boost')
diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py
index a9bcc51469..085a5dc604 100644
--- a/var/spack/repos/builtin/packages/geant4/package.py
+++ b/var/spack/repos/builtin/packages/geant4/package.py
@@ -3,9 +3,7 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
from spack import *
-import platform
import os
import glob
@@ -60,7 +58,9 @@ class Geant4(CMakePackage):
depends_on("expat")
depends_on("zlib")
- depends_on("mesa", when='+opengl')
+ depends_on("xerces-c")
+ depends_on("gl", when='+opengl')
+ depends_on("glx", when='+opengl+x11')
depends_on("libx11", when='+x11')
depends_on("libxmu", when='+x11')
depends_on("motif", when='+motif')
@@ -88,8 +88,7 @@ class Geant4(CMakePackage):
'-DXERCESC_ROOT_DIR:STRING=%s' %
spec['xerces-c'].prefix, ]
- arch = platform.system().lower()
- if arch != 'darwin':
+ if 'platform=darwin' not in spec:
if "+x11" in spec and "+opengl" in spec:
options.append('-DGEANT4_USE_OPENGL_X11=ON')
if "+motif" in spec and "+opengl" in spec:
diff --git a/var/spack/repos/builtin/packages/gplates/package.py b/var/spack/repos/builtin/packages/gplates/package.py
index 49aea5b45e..1afdd4f68f 100644
--- a/var/spack/repos/builtin/packages/gplates/package.py
+++ b/var/spack/repos/builtin/packages/gplates/package.py
@@ -25,7 +25,7 @@ class Gplates(CMakePackage):
# Qt 5 does not support (at least) the Q_WS_* constants.
depends_on('qt+opengl@4.4.0:4.99')
depends_on('qwt@6.0.1:')
- depends_on('mesa-glu')
+ depends_on('glu')
depends_on('glew')
# GDAL's OGRSFDriverRegistrar is not compatible anymore starting with 2.0.
depends_on('gdal@1.3.2:1.99')
diff --git a/var/spack/repos/builtin/packages/libepoxy/package.py b/var/spack/repos/builtin/packages/libepoxy/package.py
index 8e2cff4324..7165f27948 100644
--- a/var/spack/repos/builtin/packages/libepoxy/package.py
+++ b/var/spack/repos/builtin/packages/libepoxy/package.py
@@ -18,7 +18,7 @@ class Libepoxy(AutotoolsPackage):
depends_on('pkgconfig', type='build')
depends_on('meson')
- depends_on('mesa')
+ depends_on('gl')
def configure_args(self):
# Disable egl, otherwise configure fails with:
diff --git a/var/spack/repos/builtin/packages/mesa-glu/package.py b/var/spack/repos/builtin/packages/mesa-glu/package.py
index 155a9dc23a..db29da92b2 100644
--- a/var/spack/repos/builtin/packages/mesa-glu/package.py
+++ b/var/spack/repos/builtin/packages/mesa-glu/package.py
@@ -14,9 +14,7 @@ class MesaGlu(AutotoolsPackage):
version('9.0.0', 'bbc57d4fe3bd3fb095bdbef6fcb977c4')
- variant('mesa', default=True,
- description='Usually depends on mesa, disable for accelerated OpenGL')
- depends_on('mesa', when='+mesa')
+ depends_on('gl@3:')
provides('glu@1.3')
diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py
index d81c75a875..9a166609a5 100644
--- a/var/spack/repos/builtin/packages/mesa/package.py
+++ b/var/spack/repos/builtin/packages/mesa/package.py
@@ -3,194 +3,153 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-import sys
from spack import *
+import sys
+
-class Mesa(AutotoolsPackage):
+class Mesa(MesonPackage):
"""Mesa is an open-source implementation of the OpenGL specification
- a system for rendering interactive 3D graphics."""
homepage = "http://www.mesa3d.org"
- url = "https://mesa.freedesktop.org/archive/mesa-17.1.5.tar.xz"
- list_url = "https://mesa.freedesktop.org/archive"
- _urlfmt = "https://mesa.freedesktop.org/archive/mesa-{0}.tar.xz"
- _oldurlfmt = "https://mesa.freedesktop.org/archive/older-versions/{0}.x/{1}/mesa-{1}.tar.xz"
- list_depth = 2
-
- version('18.1.2', 'a2d4f031eb6bd6111d44d84004476918')
- version('17.2.3', 'a7dca71afbc7294cb7d505067fd44ef6')
- version('17.2.2', '1a157b5baefb5adf9f4fbb8a6632d74c')
- version('17.1.5', '6cf936fbcaadd98924298a7009e8265d')
- version('17.1.4', 'be2ef7c9edec23b07f74f6512a6a6fa5')
- version('17.1.3', '1946a93d543bc219427e2bebe2ac4752')
- version('17.1.1', 'a4844bc6052578574f9629458bcbb749')
- version('13.0.6', '1e5a769bc6cfd839cf3febcb179c27cc')
- version('12.0.6', '1a3d4fea0656c208db59289e4ed33b3f')
- version('12.0.3', '1113699c714042d8c4df4766be8c57d8')
-
- provides('gl@:4.5', when='@17:')
- provides('gl@:4.4', when='@13:')
- provides('gl@:4.3', when='@12:')
-
- variant('swrender', default=True,
- description="Build with (gallium) software rendering.")
- variant('hwrender', default=False,
- description="Build with (DRI) hardware rendering.")
- variant('llvm', default=False,
- description="Use llvm for rendering pipes.")
-
- # General dependencies
+
+ # Note that we always want to build from the git repo instead of a
+ # tarball since the tarball has pre-generated files for certain versions
+ # of LLVM while the git repo doesn't so it can adapt at build time to
+ # whatever version of LLVM you're using.
+ git = "https://gitlab.freedesktop.org/mesa/mesa.git"
+
+ version('19.0.0', tag='mesa-19.0.0')
+
+ version('19.0.develop', branch='19.0')
+ version('develop', branch='master')
+
+ depends_on('meson@0.45:', type='build')
+ depends_on('binutils', type='build')
depends_on('pkgconfig', type='build')
- depends_on('flex@2.5.35:', type='build')
- depends_on('bison@2.4.1:', type='build')
- depends_on('binutils', type='build', when=(sys.platform != 'darwin'))
- depends_on('python@2.6.4:', type='build')
- depends_on('py-mako@0.3.4:', type='build')
- depends_on('py-argparse', type='build')
- depends_on('gettext')
- depends_on('icu4c')
+ depends_on('python@3:', type='build')
+ depends_on('py-mako@0.8.0:', type='build')
+ depends_on('libxml2')
+ depends_on('zlib')
depends_on('expat')
- depends_on('libpthread-stubs')
- depends_on('openssl')
- depends_on('xproto')
- depends_on('glproto@1.4.14:')
- depends_on('presentproto@1.0:')
- depends_on('libxcb@1.9.3:')
- depends_on('libx11')
- depends_on('libxext')
- depends_on('libxshmfence@1.1:')
- depends_on('libxdamage')
- depends_on('libxfixes')
- depends_on('libxv')
- depends_on('libxvmc')
- depends_on('zlib@1.2.3:')
-
- # For DRI and hardware acceleration
- depends_on('dri2proto@2.6:', type='build', when='+hwrender')
- depends_on('dri3proto@1.0:', type='build', when='+hwrender')
- depends_on('libdrm', when='+hwrender')
-
- depends_on('llvm@:3.8.1+link_dylib', when='@12:12.99+llvm')
- depends_on('llvm@:3.9.1+link_dylib', when='@13:13.99+llvm')
- depends_on('llvm+link_dylib', when='+llvm')
- depends_on('libelf', when='+llvm')
- depends_on('damageproto', when='+hwrender')
- depends_on('fixesproto', when='+hwrender')
-
- def url_for_version(self, version):
- """Handle Mesa version-based custom URLs."""
- if version < Version('17.0.0'):
- return self._oldurlfmt.format(version.up_to(1), version)
- else:
- return self._urlfmt.format(version)
- def configure_args(self):
- """Build drivers for platforms supported by spack;
- exclude drivers for embedded systems.
- """
+ # Internal options
+ variant('llvm', default=True, description="Enable LLVM.")
+ variant('swr', values=any_combination_of('avx', 'avx2', 'knl', 'skx'),
+ description="Enable the SWR driver.")
+ # conflicts('~llvm', when='~swr=none')
+
+ # Front ends
+ variant('osmesa', default=True, description="Enable the OSMesa frontend.")
+
+ is_linux = sys.platform.startswith('linux')
+ variant('glx', default=is_linux, description="Enable the GLX frontend.")
+
+ # TODO: effectively deal with EGL. The implications of this have not been
+ # worked through yet
+ # variant('egl', default=False, description="Enable the EGL frontend.")
+
+ # TODO: Effectively deal with hardware drivers
+ # The implication of this is enabling DRI, among other things, and
+ # needing to check which llvm targets were built (ptx or amdgpu, etc.)
+
+ # Back ends
+ variant('opengl', default=True, description="Enable full OpenGL support.")
+ variant('opengles', default=False, description="Enable OpenGL ES support.")
+
+ # Provides
+ provides('gl@4.5', when='+opengl')
+ provides('glx@1.4', when='+glx')
+ # provides('egl@1.5', when='+egl')
+
+ # Variant dependencies
+ depends_on('llvm@6:', when='+llvm')
+ depends_on('libx11', when='+glx')
+ depends_on('libxcb', when='+glx')
+ depends_on('libxext', when='+glx')
+
+ def meson_args(self):
spec = self.spec
- args = ['--enable-glx', '--enable-glx-tls']
- drivers = []
-
- if '+swrender' in spec:
- drivers = ['swrast']
- args.extend([
- '--disable-osmesa',
- '--enable-gallium-osmesa',
- '--enable-texture-float',
- ])
- if '+llvm' in spec:
- # For @17.1.1:17.1.2 the swr driver requires C++14 support
- # Should be fixed in 17.1.3, but can still encounter problems
- if spec.version >= Version('17') and \
- spec.version < Version('17.2'):
- if spec.satisfies('%gcc@4.9:'):
- drivers.append('swr')
- else:
- drivers.append('swr')
+ args = [
+ '-Dglvnd=false',
+ '-Dgallium-nine=false',
+ '-Dgallium-omx=disabled',
+ '-Dgallium-opencl=disabled',
+ '-Dgallium-va=false',
+ '-Dgallium-vdpau=false',
+ '-Dgallium-xa=false',
+ '-Dgallium-xvmc=false',
+ '-Dvulkan-drivers=']
+ args_platforms = []
+ args_gallium_drivers = ['swrast']
+ args_dri_drivers = []
+
+ num_frontends = 0
+ if '+osmesa' in spec:
+ num_frontends += 1
+ args.append('-Dosmesa=gallium')
else:
- args.append('--disable-gallium-osmesa')
- # Fallback for "~hwrender~swrender" -> old osmesa
- if '~hwrender' in spec:
- args.append('--enable-osmesa')
-
- if '+hwrender' in spec:
- args.append('--enable-xa')
- if spec.version >= Version('17'):
- args.append('--with-platforms=x11,drm')
- else:
- args.append('--with-egl-platforms=x11,drm')
- drivers.extend([
- 'svga', 'i915', 'r600', 'nouveau', 'virgl'
- ])
+ args.append('-Dosmesa=disabled')
- # These hardware drivers need llvm
- if '+llvm' in spec:
- drivers.extend(['r300', 'radeonsi'])
+ if '+glx' in spec:
+ num_frontends += 1
+ args.append('-Dglx=gallium-xlib')
+ args_platforms.append('x11')
+ else:
+ args.append('-Dglx=disabled')
+ if '+egl' in spec:
+ num_frontends += 1
+ args.extend(['-Degl=true', '-Dgbm=true'])
else:
- args.extend([
- '--disable-xa',
- '--disable-dri',
- '--disable-dri3',
- '--disable-egl',
- '--disable-gbm',
- '--disable-xvmc',
- ])
- if spec.version >= Version('17'):
- args.append('--with-platforms=x11')
+ args.extend(['-Degl=false', '-Dgbm=false'])
- if '+llvm' in spec:
- if self.spec.version < Version('17'):
- args.append('--enable-gallium-llvm')
- else:
- args.append('--enable-llvm')
- if '+link_dylib' in self.spec['llvm']:
- args.append('--enable-llvm-shared-libs')
- else:
- args.append('--disable-llvm-shared-libs')
- args.append('--with-llvm-prefix=%s' % spec['llvm'].prefix)
+ if '+opengl' in spec:
+ args.append('-Dopengl=true')
+ else:
+ args.append('-Dopengl=false')
- if drivers:
- args.append('--with-gallium-drivers=' + ','.join(drivers))
+ if '+opengles' in spec:
+ args.extend(['-Dgles1=true', '-Dgles2=true'])
else:
- args.append('--without-gallium-drivers')
+ args.extend(['-Dgles1=false', '-Dgles2=false'])
- # Avoid errors due to missing clock_gettime symbol:
- arch = spec.architecture
- if arch.platform == 'linux':
- args.append('LIBS=-lrt')
+ if '+egl' in spec or '+osmesa' in spec:
+ args_platforms.append('surfaceless')
- return args
+ if num_frontends > 1:
+ args.append('-Dshared-glapi=true')
+ else:
+ args.append('-Dshared-glapi=false')
- def configure(self, spec, prefix):
- """Configure mesa, detecting if libsysfs is required
- for DRI support on the build host.
- """
- options = ['--prefix={0}'.format(prefix)] + self.configure_args()
-
- try:
- # First attempt uses libudev:
- configure(*options)
- except ProcessError:
- if '+hwrender' in spec and not spec.satisfies('@13:'):
- print('Configuring with libudev failed ... '
- ' trying libsysfs ...')
- options.append('--enable-sysfs')
- configure(*options)
+ if '+llvm' in spec:
+ args.append('-Dllvm=true')
+ if '+link_dylib' in spec['llvm']:
+ args.append('-Dshared-llvm=true')
else:
- raise
-
- @property
- def libs(self):
- for dir in ['lib64', 'lib']:
- libs = find_libraries('libGL', join_path(self.prefix, dir),
- shared=True, recursive=False)
- if libs:
- return libs
-
- @when('^python@3:')
- def setup_environment(self, spack_env, run_env):
- # this avoids an "import site" error in the build
- spack_env.unset('PYTHONHOME')
+ args.append('-Dshared-llvm=false')
+ else:
+ args.append('-Dllvm=false')
+
+ args_swr_arches = []
+ if 'swr=avx' in spec:
+ args_swr_arches.append('avx')
+ if 'swr=avx2' in spec:
+ args_swr_arches.append('avx2')
+ if 'swr=knl' in spec:
+ args_swr_arches.append('knl')
+ if 'swr=skx' in spec:
+ args_swr_arches.append('skx')
+ if args_swr_arches:
+ if '+llvm' not in spec:
+ raise SpecError('Variant swr requires +llvm')
+ args_gallium_drivers.append('swr')
+ args.append('-Dswr-arches=' + ','.join(args_swr_arches))
+
+ # Add the remaining list args
+ args.append('-Dplatforms=' + ','.join(args_platforms))
+ args.append('-Dgallium-drivers=' + ','.join(args_gallium_drivers))
+ args.append('-Ddri-drivers=' + ','.join(args_dri_drivers))
+
+ return args
diff --git a/var/spack/repos/builtin/packages/mrtrix3/package.py b/var/spack/repos/builtin/packages/mrtrix3/package.py
index 89b1e24eef..63d00a200b 100644
--- a/var/spack/repos/builtin/packages/mrtrix3/package.py
+++ b/var/spack/repos/builtin/packages/mrtrix3/package.py
@@ -19,7 +19,7 @@ class Mrtrix3(Package):
depends_on('python@2.7:', type=('build', 'run'))
depends_on('py-numpy', type=('build', 'run'))
- depends_on('mesa-glu')
+ depends_on('glu')
depends_on('qt+opengl@4.7:')
depends_on('eigen')
depends_on('zlib')
diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py
index 92e7b43b3d..fca5371ac4 100644
--- a/var/spack/repos/builtin/packages/opengl/package.py
+++ b/var/spack/repos/builtin/packages/opengl/package.py
@@ -3,6 +3,8 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+import sys
+
from spack import *
@@ -18,6 +20,9 @@ class Opengl(Package):
provides('gl@:4.1', when='@4.1:')
provides('gl@:3.3', when='@3.3:')
+ if sys.platform != 'darwin':
+ provides('glx@1.4')
+
# Override the fetcher method to throw a useful error message;
# fixes GitHub issue (#7061) in which this package threw a
# generic, uninformative error during the `fetch` step,
diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py
index 19ebbf6a57..16e1c5a610 100644
--- a/var/spack/repos/builtin/packages/paraview/package.py
+++ b/var/spack/repos/builtin/packages/paraview/package.py
@@ -46,7 +46,9 @@ class Paraview(CMakePackage):
depends_on('qt~opengl', when='@5.3.0:+qt~opengl2')
depends_on('qt@:4', when='@:5.2.0+qt')
- depends_on('mesa+swrender', when='+osmesa')
+ depends_on('mesa+osmesa', when='+osmesa')
+ depends_on('gl@3.2:', when='+opengl2')
+ depends_on('gl@1.2:', when='~opengl2')
depends_on('libxt', when='+qt')
conflicts('+qt', when='+osmesa')
diff --git a/var/spack/repos/builtin/packages/r-rgl/package.py b/var/spack/repos/builtin/packages/r-rgl/package.py
index ea3c24fe08..372833f8ab 100644
--- a/var/spack/repos/builtin/packages/r-rgl/package.py
+++ b/var/spack/repos/builtin/packages/r-rgl/package.py
@@ -26,8 +26,8 @@ class RRgl(RPackage):
depends_on('libpng', type=('link'))
depends_on('libx11')
depends_on('freetype', type=('link'))
- depends_on('mesa', type=('link'))
- depends_on('mesa-glu', type=('link'))
+ depends_on('gl')
+ depends_on('glu')
depends_on('r-htmlwidgets', type=('build', 'run'))
depends_on('r-htmltools', type=('build', 'run'))
depends_on('r-knitr', type=('build', 'run'))
@@ -40,7 +40,7 @@ class RRgl(RPackage):
def configure_args(self):
args = ['--x-includes=%s' % self.spec['libx11'].prefix.include,
'--x-libraries=%s' % self.spec['libx11'].prefix.lib,
- '--with-gl-includes=%s' % self.spec['mesa'].prefix.include,
- '--with-gl-libraries=%s' % self.spec['mesa'].prefix.lib,
- '--with-gl-prefix=%s' % self.spec['mesa'].prefix]
+ '--with-gl-includes=%s' % self.spec['gl'].prefix.include,
+ '--with-gl-libraries=%s' % self.spec['gl'].prefix.lib,
+ '--with-gl-prefix=%s' % self.spec['gl'].prefix]
return args
diff --git a/var/spack/repos/builtin/packages/virtualgl/package.py b/var/spack/repos/builtin/packages/virtualgl/package.py
index 808a16afc6..bf4352f04a 100644
--- a/var/spack/repos/builtin/packages/virtualgl/package.py
+++ b/var/spack/repos/builtin/packages/virtualgl/package.py
@@ -19,8 +19,4 @@ class Virtualgl(CMakePackage):
version('2.5.2', '1a9f404f4a35afa9f56381cb33ed210c')
depends_on("libjpeg-turbo")
- # virtualgl require OpenGL but also wants to link libglu
- # on systems without development packages, provide with spack and depends
- # on mesa-glu, but we do not want Mesa OpenGL sw emulation, so added
- # variant on mesa-glu to disable dependencies on sw emulated OpenGL
- depends_on("mesa-glu~mesa")
+ depends_on("glu")
diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py
index 15f71e005d..3b133b26d9 100644
--- a/var/spack/repos/builtin/packages/vtk/package.py
+++ b/var/spack/repos/builtin/packages/vtk/package.py
@@ -5,6 +5,7 @@
import os
+import sys
from spack import *
@@ -50,14 +51,14 @@ class Vtk(CMakePackage):
# The use of the OpenGL2 backend requires at least OpenGL Core Profile
# version 3.2 or higher.
depends_on('gl@3.2:', when='+opengl2')
+ depends_on('gl@1.2:', when='~opengl2')
- # If you didn't ask for osmesa, then hw rendering using vendor-specific
- # drivers is faster, but it must be done externally.
- depends_on('opengl', when='~osmesa')
+ if sys.platform != 'darwin':
+ depends_on('glx', when='~osmesa')
# Note: it is recommended to use mesa+llvm, if possible.
# mesa default is software rendering, llvm makes it faster
- depends_on('mesa', when='+osmesa')
+ depends_on('mesa+osmesa', when='+osmesa')
# VTK will need Qt5OpenGL, and qt needs '-opengl' for that
depends_on('qt+opengl', when='+qt')
diff --git a/var/spack/repos/builtin/packages/xorg-server/package.py b/var/spack/repos/builtin/packages/xorg-server/package.py
index ae375af367..91b81c5845 100644
--- a/var/spack/repos/builtin/packages/xorg-server/package.py
+++ b/var/spack/repos/builtin/packages/xorg-server/package.py
@@ -20,7 +20,6 @@ class XorgServer(AutotoolsPackage):
depends_on('libxshmfence@1.1:')
depends_on('libdrm@2.3.0:')
depends_on('libx11')
- depends_on('mesa+hwrender', type='build')
depends_on('dri2proto@2.8:', type='build')
depends_on('dri3proto@1.0:', type='build')