From b78c310e40f0ec1c6c58ac76886a41511af8e668 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@lucaweiss.eu>
Date: Tue, 27 Jan 2026 10:54:02 +0100
Subject: [PATCH] device-fairphone-fp4: start using soc-qcom

Replace some direct dependencies by soc-qcom plus some subpackages
instead. This will also pull in some extra packages and configs that
will be useful on fairphone-fp4.

Remove pd-mapper since the in-kernel pd-mapper has been in use for a
while so the user space service didn't do anything anymore.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7859>
---
 .../community/device-fairphone-fp4/APKBUILD   | 21 +++++--------------
 .../device-fairphone-fp4-openrc.post-install  |  3 ---
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/device/community/device-fairphone-fp4/APKBUILD b/device/community/device-fairphone-fp4/APKBUILD
index 9f03762f4..c8538d4d6 100644
--- a/device/community/device-fairphone-fp4/APKBUILD
+++ b/device/community/device-fairphone-fp4/APKBUILD
@@ -3,13 +3,12 @@ maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
 pkgver=7
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	bootmac
 	firmware-fairphone-fp4-adreno
 	firmware-fairphone-fp4-adsp
 	firmware-fairphone-fp4-bluetooth
@@ -23,15 +22,11 @@ depends="
 	linux-firmware-ath10k
 	linux-postmarketos-qcom-sm6350
 	make-dynpart-mappings
-	mesa-vulkan-freedreno
 	mkbootimg
-	msm-modem
-	msm-modem-uim-selection
-	pd-mapper
 	postmarketos-base
-	qbootctl
-	swclock-offset
-	tqftpserv
+	soc-qcom
+	soc-qcom-modem
+	soc-qcom-qbootctl
 "
 makedepends="devicepkg-dev"
 install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
@@ -55,13 +50,7 @@ package() {
 
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	depends="
-		hexagonrpcd-openrc
-		openrc
-		pd-mapper-openrc
-		qbootctl-openrc
-		tqftpserv-openrc
-	"
+	depends="hexagonrpcd-openrc openrc"
 
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/community/device-fairphone-fp4/device-fairphone-fp4-openrc.post-install b/device/community/device-fairphone-fp4/device-fairphone-fp4-openrc.post-install
index e5687cc9a..973337620 100644
--- a/device/community/device-fairphone-fp4/device-fairphone-fp4-openrc.post-install
+++ b/device/community/device-fairphone-fp4/device-fairphone-fp4-openrc.post-install
@@ -1,5 +1,2 @@
 #!/bin/sh
 rc-update add hexagonrpcd-adsp-sensorspd default
-rc-update add pd-mapper boot
-rc-update add qbootctl default
-rc-update add tqftpserv boot