From 18cd11d7fc87c0c5e897e999443b2fcbaf3aa38a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Sun, 1 Jun 2025 22:08:34 +0200
Subject: [PATCH] main: postmarketos-ui-*: mark UIs with DRM requirement

"pmb:gpu-accel" is deprecated now, replace it with "pmb:drm"

Set "pmb:drm" for UIs to hide them for installations
without DRM support (mostly downstream).

This also bumps the minimum required version for pmbootstrap, since it
requires pmb to support the renamed variable. 2.4.0 is the first
release with such change.

Closes #2999
Closes #1481

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6419

[ci:ignore-count]: The MR just includes many packages.
[ci:skip-vercheck]: Changes don't affect built packages.
[ci:skip-build]: already built successfully in CI
---
 main/postmarketos-ui-asteroid/APKBUILD         | 2 +-
 main/postmarketos-ui-bananui/APKBUILD          | 2 +-
 main/postmarketos-ui-cage/APKBUILD             | 2 +-
 main/postmarketos-ui-cosmic/APKBUILD           | 2 +-
 main/postmarketos-ui-kodi/APKBUILD             | 2 +-
 main/postmarketos-ui-niri/APKBUILD             | 2 +-
 main/postmarketos-ui-phosh/APKBUILD            | 2 +-
 main/postmarketos-ui-plasma-bigscreen/APKBUILD | 2 +-
 main/postmarketos-ui-plasma-mobile/APKBUILD    | 2 +-
 main/postmarketos-ui-sway/APKBUILD             | 4 ++--
 main/postmarketos-ui-sxmo-de-sway/APKBUILD     | 2 +-
 main/postmarketos-ui-weston/APKBUILD           | 2 +-
 pmaports.cfg                                   | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/main/postmarketos-ui-asteroid/APKBUILD b/main/postmarketos-ui-asteroid/APKBUILD
index ef6af7483..c8d76ac02 100644
--- a/main/postmarketos-ui-asteroid/APKBUILD
+++ b/main/postmarketos-ui-asteroid/APKBUILD
@@ -40,7 +40,7 @@ source="
 	asteroid-launcher-wrapper.sh
 	gtk-app-wayland.sh
 	"
-options="!check pmb:systemd"
+options="!check pmb:drm pmb:systemd"
 
 package() {
 	install -Dm755 "$srcdir"/asteroid-launcher-wrapper.sh "$pkgdir"/usr/bin/asteroid-launcher-wrapper
diff --git a/main/postmarketos-ui-bananui/APKBUILD b/main/postmarketos-ui-bananui/APKBUILD
index 31bcb57e1..02f85737b 100644
--- a/main/postmarketos-ui-bananui/APKBUILD
+++ b/main/postmarketos-ui-bananui/APKBUILD
@@ -32,7 +32,7 @@ _pmb_groups="
 	wroomd
 	"
 subpackages="$pkgname-openrc"
-options="!check"
+options="!check pmb:drm"
 
 package() {
 	mkdir -p "$pkgdir"
diff --git a/main/postmarketos-ui-cage/APKBUILD b/main/postmarketos-ui-cage/APKBUILD
index 0eb54dec0..104016abe 100644
--- a/main/postmarketos-ui-cage/APKBUILD
+++ b/main/postmarketos-ui-cage/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="(Wayland) Kiosk WM"
 arch="all"
 url="https://postmarketos.org/"
 license="GPL-3.0-or-later"
-options="!check"
+options="!check pmb:drm"
 depends="postmarketos-base-ui-cage"
 # https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues/2347
 _pmb_groups="seat"
diff --git a/main/postmarketos-ui-cosmic/APKBUILD b/main/postmarketos-ui-cosmic/APKBUILD
index 042c84241..f9dc2d550 100644
--- a/main/postmarketos-ui-cosmic/APKBUILD
+++ b/main/postmarketos-ui-cosmic/APKBUILD
@@ -41,7 +41,7 @@ source="
 	favorites.conf
 	wallpaper.conf
 "
-options="!check pmb:gpu-accel pmb:systemd"
+options="!check pmb:drm pmb:systemd"
 replaces="
 	cosmic-applets
 	cosmic-bg
diff --git a/main/postmarketos-ui-kodi/APKBUILD b/main/postmarketos-ui-kodi/APKBUILD
index e95418440..6a81c1788 100644
--- a/main/postmarketos-ui-kodi/APKBUILD
+++ b/main/postmarketos-ui-kodi/APKBUILD
@@ -20,7 +20,7 @@ depends="
 	"
 subpackages="$pkgname-openrc"
 source="automount-media.rules"
-options="!check pmb:gpu-accel pmb:systemd"
+options="!check pmb:drm pmb:systemd"
 
 package() {
 	install -Dm 644 automount-media.rules \
diff --git a/main/postmarketos-ui-niri/APKBUILD b/main/postmarketos-ui-niri/APKBUILD
index 18e21a298..8901c5832 100644
--- a/main/postmarketos-ui-niri/APKBUILD
+++ b/main/postmarketos-ui-niri/APKBUILD
@@ -37,7 +37,7 @@ source="
 	wlgreet.toml
 	"
 # No tests
-options="!check pmb:gpu-accel pmb:systemd"
+options="!check pmb:drm pmb:systemd"
 
 package() {
 	# niri configuration for the greeter
diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD
index 21657dda1..1ec362fc8 100644
--- a/main/postmarketos-ui-phosh/APKBUILD
+++ b/main/postmarketos-ui-phosh/APKBUILD
@@ -36,7 +36,7 @@ source="
 	mimeapps.list
 	udiskie.desktop
 	"
-options="!check pmb:gpu-accel pmb:systemd"
+options="!check pmb:drm pmb:systemd"
 subpackages="$pkgname-openrc $pkgname-systemd"
 
 package() {
diff --git a/main/postmarketos-ui-plasma-bigscreen/APKBUILD b/main/postmarketos-ui-plasma-bigscreen/APKBUILD
index 1f791144a..2e93841ff 100644
--- a/main/postmarketos-ui-plasma-bigscreen/APKBUILD
+++ b/main/postmarketos-ui-plasma-bigscreen/APKBUILD
@@ -26,7 +26,7 @@ source="$pkgname-$_commit_configs.tar.gz::https://invent.kde.org/plasma-bigscree
 	qtlogging.ini
 	nymphcast.desktop
 	"
-options="!check pmb:gpu-accel"
+options="!check pmb:drm"
 
 package() {
 	install -Dm644 -t "$pkgdir"/etc/xdg/QtProject \
diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD
index 369cabdbc..6e23b1fd0 100644
--- a/main/postmarketos-ui-plasma-mobile/APKBUILD
+++ b/main/postmarketos-ui-plasma-mobile/APKBUILD
@@ -36,7 +36,7 @@ source="
 	"
 subpackages="$pkgname-extras $pkgname-openrc"
 replaces="plasma-mobile"
-options="!check pmb:gpu-accel pmb:systemd"
+options="!check pmb:drm pmb:systemd"
 
 package() {
 	install -Dm644 \
diff --git a/main/postmarketos-ui-sway/APKBUILD b/main/postmarketos-ui-sway/APKBUILD
index bdc397bc4..0aacc7b2c 100644
--- a/main/postmarketos-ui-sway/APKBUILD
+++ b/main/postmarketos-ui-sway/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=postmarketos-ui-sway
 pkgver=3.1
 pkgrel=10
-pkgdesc="(Wayland) Tiling WM, drop-in replacement for i3wm (DOES NOT RUN WITHOUT HW ACCELERATION!)"
+pkgdesc="(Wayland) Tiling WM, drop-in replacement for i3wm"
 url="https://postmarketos.org"
 arch="noarch"
 license="GPL-3.0-or-later"
@@ -37,7 +37,7 @@ source="
 	etc-sway-config
 	etc-sway-config.d-00-logo-key.conf
 	"
-options="!check pmb:gpu-accel" # no testsuite
+options="!check pmb:drm" # no testsuite
 replaces="sway"
 
 package() {
diff --git a/main/postmarketos-ui-sxmo-de-sway/APKBUILD b/main/postmarketos-ui-sxmo-de-sway/APKBUILD
index 131e4a31b..c1fde1a9a 100644
--- a/main/postmarketos-ui-sxmo-de-sway/APKBUILD
+++ b/main/postmarketos-ui-sxmo-de-sway/APKBUILD
@@ -40,7 +40,7 @@ _pmb_recommends="
 	"
 provides="postmarketos-ui-sxmo"
 provider_priority=10
-options="!check"
+options="!check pmb:drm"
 subpackages="$pkgname-openrc"
 
 package() {
diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD
index f95a4d030..c76c71c59 100644
--- a/main/postmarketos-ui-weston/APKBUILD
+++ b/main/postmarketos-ui-weston/APKBUILD
@@ -31,7 +31,7 @@ _pmb_recommends="htop
 	"
 subpackages="$pkgname-openrc"
 source="start_weston.sh weston.ini.default"
-options="!check pmb:gpu-accel" # Meta package, no test suite
+options="!check pmb:drm" # Meta package, no test suite
 
 package() {
 	install -Dm755 "$srcdir"/start_weston.sh \
diff --git a/pmaports.cfg b/pmaports.cfg
index f55b3af49..c1f1924e2 100644
--- a/pmaports.cfg
+++ b/pmaports.cfg
@@ -1,7 +1,7 @@
 # Reference: https://postmarketos.org/pmaports.cfg
 [pmaports]
 version=7
-pmbootstrap_min_version=2.3.3
+pmbootstrap_min_version=3.4.0
 channel=edge
 supported_root_filesystems=btrfs,ext4,f2fs
 supported_firewall=nftables