frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xnest: don't silently disable Xnest 

The current implementation silently disables Xnest, even if requested
explcitly. That's a bit unstable behaviour - it's better to break the
build in those cases, just disable silently in auto mode.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1534>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-05-13 12:09:54 +02:00 committed by Marge Bot
parent 1ead670476
commit 842e866155
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meson.build
View File

@ -225,7 +225,6 @@ if (host_machine.system() != 'darwin' and
dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required),
dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: xwayland_required),
]
if build_glamor
xwayland_dep += dependency('xshmfence', version: xshmfence_req, required: xwayland_required)
xwayland_dep += dependency('libdrm', version: libdrm_req, required: xwayland_required)
@ -241,23 +240,21 @@ if (host_machine.system() != 'darwin' and
endforeach
endif
build_xnest = false
if get_option('xnest') != 'false'
xnest_required = get_option('xnest') == 'true'
xnest_dep = [
dependency('xext', version: xext_req, required: xnest_required),
dependency('x11', required: xnest_required),
dependency('xau', required: xnest_required),
]
build_xnest = true
# check for all the deps being found, to handle 'auto' mode.
foreach d: xnest_dep
if not d.found()
build_xnest = false
endif
endforeach
## configure Xnest - nesting X server
build_xnest = get_option('xnest') != 'false'
xnest_required = get_option('xnest') == 'true'
xnest_dep = [
dependency('xext', version: xext_req, required: xnest_required),
dependency('x11', required: xnest_required),
dependency('xau', required: xnest_required),
]
if get_option('xnest') == 'auto'
# check for all the deps being found, to handle 'auto' mode.
foreach d: xnest_dep
if not d.found()
build_xnest = false
endif
endforeach
endif
build_xwin = false