sway: update

recipes-support/hyprland/hyprwayland-scanner_git.bb

@@ -9,8 +9,8 @@ SRC_URI = "git://github.com/hyprwm/hyprwayland-scanner.git;protocol=https;branch
 DEPENDS = "pugixml"
 
 S = "${WORKDIR}/git"
-SRCREV = "b06c0b8e56bd73c42218148efd8600c5e9fd6619"
+SRCREV = "0f30f9eca6e404130988554accbb64d1c9ec877d"
-PV = "0.3.9"
+PV = "0.3.10"
 
 inherit cmake pkgconfig
 

recipes-wlroots/gamescope/gamescope_git.bb

@@ -52,8 +52,8 @@ SRC_URI = "   \
 	file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \
 	file://0001-meson.build-dont-leak-buildpath.patch \
 "
-SRCREV = "e998f26a6fe4439461dfeaa6dd57c5be0bb46953"
+SRCREV = "420eb91387a484fd7b1ea71449091f0480d9e538"
-PV = "3.14.16"
+PV = "3.14.18"
 
 S = "${WORKDIR}/git"
 

recipes-wlroots/hyprland/hyprland_git.bb

@@ -41,7 +41,7 @@ RRECOMMENDS:${PN} ?= " \
 
 SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main"
 
-SRCREV = "098ac916a6314a2b731532e0c85f357e3cf90d2f"
+SRCREV = "6967a31450441fc5605c05db6f65505dace4b263"
 PV = "0.40"
 S = "${WORKDIR}/git"
 

recipes-wlroots/sway/sway_git.bb

@@ -39,7 +39,7 @@ RRECOMMENDS:${PN} ?= " \
 
 SRC_URI = "git://github.com/swaywm/sway.git;protocol=https;branch=master"
 
-SRCREV = "dcdb72757a5ec591c692df5e96c57c51758dbd8f"
+SRCREV = "40ca4150b27a5b94938b6c3d744f74bb26d347f7"
 PV = "1.10-dev"
 S = "${WORKDIR}/git"
 
@@ -53,10 +53,9 @@ PACKAGECONFIG[swaybar] = "-Dswaybar=true,-Dswaybar=false"
 PACKAGECONFIG[swaynag] = "-Dswaynag=true,-Dswaynag=false"
 PACKAGECONFIG[systemd] = "-Dsd-bus-provider=libsystemd,,systemd"
 PACKAGECONFIG[tray] = "-Dtray=enabled,-Dtray=disabled"
-PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm"
 
 PACKAGECONFIG ?= " \
-	${@bb.utils.filter('DISTRO_FEATURES', 'systemd xwayland', d)} \
+	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 	default-wallpaper \
 	gdk-pixbuf \
 "

recipes-wlroots/wlroots/wlroots/backend-drm-add-support-for-libliftoff-v0.5.0.patch

@@ -1,51 +0,0 @@
-From 8b1628adcf530fd5396f62479175e486126efc7c Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Tue, 28 May 2024 00:30:33 +0200
-Subject: [PATCH] backend/drm: add support for libliftoff v0.5.0
-
-Don't require libliftoff 0.5.0 just yet: we want to be able to
-backport this patch.
----
- backend/drm/libliftoff.c | 5 +++++
- backend/drm/meson.build  | 1 +
- 2 files changed, 6 insertions(+)
-
-diff --git a/backend/drm/libliftoff.c b/backend/drm/libliftoff.c
-index c88e1bcee0..74d4f76963 100644
---- a/backend/drm/libliftoff.c
-+++ b/backend/drm/libliftoff.c
-@@ -8,6 +8,7 @@
- #include "backend/drm/drm.h"
- #include "backend/drm/fb.h"
- #include "backend/drm/iface.h"
-+#include "config.h"
- 
- static bool init(struct wlr_drm_backend *drm) {
- 	// TODO: lower log level
-@@ -407,7 +408,11 @@ static bool commit(struct wlr_drm_backend *drm,
- 		struct wlr_drm_connector *conn = state->connectors[i].connector;
- 		struct wlr_drm_crtc *crtc = conn->crtc;
- 
-+#if HAVE_LIBLIFTOFF_0_5
-+		int ret = liftoff_output_apply(crtc->liftoff, req, flags, NULL);
-+#else
- 		int ret = liftoff_output_apply(crtc->liftoff, req, flags);
-+#endif
- 		if (ret != 0) {
- 			wlr_drm_conn_log(conn, test_only ? WLR_DEBUG : WLR_ERROR,
- 				"liftoff_output_apply failed: %s", strerror(-ret));
-diff --git a/backend/drm/meson.build b/backend/drm/meson.build
-index 5d2f2b1f8c..7c00b0f085 100644
---- a/backend/drm/meson.build
-+++ b/backend/drm/meson.build
-@@ -48,6 +48,7 @@ wlr_files += files(
- 
- if libliftoff.found()
- 	wlr_files += files('libliftoff.c')
-+	internal_config.set10('HAVE_LIBLIFTOFF_0_5', libliftoff.version().version_compare('>=0.5.0'))
- endif
- 
- features += { 'drm-backend': true }
--- 
-GitLab
-

recipes-wlroots/wlroots/wlroots_git.bb

@@ -15,7 +15,6 @@ DEPENDS += " \
 	hwdata-native \
 	libdisplay-info \
 	libdrm \
-	libliftoff \
 	libxkbcommon \
 	pixman \
 	seatd \
@@ -27,6 +26,7 @@ DEPENDS += " \
 PACKAGECONFIG[opengl] = ",,virtual/egl virtual/libgles2"
 PACKAGECONFIG[gbm] = ",,virtual/libgbm"
 PACKAGECONFIG[libinput] = ",,libinput"
+PACKAGECONFIG[libliftoff] = "-Dlibliftoff=enabled,-Dlibliftoff=disabled,libliftoff"
 PACKAGECONFIG[systemd] = ",,systemd"
 PACKAGECONFIG[sysvinit] = ",,eudev elogind"
 PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers glslang-native"
@@ -36,11 +36,11 @@ PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xwayland xcb-u
 PACKAGECONFIG ?= " \
 	${@bb.utils.filter('DISTRO_FEATURES', 'systemd vulkan x11 xwayland opengl', d)} \
 	libinput \
+	libliftoff \
 "
 
 SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=master;protocol=https"
-SRC_URI += "file://backend-drm-add-support-for-libliftoff-v0.5.0.patch"
+SRCREV = "385c9ade5f7a8ce9e5c13f762d56e6bd1c8d1b0a"
-SRCREV = "56ebfde540da9631548773baba87beb716660322"
 PV = "0.18.0-dev"
 
 S = "${WORKDIR}/git"
@@ -53,3 +53,6 @@ do_install:append() {
 	install -d ${D}${bindir}
 	install -m 0755 ${B}/tinywl/tinywl ${D}${bindir}
 }
+
+FILES:${PN} += "${libdir}/libwlroots-*.so"
+FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig"