From a7ad7962d974df6e7dacb1c80edd3b580e5cae89 Mon Sep 17 00:00:00 2001
From: alikates <alikatees@protonmail.com>
Date: Sat, 5 Jun 2021 20:41:07 +0200
Subject: [PATCH] firmware-xiaomi-daisy: Update APKBUILD and add missing WCNSS
 and GPU firmware (MR 2225)

---
 device/testing/firmware-xiaomi-daisy/APKBUILD | 52 +++++++++----------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/device/testing/firmware-xiaomi-daisy/APKBUILD b/device/testing/firmware-xiaomi-daisy/APKBUILD
index a7c896231..895d27adb 100644
--- a/device/testing/firmware-xiaomi-daisy/APKBUILD
+++ b/device/testing/firmware-xiaomi-daisy/APKBUILD
@@ -1,40 +1,38 @@
 pkgname=firmware-xiaomi-daisy
-pkgver=0.1
-pkgrel=0
+pkgver=1
+pkgrel=1
 pkgdesc="Firmware files for Xiaomi Mi A2 Lite"
 url="https://postmarketos.org"
 arch="aarch64"
 license="proprietary"
 depends="wcnss-wlan"
-_repository="daisy-firmware"
-_commit="10eb55e6dc7b9b6d0b5c98eb0d22238707cd43b4"
-source="$pkgname-$_commit.tar.gz::https://github.com/NotLugozzi/daisy-firmware/archive/$_commit.tar.gz"
+_repository="firmware-xiaomi-daisy"
+_commit="9ae200b57743088f83a6f2b02a6b7ce4596a77d6"
+source="$pkgname-$_commit.tar.gz::https://github.com/alikates/firmware-xiaomi-daisy/archive/$_commit.tar.gz"
 options="!strip !check !archcheck !spdx"
-builddir="$srcdir/daisy-firmware-$_commit"
+builddir="$srcdir/firmware-xiaomi-daisy-$_commit"
 
-_files="wcnss.b00 wcnss.b01 wcnss.b02 wcnss.b04 wcnss.b06
-	wcnss.b09 wcnss.b10 wcnss.b11 wcnss.b12 wcnss.mdt
-	adsp.b00 adsp.b01 adsp.b02 adsp.b03 adsp.b04
-	adsp.b05 adsp.b06 adsp.b07 adsp.b08 adsp.b09
-	adsp.b10 adsp.b11 adsp.b12 adsp.b13 adsp.b14 adsp.mdt
-	qdsp6m.qdb
-	a506_zap.b00 a506_zap.b01 a506_zap.b02 a506_zap.mdt"
-_files_prima="WCNSS_wlan_dictionary.dat
-	WCNSS_qcom_cfg.ini
-	WCNSS_qcom_wlan_nv.bin"
+_fwdir="/lib/firmware/postmarketos"
 
 package() {
-	# /lib/firmware/postmarketos
-	for _i in $_files; do
-		install -Dm0755 "$_i" \
-			"$pkgdir"/lib/firmware/postmarketos/"$_i"
-	done
+	echo $source
 
-	# /lib/firmware/postmarketos/wlan/prima
-	for _i in $_files_prima; do
-		install -Dm0755 wlan/prima/"$_i" \
-			"$pkgdir"/lib/firmware/postmarketos/wlan/prima/"$_i"
-	done
+	# Modem firmware
+	install -Dm0644 modem/mba.mbn -t "$pkgdir/$_fwdir"
+	install -Dm0644 modem/modem.* -t "$pkgdir/$_fwdir"
+
+	# ADSP firmware
+	install -Dm0644 adsp/adsp.* -t "$pkgdir/$_fwdir"
+
+	# GPU and video acceleration firmwares
+	install -Dm0644 gpu/a5* -t "$pkgdir/$_fwdir"
+	install -Dm0644 gpu/venus.* -t "$pkgdir/$_fwdir"
+
+	# Wifi/BT firmware
+	install -Dm0644 wcnss/WCNSS_qcom_wlan_nv.bin -t "$pkgdir/$_fwdir"/wlan/prima
+	install -Dm0644 wcnss/wcnss.* -t "$pkgdir/$_fwdir"
 }
 
-sha512sums="a0216a84ebf10a6ab9ac793f322dd50698c6e80c82c284eeda0ac3e4a50b618cb5472f60450ce65c23653cd32a49a27e2fd195d67e55e0d34c9caffadca16a5c  firmware-xiaomi-daisy-10eb55e6dc7b9b6d0b5c98eb0d22238707cd43b4.tar.gz"
+sha512sums="
+0778b0c4a7e836c9e0cef842dda2fd9d5eba4693cd875a605413267690d48d9b7ea86b1ece0471e55e5c49d1b3645bee1aa735ba164d0120bdfc94ffffa7e16b  firmware-xiaomi-daisy-9ae200b57743088f83a6f2b02a6b7ce4596a77d6.tar.gz
+"