From 580736396457c8c59d44fc8bf4f654dd9649602c Mon Sep 17 00:00:00 2001
From: silver <silver@silvermag.net>
Date: Sat, 1 Feb 2020 10:10:39 -0800
Subject: [PATCH] samsung-apexq: add wifi firmware package (!919)

---
 device/device-samsung-apexq/APKBUILD     | 11 +++++++++--
 device/device-samsung-apexq/deviceinfo   |  1 +
 firmware/firmware-samsung-apexq/APKBUILD | 25 ++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 firmware/firmware-samsung-apexq/APKBUILD

diff --git a/device/device-samsung-apexq/APKBUILD b/device/device-samsung-apexq/APKBUILD
index f1ace4556..9cc762025 100644
--- a/device/device-samsung-apexq/APKBUILD
+++ b/device/device-samsung-apexq/APKBUILD
@@ -3,7 +3,7 @@
 pkgname="device-samsung-apexq"
 pkgdesc="Samsung Galaxy S Relay 4G"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
@@ -11,6 +11,7 @@ options="!check !archcheck"
 depends="postmarketos-base linux-samsung-apexq mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -20,5 +21,11 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-samsung-apexq"
+	mkdir "$subpkgdir"
+}
 
-sha512sums="40d7404443f650c41647c7d78fd3a6aed4601d66d4d55876b4185fa41195781623900601943c8cd225cdc0ab1858c3a41d6e2c9438fb2692068f43f3c97c426a  deviceinfo"
+
+sha512sums="10550d2dd73c27eaa538160b52345ceecf8c63136cf9d090b7d35c34533fbbe11395c2e1d10c67344239c9a0f2a43771eca38197b1211571c1573e7feaaabf66  deviceinfo"
diff --git a/device/device-samsung-apexq/deviceinfo b/device/device-samsung-apexq/deviceinfo
index 2f6c8a5c9..c57cdd017 100644
--- a/device/device-samsung-apexq/deviceinfo
+++ b/device/device-samsung-apexq/deviceinfo
@@ -6,6 +6,7 @@ deviceinfo_name="Samsung Galaxy S Relay 4G"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-apexq"
 deviceinfo_date=""
+deviceinfo_nonfree="????"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_arch="armhf"
diff --git a/firmware/firmware-samsung-apexq/APKBUILD b/firmware/firmware-samsung-apexq/APKBUILD
new file mode 100644
index 000000000..5c9128f13
--- /dev/null
+++ b/firmware/firmware-samsung-apexq/APKBUILD
@@ -0,0 +1,25 @@
+# Contributor: silver <silver@silvermag.net>
+pkgname=firmware-samsung-apexq
+pkgver=1
+pkgrel=0
+_commit="f7e14fda78f8b3db294a26e02fade3c77009907c"
+pkgdesc="Samsung Galaxy S Relay 4G Firmware"
+url="https://gitlab.com/5ilver/apexqwififw"
+arch="armhf"
+license="proprietary"
+source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/apexqwififw.tar.gz"
+options="!check !strip !archcheck !spdx"
+builddir="$srcdir/apexqwififw-$_commit"
+depends="wcnss-wlan"
+
+package() {
+	# Wifi
+	for file in wcnss.b00 wcnss.b01 wcnss.b02 wcnss.b04 wcnss.b05 wcnss.mdt \
+		wlan/prima/WCNSS_qcom_cfg.ini wlan/prima/WCNSS_qcom_wlan_nv.bin_ \
+		wlan/prima/WCNSS_qcom_wlan_nv.bin wlan/prima/WCNSS_cfg.dat;
+	do
+		install -Dm644 "$file" "$pkgdir"/lib/firmware/postmarketos/"$file"
+	done
+}
+
+sha512sums="cf1b0c7015e38528e5646a0d81a785fd19dae2d044ea1e0e325bcd73caf733ae851ccaedbbdb3260a89de9e34532f1f678f178ed66791ea780c83a80fa47141d  firmware-samsung-apexq-f7e14fda78f8b3db294a26e02fade3c77009907c.tar.gz"