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

meson: wayland_client_dep is false when wayland is disabled 

Signed-off-by: orbea <orbea@riseup.net>
This commit is contained in:
orbea 2023-01-24 11:06:59 -08:00
parent f33962966f
commit d266274ca9
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
meson.build
View File

@ -205,36 +205,35 @@ libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], requir
build_xwayland = false build_xwayland = false
if (host_machine.system() != 'darwin' and if (host_machine.system() != 'darwin' and
host_machine.system() != 'windows') host_machine.system() != 'windows' and
if get_option('xwayland') != 'false' get_option('xwayland') != 'false')
xwayland_required = get_option('xwayland') == 'true' xwayland_required = get_option('xwayland') == 'true'
build_glamor = glamor_option == 'true' or glamor_option == 'auto' 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
wayland_client_dep = dependency('wayland-client', version: wayland_req, required: xwayland_required)
xwayland_dep = [
wayland_client_dep,
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('libdrm', version: libdrm_req, required: xwayland_required)
xwayland_dep += dependency('epoxy', required: xwayland_required)
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
wayland_client_dep = dependency('wayland-client', version: wayland_req, required: xwayland_required)
xwayland_dep = [
wayland_client_dep,
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('libdrm', version: libdrm_req, required: xwayland_required)
xwayland_dep += dependency('epoxy', required: xwayland_required)
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
else else
wayland_client_dep = dependency('', required: false) wayland_client_dep = dependency('', required: false)
endif endif