From 56ceb15ddcb8f191c478b67f79190d7aec54f5f3 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Sat, 8 Jun 2024 12:12:53 +0200
Subject: [PATCH] wlroots: update

---
 ...rm-add-support-for-libliftoff-v0.5.0.patch | 51 -------------------
 recipes-wlroots/wlroots/wlroots_git.bb        |  9 ++--
 2 files changed, 6 insertions(+), 54 deletions(-)
 delete mode 100644 recipes-wlroots/wlroots/wlroots/backend-drm-add-support-for-libliftoff-v0.5.0.patch

diff --git a/recipes-wlroots/wlroots/wlroots/backend-drm-add-support-for-libliftoff-v0.5.0.patch b/recipes-wlroots/wlroots/wlroots/backend-drm-add-support-for-libliftoff-v0.5.0.patch
deleted file mode 100644
index a557d91..0000000
--- a/recipes-wlroots/wlroots/wlroots/backend-drm-add-support-for-libliftoff-v0.5.0.patch
+++ /dev/null
@@ -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
-
diff --git a/recipes-wlroots/wlroots/wlroots_git.bb b/recipes-wlroots/wlroots/wlroots_git.bb
index c716fff..71de5ce 100644
--- a/recipes-wlroots/wlroots/wlroots_git.bb
+++ b/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 = "56ebfde540da9631548773baba87beb716660322"
+SRCREV = "385c9ade5f7a8ce9e5c13f762d56e6bd1c8d1b0a"
 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"