fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 05:50:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: Build Xwayland unconditionally

Browse source
This commit is contained in:
Michel Dänzer 2020-10-23 12:40:41 +02:00 • committed by Michel Dänzer
parent be7257c5d1
commit 274d54d1c3
2 changed files with 15 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
meson.build
View file

@ -153,36 +153,22 @@ if with_dtrace
dtrace = find_program('dtrace', required: true) dtrace = find_program('dtrace', required: true)
endif endif
build_xwayland = false build_xwayland = true
if (host_machine.system() != 'darwin' and build_glamor = glamor_option != 'false'
host_machine.system() != 'windows')
if get_option('xwayland') != 'false'
xwayland_required = get_option('xwayland') == 'true'
build_glamor = glamor_option == 'true' or glamor_option == 'auto'
xwayland_path = get_option('xwayland-path') xwayland_path = get_option('xwayland-path')
if (xwayland_path == '') if (xwayland_path == '')
xwayland_path = join_paths(get_option('prefix'), get_option('bindir')) xwayland_path = join_paths(get_option('prefix'), get_option('bindir'))
endif endif
xwayland_dep = [ xwayland_dep = [
dependency('wayland-client', version: wayland_req, required: xwayland_required), dependency('wayland-client', version: wayland_req, required: true),
dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required), dependency('wayland-protocols', version: wayland_protocols_req, required: true),
] ]
if build_glamor if build_glamor
xwayland_dep += dependency('libdrm', version: libdrm_req, required: xwayland_required) xwayland_dep += dependency('libdrm', version: libdrm_req, required: true)
xwayland_dep += dependency('epoxy', required: xwayland_required) xwayland_dep += dependency('epoxy', required: true)
endif
build_xwayland = true
# check for all the deps being found, to handle 'auto' mode.
foreach d: xwayland_dep
if not d.found()
build_xwayland = false
endif
endforeach
endif
endif endif
if get_option('ipv6') == 'auto' if get_option('ipv6') == 'auto'
@ -191,12 +177,6 @@ else
build_ipv6 = get_option('ipv6') == 'true' build_ipv6 = get_option('ipv6') == 'true'
endif endif
if glamor_option == 'auto'
build_glamor = build_xwayland
else
build_glamor = glamor_option == 'true'
endif
gbm_dep = dependency('', required: false) gbm_dep = dependency('', required: false)
epoxy_dep = dependency('', required: false) epoxy_dep = dependency('', required: false)
if build_glamor if build_glamor

6
meson_options.txt
View file

@ -1,7 +1,5 @@
option('xwayland', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', option('glamor', type: 'boolean', value: true,
description: 'Enable XWayland X server') description: 'Enable glamor (default yes)')
option('glamor', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Enable glamor (default yes for Xwayland builds)')
option('xwayland_eglstream', type: 'combo', choices: ['true', 'false', 'auto'], option('xwayland_eglstream', type: 'combo', choices: ['true', 'false', 'auto'],
value: 'auto', description: 'Enable EGLStream support for glamor on Xwayland') value: 'auto', description: 'Enable EGLStream support for glamor on Xwayland')
option('xvfb', type: 'boolean', value: true, option('xvfb', type: 'boolean', value: true,