sway

commit d28c4c00941b9140deb22a091f0e70cbf2a49325
parent da9c86c608b33d78e25ced5858be579f502efd63
Author: Drew DeVault <sir@cmpwn.com>
Date:   Thu, 19 Jul 2018 14:18:13 -0700

Merge pull request #2314 from emersion/update-wlroots-1148

Update for swaywm/wlroots#1148
Diffstat:
M
sway/desktop/transaction.c
 | 
1
-
M
sway/server.c
 | 
4
++--

2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
@@ -4,7 +4,6 @@
 #include <string.h>
 #include <time.h>
 #include <wlr/types/wlr_buffer.h>
-#include <wlr/types/wlr_linux_dmabuf.h>
 #include "sway/debug.h"
 #include "sway/desktop/idle_inhibit_v1.h"
 #include "sway/desktop/transaction.h"
diff --git a/sway/server.c b/sway/server.c
@@ -11,7 +11,7 @@
 #include <wlr/types/wlr_gamma_control.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_layer_shell.h>
-#include <wlr/types/wlr_linux_dmabuf.h>
+#include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/types/wlr_screencopy_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
@@ -108,7 +108,7 @@ bool server_init(struct sway_server *server) {
 	wlr_server_decoration_manager_set_default_mode(
 		deco_manager, WLR_SERVER_DECORATION_MANAGER_MODE_SERVER);
 
-	wlr_linux_dmabuf_create(server->wl_display, renderer);
+	wlr_linux_dmabuf_v1_create(server->wl_display, renderer);
 	wlr_export_dmabuf_manager_v1_create(server->wl_display);
 	wlr_screencopy_manager_v1_create(server->wl_display);