From 6a6966b8d65f0cd8a1cf7ec54df28f7106fabff6 Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Tue, 6 Apr 2021 17:03:02 -0400 Subject: [PATCH] Updated versions --- meson.build | 6 +++--- protocol/meson.build | 2 +- waybox/server.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 800aa80..c247097 100644 --- a/meson.build +++ b/meson.build @@ -1,9 +1,9 @@ project( 'Waybox', 'c', - version: '0.0.2.1', + version: '0.1.0', license: 'MIT', - meson_version: '>=0.43.0', + meson_version: '>=0.52.0', default_options: [ 'c_std=c11', 'warning_level=2', @@ -23,7 +23,7 @@ cc = meson.get_compiler('c') # Adding include directory inc_dir = include_directories('include') -wlroots = dependency('wlroots', version: '>=0.9.0') +wlroots = dependency('wlroots', version: ['>=0.9.0', '<0.13.0']) wayland_server = dependency('wayland-server', version: '>=1.15') wayland_protos = dependency('wayland-protocols', version: '>=1.17') xkbcommon = dependency('xkbcommon') diff --git a/protocol/meson.build b/protocol/meson.build index 345e747..1f79ef6 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -1,6 +1,6 @@ wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir') -wayland_scanner = find_program('wayland-scanner') +wayland_scanner = find_program('wayland-scanner', version: '>= 1.15') wayland_scanner_server = generator( wayland_scanner, diff --git a/waybox/server.c b/waybox/server.c index 36bf9e3..8ca959b 100644 --- a/waybox/server.c +++ b/waybox/server.c @@ -61,11 +61,11 @@ bool wb_start_server(struct wb_server* server) { } bool wb_terminate(struct wb_server* server) { - wl_display_destroy_clients(server->wl_display); wb_cursor_destroy(server->cursor); wb_seat_destroy(server->seat); - wlr_output_layout_destroy(server->layout); + wl_display_destroy_clients(server->wl_display); wl_display_destroy(server->wl_display); + wlr_output_layout_destroy(server->layout); wlr_log(WLR_INFO, "%s", _("Display destroyed"));