[Mesa-dev] [PATCH 1/4] meson: Don't allow glx to be built without platform_x11
eric at engestrom.ch
Thu Oct 19 00:13:08 UTC 2017
On Wednesday, 2017-10-18 23:56:05 +0000, Dylan Baker wrote:
> Previously this failed to change with_glx to disabled from auto if
> platform_x11 was unset or if no opengl apis were being built.
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> meson.build | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
> diff --git a/meson.build b/meson.build
> index 82c4d2ed12c..13d9e400ba7 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -157,8 +157,12 @@ endif
> pre_args += '-DGLX_USE_TLS'
> with_glx = get_option('glx')
> if with_glx != 'disabled'
> - if not (with_platform_x11 and with_any_opengl) and with_glx != 'auto'
> - error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
> + if not (with_platform_x11 and with_any_opengl)
> + if with_glx != 'auto'
> + error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
> + else
> + with_glx = 'disabled'
Nit: swap the branches?
if glx == auto
glx = disabled
Patches 1 & 2 are
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
> + endif
> elif with_glx == 'gallium-xlib'
> if not with_gallium
> error('Gallium-xlib based GLX requires at least one gallium driver')
More information about the mesa-dev