From c6306cb9bbbf3bcb654f05b140e45960d9cdfb30 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Thu, 15 Feb 2024 16:10:17 -0800
Subject: [PATCH] community/oem-*: add firmware dependencies (MR 4794)

---
 device/community/oem-amd/APKBUILD   | 20 ++++----------------
 device/community/oem-intel/APKBUILD | 21 +++++----------------
 2 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/device/community/oem-amd/APKBUILD b/device/community/oem-amd/APKBUILD
index d9d375c36..740a4c934 100644
--- a/device/community/oem-amd/APKBUILD
+++ b/device/community/oem-amd/APKBUILD
@@ -2,22 +2,20 @@
 pkgname=oem-amd
 pkgdesc="AMD device support"
 pkgver=2
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
 options="!check !archcheck"
-# linux-firmware-none prevents all of linux-firmware-* from being installed by
-# default
 depends="
 	alsa-ucm-conf
-	linux-firmware-none
+	amd-ucode
+	linux-firmware-amdgpu
 "
 subpackages="
 	$pkgname-libva
-	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-vulkan
-	"
+"
 source="
 	00-amdgpu-firmware.files
 	00-oem-amd.modules
@@ -47,16 +45,6 @@ vulkan() {
 	mkdir "$subpkgdir"
 }
 
-nonfree_firmware() {
-	pkgdesc="Firmware for AMD devices"
-	depends="
-		amd-ucode
-		linux-firmware-amdgpu
-	"
-
-	mkdir -p "$subpkgdir"
-}
-
 sha512sums="
 38c53d91a60d0402d4cc5428d65e1e8c26360c481c70b34593b1812c87241c32e91904a3bd31fbfe507f7fdb8b50c909eaad8c4c3a37ca962760567329f7f6ee  00-amdgpu-firmware.files
 f56b5293f88727bb4fcceb2a347527402dd0938e96403461b1e2a6821cc00a4e680f58770addd7ba1ded20a187f91ccfd6270bc8bd28c6eae75cc075952361ca  00-oem-amd.modules
diff --git a/device/community/oem-intel/APKBUILD b/device/community/oem-intel/APKBUILD
index a7cde6969..3b4cf135d 100644
--- a/device/community/oem-intel/APKBUILD
+++ b/device/community/oem-intel/APKBUILD
@@ -2,23 +2,22 @@
 pkgname=oem-intel
 pkgdesc="Intel device support"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
 options="!check !archcheck"
-# linux-firmware-none prevents all of linux-firmware-* from being installed by
-# default
 depends="
 	alsa-ucm-conf
-	linux-firmware-none
+	intel-ucode
+	linux-firmware-i915
+	linux-firmware-intel
 	sof-firmware
 "
 subpackages="
 	$pkgname-libva
-	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-vulkan
-	"
+"
 source="00-oem-intel.modules"
 
 package() {
@@ -42,16 +41,6 @@ vulkan() {
 	mkdir "$subpkgdir"
 }
 
-nonfree_firmware() {
-	pkgdesc="Firmware for Intel devices"
-	depends="
-		intel-ucode
-		linux-firmware-i915
-		linux-firmware-intel
-	"
-
-	mkdir -p "$subpkgdir"
-}
 sha512sums="
 48b8c0454c8c80e7ad0ebd139c01790eed3fbd4265bf4ce64882d354b091ac7f63084eaf2b00d1244a7a692c73fa900193724577f9a8d753fa8b6743fe1c8990  00-oem-intel.modules
 "