From 9eccaf4379342f3d5c2166efd42807b6d3318915 Mon Sep 17 00:00:00 2001 From: John Lindgren Date: Sun, 15 Oct 2023 15:39:08 -0400 Subject: [PATCH] NOT FOR MERGE: use 0.16-backports branch of wlroots --- meson.build | 7 ++----- subprojects/wlroots.wrap | 5 +++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 07290797..60de87fa 100644 --- a/meson.build +++ b/meson.build @@ -48,11 +48,8 @@ if git.found() endif add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c') -wlroots = dependency( - 'wlroots', - default_options: ['default_library=static', 'examples=false'], - version: ['>=0.16.0', '<0.17.0'], -) +# jlindgren: force use of wlroots subproject +wlroots = subproject('wlroots').get_variable('wlroots') wlroots_has_xwayland = wlroots.get_variable('have_xwayland') == 'true' diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap index 8f847367..d8f129ee 100644 --- a/subprojects/wlroots.wrap +++ b/subprojects/wlroots.wrap @@ -1,6 +1,7 @@ [wrap-git] -url = https://gitlab.freedesktop.org/wlroots/wlroots.git -revision = 0.16 +# jlindgren: use 0.16-backports branch of wlroots +url = https://github.com/jlindgren90/wlroots.git +revision = 0.16-backports [provide] dependency_names = wlroots