From 703516c19485df291ae92feb2f518965ecc8c5fb Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Thu, 15 Dec 2022 13:15:25 +0000 Subject: [PATCH] subprojects: Add libdisplay-info dependency --- .gitmodules | 3 +++ meson.build | 9 ++++++++- subprojects/libdisplay-info | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) create mode 160000 subprojects/libdisplay-info diff --git a/.gitmodules b/.gitmodules index 167a6d3..3e4682d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "subprojects/vkroots"] path = subprojects/vkroots url = https://github.com/Joshua-Ashton/vkroots +[submodule "subprojects/libdisplay-info"] + path = subprojects/libdisplay-info + url = https://gitlab.freedesktop.org/emersion/libdisplay-info diff --git a/meson.build b/meson.build index 7c14f90..8c4d7b4 100644 --- a/meson.build +++ b/meson.build @@ -60,6 +60,13 @@ wlroots_dep = dependency( default_options: ['default_library=static', 'examples=false', 'xwayland=enabled', 'backends=libinput', 'renderers=[]', 'allocators=[]'], ) +displayinfo_dep = dependency( + 'display-info', + version: ['>= 0.0.0', '< 0.1.0'], + fallback: ['libdisplay-info', 'di_dep'], + default_options: ['default_library=static'], +) + required_wlroots_features = ['xwayland', 'libinput_backend'] foreach feat : required_wlroots_features if wlroots_dep.get_variable('have_' + feat) != 'true' @@ -153,7 +160,7 @@ executable( dep_xxf86vm, dep_xres, drm_dep, wayland_server, xkbcommon, thread_dep, sdl_dep, wlroots_dep, vulkan_dep, liftoff_dep, dep_xtst, cap_dep, pipewire_dep, librt_dep, - stb_dep, + stb_dep, displayinfo_dep, ], install: true, ) diff --git a/subprojects/libdisplay-info b/subprojects/libdisplay-info new file mode 160000 index 0000000..8fbc366 --- /dev/null +++ b/subprojects/libdisplay-info @@ -0,0 +1 @@ +Subproject commit 8fbc366c7c56d584590db50fe5943b0f92b1f448