From e0c742901dc848253c1dc9341e6427de844e9e8b 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:50:06 +0100
Subject: [PATCH] device-xiaomi-vince: remove nonfree-firmware subpackage (MR
 4970)

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

diff --git a/device/community/device-xiaomi-vince/APKBUILD b/device/community/device-xiaomi-vince/APKBUILD
index d754f7fc2..8b1809810 100644
--- a/device/community/device-xiaomi-vince/APKBUILD
+++ b/device/community/device-xiaomi-vince/APKBUILD
@@ -3,20 +3,24 @@
 pkgname=device-xiaomi-vince
 pkgdesc="Xiaomi Redmi 5 Plus"
 pkgver=12
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-qcom-adreno-a530
+	firmware-xiaomi-vince
 	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"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	modules-initfs
@@ -30,17 +34,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware"
-	depends="
-		firmware-xiaomi-vince
-		msm-firmware-loader
-		soc-qcom-msm8953-initramfs
-		soc-qcom-msm8953-modem
-	"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 b39437cc3b8cfa2b6aed96bc540404e7623b2a101737708f0f32ed41ec33aa56cc51d267ddfd834e81d3bbc901f4ab82664f3c54ac8281277364a656e22ef421  deviceinfo
 69cfc8db6ea497576085e1b5861c766b5c6cfbd493e4d66aa0bfa29a0e80eeaeb8a465c4841c6a7959796f5a2325e621d60f2c35ccb0741d7934ab310abe807f  modules-initfs