From c96e15cd5ec9e2b83f73cdaf4db2911e0601a1f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de>
Date: Tue, 10 Dec 2024 10:22:11 +0100
Subject: [PATCH] cage: Update git and add 0.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The meson option for xwayland was dropped with
d3fb99d6654325ec46277cfdb589f89316bed701. The rework was to make oelint-adv
more happy.

Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 .../cage/{cage-0.1.5.bb => cage.inc}          | 25 ++++++++---------
 recipes-wlroots/cage/cage_0.1.5.bb            | 10 +++++++
 recipes-wlroots/cage/cage_0.2.0.bb            |  7 +++++
 recipes-wlroots/cage/cage_git.bb              | 27 ++++---------------
 4 files changed, 35 insertions(+), 34 deletions(-)
 rename recipes-wlroots/cage/{cage-0.1.5.bb => cage.inc} (51%)
 create mode 100644 recipes-wlroots/cage/cage_0.1.5.bb
 create mode 100644 recipes-wlroots/cage/cage_0.2.0.bb

diff --git a/recipes-wlroots/cage/cage-0.1.5.bb b/recipes-wlroots/cage/cage.inc
similarity index 51%
rename from recipes-wlroots/cage/cage-0.1.5.bb
rename to recipes-wlroots/cage/cage.inc
index 25c31a5..b66bbfd 100644
--- a/recipes-wlroots/cage/cage-0.1.5.bb
+++ b/recipes-wlroots/cage/cage.inc
@@ -1,15 +1,21 @@
 SUMMARY = "Cage: a Wayland kiosk"
+DESCRIPTION = "\
+    Cage is a compositor (window manager) that displays a single maximized \
+    application at a time and prevents the user from interacting with anything \
+    but this application. As such, user input such as moving, resizing, \
+    minimizing and unmaximizing windows is ignored. \
+"
 HOMEPAGE = "https://www.hjdskes.nl/projects/cage/"
+BUGTRACKER = "https://github.com/cage-kiosk/cage/issues"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3d06ce025701c9a0b391f15902ce8ed"
 
-DEPENDS = " \
-    wayland-native \
-    wayland \
-    wayland-protocols \
-    wlroots-0.16 \
-    pixman \
+DEPENDS = "\
     libxkbcommon \
+    pixman \
+    wayland \
+    wayland-native \
+    wayland-protocols \
 "
 
 inherit meson pkgconfig features_check
@@ -17,9 +23,4 @@ inherit meson pkgconfig features_check
 REQUIRED_DISTRO_FEATURES = "wayland"
 
 SRC_URI = "git://github.com/cage-kiosk/cage;branch=master;protocol=https"
-SRCREV = "83ffc574be860527814c595756a558c228a3475d"
-S = "${WORKDIR}/git"
-PV = "0.1.5"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xwayland', d)}"
-PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xserver-xorg,xwayland"
+S = "${UNPACKDIR}/git"
diff --git a/recipes-wlroots/cage/cage_0.1.5.bb b/recipes-wlroots/cage/cage_0.1.5.bb
new file mode 100644
index 0000000..7b20208
--- /dev/null
+++ b/recipes-wlroots/cage/cage_0.1.5.bb
@@ -0,0 +1,10 @@
+require cage.inc
+
+DEPENDS += "\
+    wlroots-0.16 \
+"
+
+SRCREV = "83ffc574be860527814c595756a558c228a3475d"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xwayland', d)}"
+PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xserver-xorg,xwayland"
diff --git a/recipes-wlroots/cage/cage_0.2.0.bb b/recipes-wlroots/cage/cage_0.2.0.bb
new file mode 100644
index 0000000..eb53326
--- /dev/null
+++ b/recipes-wlroots/cage/cage_0.2.0.bb
@@ -0,0 +1,7 @@
+require cage.inc
+
+DEPENDS += "\
+    wlroots-0.18 \
+"
+
+SRCREV = "e128a9f2511644529fa47701a7147d65d9920488"
diff --git a/recipes-wlroots/cage/cage_git.bb b/recipes-wlroots/cage/cage_git.bb
index 62cbc0b..dd333f7 100644
--- a/recipes-wlroots/cage/cage_git.bb
+++ b/recipes-wlroots/cage/cage_git.bb
@@ -1,25 +1,8 @@
-SUMMARY = "Cage: a Wayland kiosk"
-HOMEPAGE = "https://www.hjdskes.nl/projects/cage/"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3d06ce025701c9a0b391f15902ce8ed"
+require cage.inc
 
-DEPENDS = " \
-    wayland-native \
-    wayland \
-    wayland-protocols \
-    wlroots-0.17 \
-    pixman \
-    libxkbcommon \
+DEPENDS += "\
+    wlroots-0.18 \
 "
 
-inherit meson pkgconfig features_check
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-SRC_URI = "git://github.com/cage-kiosk/cage;branch=master;protocol=https"
-SRCREV = "9d43282fa0cd5925a6f9304f0218fd79ae9fcd94"
-PV = "0.1.5+dev"
-S = "${WORKDIR}/git"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xwayland', d)}"
-PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg,xwayland"
+PV = "0.2.0+dev"
+SRCREV = "19157d35649f96aa04d26036a76eaed65de60944"