Mesa (master): meson: fix `-D xlib-lease=auto` detection

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sun Aug 2 16:37:56 UTC 2020


Module: Mesa
Branch: master
Commit: a4181fcd422ddd2a58467eda338847db7c14efd1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a4181fcd422ddd2a58467eda338847db7c14efd1

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Sat Aug  1 13:41:30 2020 +0200

meson: fix `-D xlib-lease=auto` detection

This is used by Vulkan, not EGL, and depends on having DRM/KMS, not GBM.

Reported-by: Oschowa <oschowa at web.de>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3346
Fixes: e00adef34a5ce485e2c9 ("egl: automatically compile the `drm` platform when available")
Signed-off-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6150>

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 011b1eca832..4b57cf326ec 100644
--- a/meson.build
+++ b/meson.build
@@ -389,7 +389,7 @@ elif _xlib_lease == 'false'
   warning('xlib_lease option "false" deprecated, please use "disabled" instead.')
 endif
 if _xlib_lease == 'auto'
-  with_xlib_lease = with_platform_x11 and with_gbm
+  with_xlib_lease = with_platform_x11 and system_has_kms_drm
 else
   with_xlib_lease = _xlib_lease == 'enabled'
 endif



More information about the mesa-commit mailing list