From 87891cc569f50901f6da38aace2ca8f9b79a0c89 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Thu, 8 Dec 2022 07:49:12 +0100
Subject: [PATCH] wayfire: update; build with shared wlroots

---
 recipes-wlroots/wayfire/wayfire_git.bb   | 9 +++++----
 recipes-wlroots/wayfire/wcm_git.bb       | 2 +-
 recipes-wlroots/wayfire/wf-config_git.bb | 5 ++---
 recipes-wlroots/wayfire/wf-shell_git.bb  | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/recipes-wlroots/wayfire/wayfire_git.bb b/recipes-wlroots/wayfire/wayfire_git.bb
index 9a6c55b..792ae08 100644
--- a/recipes-wlroots/wayfire/wayfire_git.bb
+++ b/recipes-wlroots/wayfire/wayfire_git.bb
@@ -37,7 +37,7 @@ RRECOMMENDS:${PN} += " \
 
 PACKAGECONFIG[gles32] = "-Denable_gles32=true,-Denable_gles32=false"
 PACKAGECONFIG[use_system_wfconfig] = "-Duse_system_wfconfig=enabled,-Duse_system_wfconfig=disabled,wf-config"
-PACKAGECONFIG[use_system_wlroots] = "-Duse_system_wlroots=enabled,-Duse_system_wlroots=disabled,wlroots"
+PACKAGECONFIG[use_system_wlroots] = "-Duse_system_wlroots=enabled,-Duse_system_wlroots=disabled,wlroots-0.16"
 PACKAGECONFIG[x11] = "-Dxwayland=enabled,-Dxwayland=disabled,xwayland xcb-util-renderutil xcb-util-wm"
 PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers glslang-native"
 
@@ -45,12 +45,13 @@ PACKAGECONFIG ?= " \
 	${@bb.utils.filter('DISTRO_FEATURES', 'vulkan x11', d)} \
 	gles32 \
 	use_system_wfconfig \
+	use_system_wlroots \
 "
 
-SRC_URI = "gitsm://github.com/WayfireWM/wayfire.git;protocol=https;branch=master"
+SRC_URI = "gitsm://github.com/WayfireWM/wayfire.git;protocol=https;nobranch=1"
 
-SRCREV = "1bb46e52841f592e06890e054db64e796aaa0094"
-PV = "0.8.0"
+SRCREV = "1e9092b5ffe878d1cdecefa1997de4a665cf6212"
+PV = "0.7.5"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
diff --git a/recipes-wlroots/wayfire/wcm_git.bb b/recipes-wlroots/wayfire/wcm_git.bb
index ecec904..16729af 100644
--- a/recipes-wlroots/wayfire/wcm_git.bb
+++ b/recipes-wlroots/wayfire/wcm_git.bb
@@ -19,7 +19,7 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 SRC_URI = "gitsm://github.com/WayfireWM/wcm.git;protocol=https;branch=master"
 SRCREV = "5a82f0a0c76c7878f8a5e78dd02dc563202547a0"
 S = "${WORKDIR}/git"
-PV = "0.8.0"
+PV = "0.7.0"
 
 inherit meson pkgconfig features_check
 
diff --git a/recipes-wlroots/wayfire/wf-config_git.bb b/recipes-wlroots/wayfire/wf-config_git.bb
index 59582be..0594945 100644
--- a/recipes-wlroots/wayfire/wf-config_git.bb
+++ b/recipes-wlroots/wayfire/wf-config_git.bb
@@ -15,8 +15,8 @@ DEPENDS = " \
 REQUIRED_DISTRO_FEATURES = "wayland"
 
 SRC_URI = "git://github.com/WayfireWM/wf-config.git;protocol=https;branch=master"
-SRCREV = "578b0bf3c81ef8f94e5e9b4f427720846bc7a5c5"
-PV = "0.8.0"
+SRCREV = "62e3897f207f49b1a3bbb85ba4b11d9fea239ec1"
+PV = "0.7.1"
 
 S = "${WORKDIR}/git"
 
@@ -25,4 +25,3 @@ inherit meson pkgconfig features_check
 EXTRA_OEMESON += "--buildtype release"
 
 BBCLASSEXTEND = ""
-
diff --git a/recipes-wlroots/wayfire/wf-shell_git.bb b/recipes-wlroots/wayfire/wf-shell_git.bb
index c117ded..3916e96 100644
--- a/recipes-wlroots/wayfire/wf-shell_git.bb
+++ b/recipes-wlroots/wayfire/wf-shell_git.bb
@@ -23,7 +23,7 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 SRC_URI = "gitsm://github.com/WayfireWM/wf-shell.git;protocol=https;branch=master"
 SRCREV = "c9639087aca3ad69bbd8f56f4213768639b4c8d0"
 S = "${WORKDIR}/git"
-PV = "0.8.0"
+PV = "0.7.0"
 
 inherit meson pkgconfig features_check