From 904867703e06134d8b9767a10b6f5806a188adf9 Mon Sep 17 00:00:00 2001 From: kurtsansom <56605142+kurtsansom@users.noreply.github.com> Date: Wed, 31 Mar 2021 12:25:18 -0500 Subject: [PATCH] fix: modify for change in meson options (#22678) --- var/spack/repos/builtin/packages/mesa/package.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index fb0e876484a..f38e9ea2de0 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -123,11 +123,17 @@ def meson_args(self): args.append('-Dlibunwind=disabled') num_frontends = 0 + + if spec.satisfies('@:20.3'): + osmesa_enable, osmesa_disable = ('gallium', 'none') + else: + osmesa_enable, osmesa_disable = ('true', 'false') + if '+osmesa' in spec: num_frontends += 1 - args.append('-Dosmesa=gallium') + args.append('-Dosmesa={0}'.format(osmesa_enable)) else: - args.append('-Dosmesa=none') + args.append('-Dosmesa={0}'.format(osmesa_disable)) if '+glx' in spec: num_frontends += 1