From 760e1665789212c49adba8d50632787f49f88c09 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Tue, 5 Oct 2021 01:49:27 +0000 Subject: [PATCH] render: completely disable gles2 if requested but libEGL is found For `required` to disable search the value needs to be of `feature` type. Checking `gles2` via `in` keyword returns a `bool` but `required: false` makes the dependency optional instead of disabled. --- render/meson.build | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/render/meson.build b/render/meson.build index 2d651887..a1289ede 100644 --- a/render/meson.build +++ b/render/meson.build @@ -14,13 +14,12 @@ wlr_files += files( 'wlr_texture.c', ) -egl = dependency('egl', required: 'gles2' in renderers) -if egl.found() - wlr_deps += egl - wlr_files += files('egl.c') -endif - if 'gles2' in renderers or 'auto' in renderers + egl = dependency('egl', required: 'gles2' in renderers) + if egl.found() + wlr_deps += egl + wlr_files += files('egl.c') + endif subdir('gles2') endif