From 0f52d19d52fa73fc86c2ed6f5b7a6740507a055d 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:46:36 +0100
Subject: [PATCH] device-xiaomi-tissot: remove nonfree-firmware subpackage (MR
 4970)

Remove nonfree-firmware subpackage and depend on firmware-qcom-adreno-a530.
---
 .../community/device-xiaomi-tissot/APKBUILD   | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/device/community/device-xiaomi-tissot/APKBUILD b/device/community/device-xiaomi-tissot/APKBUILD
index d0c59397f..69fac4193 100644
--- a/device/community/device-xiaomi-tissot/APKBUILD
+++ b/device/community/device-xiaomi-tissot/APKBUILD
@@ -5,21 +5,26 @@
 pkgname=device-xiaomi-tissot
 pkgdesc="Xiaomi Mi A1"
 pkgver=6
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-qcom-adreno-a530
+	firmware-xiaomi-tissot
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
+	msm-firmware-loader
 	postmarketos-base
+	qbootctl
 	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
@@ -29,18 +34,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware"
-	depends="
-		firmware-xiaomi-tissot
-		msm-firmware-loader
-		qbootctl
-		soc-qcom-msm8953-initramfs
-		soc-qcom-msm8953-modem
-	"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 e94d5aeae51c697d4483dc1d7a5eb4980a37ad3dec693ddd8f7b829ed5583a200254b393d0337b3180e36289cb4eba60a6667bd3cf08d2c994a03ac3092d22df  deviceinfo
 4284d7c184f364d81a06de962808cb240b713cda11381ddcec5acdfbb4d4962922b64b2f2675ab463961c0510352211ec439a6b9e4ebdc47bf73980133e9626a  modules-initfs