From 80969099f3203fd77e0a8b9a3582a0056f6e9cce Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 16 Oct 2025 19:45:38 +0200 Subject: [PATCH] Bump wlroots to v0.19 --- .gitmodules | 2 +- meson.build | 4 ++-- src/meson.build | 4 ++-- subprojects/wlroots | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index ec7d4e430e..c52569679d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "subprojects/wlroots"] path = subprojects/wlroots - url = https://github.com/Joshua-Ashton/wlroots.git + url = https://gitlab.freedesktop.org/wlroots/wlroots.git [submodule "subprojects/libliftoff"] path = subprojects/libliftoff url = https://gitlab.freedesktop.org/emersion/libliftoff.git diff --git a/meson.build b/meson.build index 5e5bd4cdc7..75ff0d705e 100644 --- a/meson.build +++ b/meson.build @@ -6,12 +6,12 @@ project( default_options: [ 'cpp_std=c++20', 'warning_level=2', - 'force_fallback_for=wlroots,libliftoff,vkroots', + 'force_fallback_for=libliftoff,vkroots', ], ) fallbacks = get_option('force_fallback_for') -if not (fallbacks.contains('wlroots') and fallbacks.contains('libliftoff') and fallbacks.contains('vkroots')) +if not (fallbacks.contains('libliftoff') and fallbacks.contains('vkroots')) error('!!!"force_fallback_for" is missing entries!!!\n\tPlease do not remove entries from force_fallback_for if you are packaging the project.\n\tWe pull in these projects at specific commits/forks/builds for a reason.\n\tIf you are not packaging, remove this line to continue.') endif diff --git a/src/meson.build b/src/meson.build index d1d02799e4..317e106ee7 100644 --- a/src/meson.build +++ b/src/meson.build @@ -27,8 +27,8 @@ pixman_dep = dependency('pixman-1') udev_dep = dependency('libudev') wlroots_dep = dependency( - 'wlroots-0.18', - version: ['>= 0.18.0', '< 0.19.0'], + 'wlroots-0.19', + version: ['>= 0.19.0', '< 0.20.0'], fallback: 'wlroots', default_options: ['default_library=static', 'examples=false', 'xwayland=enabled', 'backends=libinput', 'renderers=[]', 'allocators=[]', 'session=enabled'], ) diff --git a/subprojects/wlroots b/subprojects/wlroots index 54e8447480..9b42c1901d 160000 --- a/subprojects/wlroots +++ b/subprojects/wlroots @@ -1 +1 @@ -Subproject commit 54e844748029d4874e14d0c086d50092c04c8899 +Subproject commit 9b42c1901d967a6a05209de741131053722e9be1