[packages/cage] up to 0.2.1

[atler]

commit d6dfb9dbe25b9f3d314b1234548ad33f56de4df5
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Oct 1 18:26:10 2025 +0200

    up to 0.2.1
    
    - drop system_wlroots bcond to avoid maintenance overhead. different
      wlroots versions are easily installed in parallel anyway.

 cage.spec         | 61 +++++--------------------------------------------------
 wlroots-x32.patch | 14 -------------
 2 files changed, 5 insertions(+), 70 deletions(-)
---
diff --git a/cage.spec b/cage.spec
index a27c10a..722e440 100644
--- a/cage.spec
+++ b/cage.spec
@@ -1,19 +1,11 @@
-# Conditional build:
-%bcond_without	system_wlroots	# Link with system wlroots
-
-%define		wlroots_ver	0.18.2
-
 Summary:	A Wayland kiosk
 Name:		cage
-Version:	0.2.0
+Version:	0.2.1
 Release:	1
 License:	MIT
 Group:		Applications
 Source0:	https://github.com/cage-kiosk/cage/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	35843f54f096322d78d7802c94258bc4
-Source1:	https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/%{wlroots_ver}/downloads/wlroots-%{wlroots_ver}.tar.gz
-# Source1-md5:	f230118c020e3ac40813823d4156d324
-Patch0:		wlroots-x32.patch
+# Source0-md5:	a7f914087ff50d6e0025479c1ebf37c1
 URL:		https://www.hjdskes.nl/projects/cage/
 BuildRequires:	meson >= 0.58.1
 BuildRequires:	ninja
@@ -24,36 +16,8 @@ BuildRequires:	scdoc >= 1.9.2
 BuildRequires:	wayland-devel
 BuildRequires:	wayland-protocols >= 1.14
 BuildRequires:	xorg-lib-libxkbcommon-devel
-%if %{with system_wlroots}
-BuildRequires:	wlroots0.18-devel
-%else
-BuildRequires:	EGL-devel
-BuildRequires:	Mesa-libgbm-devel >= 21.1.0
-BuildRequires:	OpenGLESv2-devel
-BuildRequires:	Vulkan-Loader-devel >= 1.2.182
-BuildRequires:	glslang >= 11.0.0
-BuildRequires:	hwdata >= 0.364
-BuildRequires:	libdrm-devel >= 2.4.113
-BuildRequires:	libinput-devel >= 1.19.0
-BuildRequires:	libseat-devel >= 0.2.0
-BuildRequires:	libxcb-devel
-BuildRequires:	pixman-devel
-BuildRequires:	udev-devel
-BuildRequires:	wayland-protocols >= 1.27
-BuildRequires:	xcb-util-errors-devel
-BuildRequires:	xcb-util-renderutil-devel
-BuildRequires:	xcb-util-wm-devel
-BuildRequires:	xorg-xserver-Xwayland-devel
-%endif
+BuildRequires:	wlroots0.19-devel
 Requires:	xorg-xserver-Xwayland
-%if %{without system_wlroots}
-Requires:	Mesa-libgbm >= 21.1.0
-Requires:	Vulkan-Loader >= 1.2.182
-Requires:	libdrm >= 2.4.113
-Requires:	libinput >= 1.19.0
-Requires:	libseat >= 0.2.0
-Requires:	wayland >= 1.21
-%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -65,21 +29,10 @@ kiosk compositor displays a single maximized application at a time and
 prevents the user from interacting with anything but this application.
 
 %prep
-%setup -q %{!?with_system_wlroots:-a1}
-
-%if %{without system_wlroots}
-%{__mkdir} subprojects
-%{__mv} wlroots-%{wlroots_ver} subprojects/wlroots
-%patch -P0 -p1 -d subprojects/wlroots
-%endif
+%setup -q
 
 %build
-%meson \
-%if %{without system_wlroots}
-	--force-fallback-for=wlroots \
-	-Dwlroots:default_library=static \
-	-Dwlroots:examples=false
-%endif
+%meson
 
 %meson_build
 
@@ -88,10 +41,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %meson_install
 
-%if %{without system_wlroots}
-%{__rm} -r $RPM_BUILD_ROOT{%{_includedir}/wlroots-0.18,%{_libdir}/libwlroots-0.18.a,%{_pkgconfigdir}/wlroots-0.18.pc}
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
diff --git a/wlroots-x32.patch b/wlroots-x32.patch
deleted file mode 100644
index 4ac71cb..0000000
--- a/wlroots-x32.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- wlroots-0.12.0/util/log.c.orig	2020-11-08 15:01:44.000000000 +0100
-+++ wlroots-0.12.0/util/log.c	2021-02-03 10:32:04.394433021 +0100
-@@ -47,7 +47,11 @@
- 	clock_gettime(CLOCK_MONOTONIC, &ts);
- 	timespec_sub(&ts, &ts, &start_time);
- 
-+#if defined(__x86_64__) && defined(__ILP32__)
-+	fprintf(stderr, "%02d:%02d:%02d.%03lld ", (int)(ts.tv_sec / 60 / 60),
-+#else
- 	fprintf(stderr, "%02d:%02d:%02d.%03ld ", (int)(ts.tv_sec / 60 / 60),
-+#endif
- 		(int)(ts.tv_sec / 60 % 60), (int)(ts.tv_sec % 60),
- 		ts.tv_nsec / 1000000);
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cage.git/commitdiff/d6dfb9dbe25b9f3d314b1234548ad33f56de4df5