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

meson: add subproject fallback for libxcvt 

Depends on:
https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/merge_requests/6

Signed-off-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
Simon Ser 2021-10-22 18:15:53 +02:00 committed by Povilas Kanapickas
parent 43452690df
commit 2df3a62c66
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -194,7 +194,7 @@ if (host_machine.system() != 'darwin' and
endif endif
endif endif
xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg') xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg')
libxcvt_dep = dependency('libxcvt', required: build_xorg) libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: build_xorg)
build_xwayland = false build_xwayland = false
if (host_machine.system() != 'darwin' and if (host_machine.system() != 'darwin' and
@ -211,7 +211,7 @@ if (host_machine.system() != 'darwin' and
xwayland_dep = [ xwayland_dep = [
dependency('wayland-client', version: wayland_req, required: xwayland_required), dependency('wayland-client', version: wayland_req, required: xwayland_required),
dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required), dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required),
dependency('libxcvt', required: xwayland_required), dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: xwayland_required),
] ]
if build_glamor if build_glamor