From e3d391b9c63299f4a7807f4104e6fa72b67ac703 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 27 Mar 2024 11:41:25 +0100 Subject: [PATCH] test: fix FTBS on missing xlib includes on NetBSD When X11 isn't installed directly at /usr hierarchy (eg. NetBSD uses /usr/X11R7/), build breaks: ../test/list.c:31:10: fatal error: X11/Xlib.h: No such file or directory 31 | #include | ^~~~~~~~~~~~ Needs explicitly dependency on libX11, so the include path is added. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- meson.build | 1 + test/meson.build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 6aced835c..86c1e55cf 100644 --- a/meson.build +++ b/meson.build @@ -69,6 +69,7 @@ gbm_req = '>= 10.2' xf86dgaproto_req = '>= 2.0.99.1' xshmfence_req = '>= 1.1' +x11_dep = dependency('x11') xproto_dep = dependency('xproto', version: '>= 7.0.31', fallback: ['xorgproto', 'ext_xorgproto']) randrproto_dep = dependency('randrproto', version: '>= 1.6.0', fallback: ['xorgproto', 'ext_xorgproto']) renderproto_dep = dependency('renderproto', version: '>= 0.11', fallback: ['xorgproto', 'ext_xorgproto']) diff --git a/test/meson.build b/test/meson.build index 58a6ca533..7c1663175 100644 --- a/test/meson.build +++ b/test/meson.build @@ -233,7 +233,7 @@ if build_xorg unit = executable('tests', unit_sources, c_args: unit_c_args, - dependencies: [pixman_dep, randrproto_dep, inputproto_dep, libxcvt_dep], + dependencies: [x11_dep, pixman_dep, randrproto_dep, inputproto_dep, libxcvt_dep], include_directories: unit_includes, link_args: ldwraps, link_with: xorg_link,