chase: output-layout takes wl_display in constructor

https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4310

diff --git a/src/output.c b/src/output.c
index 1bf014295c8adaf47e22136b21a0ecdc94e27df8..38de88de90523c9605d16c13f3e83b7b355fdaa1 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -431,7 +431,7 @@ output_init(struct server *server)
         * Create an output layout, which is a wlroots utility for working with
         * an arrangement of screens in a physical layout.
         */
-       server->output_layout = wlr_output_layout_create();
+       server->output_layout = wlr_output_layout_create(server->wl_display);
        if (!server->output_layout) {
                wlr_log(WLR_ERROR, "unable to create output layout");
                exit(EXIT_FAILURE);

diff --git a/src/server.c b/src/server.c
index 8b1a4fd4632fa5d27765b85238f801128c6d0519..dcdf8c441b5cac75d15cf7d26cb731a208702a4b 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -542,8 +542,6 @@ server_finish(struct server *server)
        wl_display_destroy_clients(server->wl_display);
 
        seat_finish(server);
-       wlr_output_layout_destroy(server->output_layout);
-
        wl_display_destroy(server->wl_display);
 
        /* TODO: clean up various scene_tree nodes */

diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index bde76b475ad0ed10db63dcbfa74bc27002488335..549c6ca7c7cd2d0d16283a0b01cf66c4f9b2aecf 100644 (file)
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = f1762f428b0ef2989c81f57ea9e810403d34d946
+revision = d61ec694b352c0f21c06958c5ef0417f3e424e3c
 
 [provide]
 dependency_names = wlroots