From 6ad2a564f8194571becdb4ee02278c3fb5406d2b Mon Sep 17 00:00:00 2001
From: MarkusVolk <f_l_k@t-online.de>
Date: Fri, 8 Oct 2021 23:19:31 +0200
Subject: [PATCH] wlroots/sway: update

---
 recipes-devtools/meson/meson_%.bbappend               | 7 +++++++
 recipes-graphics/wayland/wayland-protocols_%.bbappend | 3 +++
 recipes-wlroots/sway/sway_git.bb                      | 6 +++---
 recipes-wlroots/wlroots/wlroots_git.bb                | 9 +++++----
 4 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 recipes-devtools/meson/meson_%.bbappend
 create mode 100644 recipes-graphics/wayland/wayland-protocols_%.bbappend

diff --git a/recipes-devtools/meson/meson_%.bbappend b/recipes-devtools/meson/meson_%.bbappend
new file mode 100644
index 0000000..bc18852
--- /dev/null
+++ b/recipes-devtools/meson/meson_%.bbappend
@@ -0,0 +1,7 @@
+SRC_URI:remove = "           file://0003-native_bindir.patch \"
+SRC_URI:remove = "           file://gi-target-dep.patch \"
+SRC_URI:remove = "           file://0001-Make-CPU-family-warnings-fatal.patch \"
+PV = "0.59.0"
+SRC_URI[sha256sum] = "e376c298df64b643dfe01eccb2d7b6f1e02e95aa38c19f19d120d129612ce476"
+
+
diff --git a/recipes-graphics/wayland/wayland-protocols_%.bbappend b/recipes-graphics/wayland/wayland-protocols_%.bbappend
new file mode 100644
index 0000000..c1789a0
--- /dev/null
+++ b/recipes-graphics/wayland/wayland-protocols_%.bbappend
@@ -0,0 +1,3 @@
+PV = "1.23"
+SRC_URI[sha256sum] = "6c0af1915f96f615927a6270d025bd973ff1c58e521e4ca1fc9abfc914633f76"
+
diff --git a/recipes-wlroots/sway/sway_git.bb b/recipes-wlroots/sway/sway_git.bb
index 30a9b2a..b8aef4a 100644
--- a/recipes-wlroots/sway/sway_git.bb
+++ b/recipes-wlroots/sway/sway_git.bb
@@ -37,11 +37,11 @@ RRECOMMENDS:${PN} ?= " \
 "
 
 SRC_URI = " \
-	git://github.com/swaywm/sway.git;protocol=https;branch=v1.6 \
+	git://github.com/swaywm/sway.git;protocol=https;branch=master \
 "
 
-SRCREV = "${PV}"
-PV = "1.6.1"
+SRCREV = "8aae6a8eab95bf39f37a8a8048cbb1e1954484d3"
+PV = "1.6.1+${SRCREV}"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
diff --git a/recipes-wlroots/wlroots/wlroots_git.bb b/recipes-wlroots/wlroots/wlroots_git.bb
index 8d48a0c..3f47725 100644
--- a/recipes-wlroots/wlroots/wlroots_git.bb
+++ b/recipes-wlroots/wlroots/wlroots_git.bb
@@ -24,16 +24,17 @@ DEPENDS += " \
 "
 
 PACKAGECONFIG[gles2] = "-Drenderers=gles2"
-PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,xcb-util-renderutil"
+PACKAGECONFIG[x11] = "-Dbackends=x11,,xcb-util-renderutil"
 PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg xcb-util-wm"
+PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false"
 
 PACKAGECONFIG ?= " \
 	gles2 \
 "
 
-SRC_URI = "git://github.com/swaywm/wlroots.git;branch=0.14;protocol=https"
-SRCREV = "${PV}"
-PV = "0.14.1"
+SRC_URI = "git://github.com/swaywm/wlroots.git;branch=master;protocol=https"
+SRCREV = "13cdb84ee8df248db3b303fd4d1c0e3e75db2794"
+PV = "0.14.1+${SRCREV}"
 
 S = "${WORKDIR}/git"