Re: [PR PATCH] [Updated] sof-firmware: update to 1.6rc3; New package: alsa-ucm-conf-1.2.4

[cinerea0 <cinerea0@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 830 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages sof
https://github.com/void-linux/void-packages/pull/26003

sof-firmware: update to 1.6rc3; New package: alsa-ucm-conf-1.2.4
In addition to updating this package to version 1.6, this commit incorporates unmerged fixes proposed in #24776 and #24271. It also fixes a distfile error regarding pulling from a branch vs pulling from a commit. I would have pinned the distfile to a release tag, but unfortunately the sof-firmware project does not yet use those, though they are aware of the problem as shown by https://github.com/thesofproject/sof-bin/issues/21.

Closes #24776
Closes #24271
Closes #26419

A patch file from https://github.com/void-linux/void-packages/pull/26003.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sof-26003.patch --]
[-- Type: text/x-diff, Size: 4115 bytes --]

From 3fbc6d60a0237ad04622e5470004dafa46b421ab Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 10 Dec 2020 02:24:39 -0500
Subject: [PATCH 1/2] New package: alsa-ucm-conf-1.2.4

---
 srcpkgs/alsa-ucm-conf/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/alsa-ucm-conf/template

diff --git a/srcpkgs/alsa-ucm-conf/template b/srcpkgs/alsa-ucm-conf/template
new file mode 100644
index 00000000000..1a222b9e3cc
--- /dev/null
+++ b/srcpkgs/alsa-ucm-conf/template
@@ -0,0 +1,18 @@
+# Template file for 'alsa-ucm-conf'
+pkgname=alsa-ucm-conf
+version=1.2.4
+revision=1
+short_desc="ALSA Use Case Manager topology configurations"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/alsa-project/alsa-ucm-conf"
+distfiles="https://www.alsa-project.org/files/pub/lib/${pkgname}-${version}.tar.bz2"
+checksum=2c3b535c77dcb9aaf62a61f4f8324f1ab184162f105f7ec9ed1e37c742fcd340
+
+do_install() {
+	vdoc ucm2/README.md
+	rm ucm2/README.md
+	vmkdir usr/share/alsa
+	vcopy ucm2 usr/share/alsa
+	vlicense LICENSE
+}

From bfb0b7e948fde2a358e4715f51d3f93ec9bad0dc Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 10 Dec 2020 02:28:21 -0500
Subject: [PATCH 2/2]  sof-firmware: update to 1.6rc3, Closes #24776, Closes
 #24271

---
 srcpkgs/sof-firmware/template | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index 00dfd262191..7ab46e76aa5 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,34 +1,40 @@
 # Template file for 'sof-firmware'
 pkgname=sof-firmware
-version=1.5.1
+version=1.6rc3
 revision=1
+_major=${version%rc*}
+_minor=${version#${_major}}
 archs="i686* x86_64*"
-wrksrc=sof-bin-stable-v${version}
+wrksrc="sof-bin-${_major}-${_minor}"
+depends="alsa-ucm-conf"
 short_desc="Sound Open Firmware and topology binaries"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://thesofproject.github.io/latest/index.html"
-distfiles="https://github.com/thesofproject/sof-bin/archive/stable-v${version}.tar.gz"
-checksum=270125fb621b9919de4190f53a86de5dc1163dcf839c349f4b22724a5a9c1fb1
+distfiles="https://github.com/thesofproject/sof-bin/archive/v${_major}-${_minor}.tar.gz"
+checksum=daefbeedfb26aa45ef73cc89d90f33dfb4c797244d40a00c8ac652ca3a5b4dce
 
 do_install() {
 	local intel_path="lib/firmware/intel"
-	for f in ${intel_path}/sof/v${version}/*.{ldc,ri}; do
+	for f in ${intel_path}/sof/v${_major}/*.{ldc,ri}; do
 		vinstall ${f} 0644 /usr/${intel_path}/sof
 	done
-	for f in ${intel_path}/sof/v${version}/intel-signed/*; do
+	for f in ${intel_path}/sof/v${_major}/intel-signed/*; do
 		vinstall ${f} 0644 /usr/${intel_path}/sof/intel-signed
 	done
-	for f in ${intel_path}/sof/v${version}/public-signed/*; do
+	for f in ${intel_path}/sof/v${_major}/public-signed/*; do
 		vinstall ${f} 0644 /usr/${intel_path}/sof/public-signed
 	done
-	for arc in {bdw,byt,cht,apl,cnl,icl}; do
-		ln -s sof-${arc}-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-${arc}.ri
+	for arc in {bdw,byt,cht}; do
+		ln -s sof-${arc}-v${_major}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-${arc}.ri
 	done
-	ln -s sof-apl-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-glk.ri
-	ln -s sof-cnl-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-cfl.ri
-	ln -s sof-cnl-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-cml.ri
-	for f in ${intel_path}/sof-tplg-v${version}/*; do
+	for arc in {apl,cnl,icl}; do
+		ln -s intel-signed/sof-${arc}-v${_major}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-${arc}.ri
+	done
+	ln -s intel-signed/sof-apl-v${_major}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-glk.ri
+	ln -s intel-signed/sof-cnl-v${_major}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-cfl.ri
+	ln -s intel-signed/sof-cnl-v${_major}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-cml.ri
+	for f in ${intel_path}/sof-tplg-v${_major}/*; do
 		vinstall ${f} 0644 /usr/${intel_path}/sof-tplg
 	done
 	vlicense LICENCE.NXP