summaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorDylan Baker <dylan.c.baker@intel.com>2022-12-20 16:36:46 -0800
committerMarge Bot <emma+marge@anholt.net>2023-01-19 16:29:03 +0000
commite3f60ea4a8937d77c2169e052ecda0e78144eb3c (patch)
tree9bf9553b99d86b362760cdc3b3311502042b6c85 /meson.build
parentce490a20e7310ff55dd76d77841cfd3275d90b3a (diff)
downloadmesa-e3f60ea4a8937d77c2169e052ecda0e78144eb3c.tar.gz
meson: use a feature option for xlib-lease
Reviewed-by: Jesse Natalie <jenatali@microsoft.com> Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20409>
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build16
1 files changed, 3 insertions, 13 deletions
diff --git a/meson.build b/meson.build
index f050cc66a39..559bef44ac4 100644
--- a/meson.build
+++ b/meson.build
@@ -364,19 +364,9 @@ with_gbm = get_option('gbm') \
.disable_auto_if(not with_dri) \
.allowed()
-_xlib_lease = get_option('xlib-lease')
-if _xlib_lease == 'true'
- _xlib_lease = 'enabled'
- warning('xlib_lease option "true" deprecated, please use "enabled" instead.')
-elif _xlib_lease == 'false'
- _xlib_lease = 'disabled'
- warning('xlib_lease option "false" deprecated, please use "disabled" instead.')
-endif
-if _xlib_lease == 'auto'
- with_xlib_lease = with_platform_x11 and system_has_kms_drm
-else
- with_xlib_lease = _xlib_lease == 'enabled'
-endif
+with_xlib_lease = get_option('xlib-lease') \
+ .require(with_platform_x11 and system_has_kms_drm, error_message : 'xlib-lease requires X11 and KMS/DRM support') \
+ .allowed()
if with_platform_wayland
c_args += '-DVK_USE_PLATFORM_WAYLAND_KHR'