From b826962b2a9e35a899d56e4d1e0bd2a388bbc018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= <trabarni@gmail.com>
Date: Wed, 27 Mar 2024 20:47:56 +0100
Subject: [PATCH] device-xiaomi-markw: remove nonfree-firmware subpackage (MR
 4970)

Remove nonfree-firmware subpackage and depend on firmware-qcom-adreno-a530.
---
 device/community/device-xiaomi-markw/APKBUILD | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/device/community/device-xiaomi-markw/APKBUILD b/device/community/device-xiaomi-markw/APKBUILD
index a15765ef9..c325da879 100644
--- a/device/community/device-xiaomi-markw/APKBUILD
+++ b/device/community/device-xiaomi-markw/APKBUILD
@@ -3,21 +3,25 @@
 pkgname=device-xiaomi-markw
 pkgdesc="Xiaomi Redmi 4 Prime"
 pkgver=5
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-qcom-adreno-a530
+	firmware-xiaomi-markw
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
+	msm-firmware-loader
 	postmarketos-base
 	soc-qcom-msm8953
+	soc-qcom-msm8953-initramfs
+	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -27,17 +31,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="WiFi, Bluetooth, Modem, Display and GPU Firmware"
-	depends="
-		firmware-xiaomi-markw
-		msm-firmware-loader
-		soc-qcom-msm8953-initramfs
-		soc-qcom-msm8953-modem
-	"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 0d393f07e551058781a67c096b1ad7f252c78e801a2da8752f893f4ea7c24f7aa65bc69f9c80c7be53e615269a7028eb151e7bc3fe79f0c260a4d28e97f10e7d  deviceinfo
 0cba88d7ede62dc7c47feefb27d10e58e4c93498bec97cd274a1d10c4f16dff06c5472ed555170e0392a57c9269cc50bf550523f41bf1ba6c600af533302574b  modules-initfs