mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

meson: move xlib-lease block further down 

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3161>
This commit is contained in:
Eric Engestrom 2019-12-19 02:11:18 +00:00 committed by Marge Bot
parent 448eb19158
commit 60ad006b27
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
meson.build
View File

@ -323,20 +323,6 @@ else
egl_native_platform = 'surfaceless'
endif
_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 with_platform_drm
else
with_xlib_lease = _xlib_lease == 'enabled'
endif
with_glx = get_option('glx')
if with_glx == 'auto'
if with_dri
@ -387,6 +373,20 @@ if with_gbm and not system_has_kms_drm
error('GBM only supports DRM/KMS platforms')
endif
_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 with_platform_drm
else
with_xlib_lease = _xlib_lease == 'enabled'
endif
_egl = get_option('egl')
if _egl == 'true'
_egl = 'enabled'