soc-qcom-msm8996: refactor to stop using nonfree-firmware logic

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8961>

device/testing/device-xiaomi-natrium/APKBUILD

@@ -12,12 +12,13 @@ depends="
 	firmware-xiaomi-natrium
 	linux-firmware-ath10k
 	linux-firmware-qca
+	linux-firmware-qcom
 	linux-postmarketos-qcom-msm8996
 	mesa-egl
 	mkbootimg
+	msm-modem
 	postmarketos-base
 	soc-qcom-msm8996
-	soc-qcom-msm8996-nonfree-firmware
 	soc-qcom-msm8996-ucm
 "
 makedepends="devicepkg-dev"

device/testing/device-xiaomi-scorpio/APKBUILD

@@ -13,14 +13,15 @@ depends="
 	firmware-xiaomi-scorpio
 	linux-firmware-ath10k
 	linux-firmware-qca
+	linux-firmware-qcom
 	linux-postmarketos-qcom-msm8996
 	megapixels
 	mesa-egl
 	mkbootimg
+	msm-modem
 	postmarketos-base
 	postprocessd
 	soc-qcom-msm8996
-	soc-qcom-msm8996-nonfree-firmware
 	soc-qcom-msm8996-ucm
 	"
 makedepends="devicepkg-dev"

device/testing/soc-qcom-msm8996/APKBUILD

@@ -1,16 +1,13 @@
 maintainer="Yassine Oudjana (Tooniis) <y.oudjana@protonmail.com>"
 pkgname=soc-qcom-msm8996
 pkgdesc="Common package for Qualcomm MSM8996 devices"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
 options="!check !archcheck !tracedeps"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-ucm
-	"
+subpackages="$pkgname-ucm"
 
 _ucm_commit="9f2fd084eccbb01c5bffa6dbc50dcd2b116371d8"
 source="
@@ -21,12 +18,6 @@ package() {
 	mkdir -p "$pkgdir"
 }
 
-nonfree_firmware() {
-	pkgdesc="Non-free firmware for GPU and modem"
-	depends="linux-firmware-qcom msm-modem"
-	mkdir "$subpkgdir"
-}
-
 ucm() {
 	provides="alsa-ucm-conf"
 	provider_priority=1