Re: [PR PATCH] [Updated] sof-firmware: update to 1.6

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

[-- Attachment #1: Type: text/plain, Size: 778 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.6
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

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: 2400 bytes --]

From 62254e18159fbb3add147186fb62c15b84c93519 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sat, 31 Oct 2020 12:55:56 -0400
Subject: [PATCH] sof-firmware: update to 1.6, Closes #24776, Closes #24271

---
 srcpkgs/sof-firmware/template | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index 00dfd262191..e6e44910f6e 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,15 +1,16 @@
 # Template file for 'sof-firmware'
 pkgname=sof-firmware
-version=1.5.1
+version=1.6
 revision=1
+_githash=47b436af36c18c3b4f409e1d9452aea18e17abc8
 archs="i686* x86_64*"
-wrksrc=sof-bin-stable-v${version}
+wrksrc=sof-bin-${_githash}
 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/${_githash}.tar.gz"
+checksum=3eb522b25f63a9cff67a4f123ed810d95809471b22c3930912eb70394d53b274
 
 do_install() {
 	local intel_path="lib/firmware/intel"
@@ -22,12 +23,15 @@ do_install() {
 	for f in ${intel_path}/sof/v${version}/public-signed/*; do
 		vinstall ${f} 0644 /usr/${intel_path}/sof/public-signed
 	done
-	for arc in {bdw,byt,cht,apl,cnl,icl}; do
+	for arc in {bdw,byt,cht}; do
 		ln -s sof-${arc}-v${version}.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 arc in {apl,cnl,icl}; do
+		ln -s intel-signed/sof-${arc}-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-${arc}.ri
+	done
+	ln -s intel-signed/sof-apl-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-glk.ri
+	ln -s intel-signed/sof-cnl-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-cfl.ri
+	ln -s intel-signed/sof-cnl-v${version}.ri ${DESTDIR}/usr/${intel_path}/sof/sof-cml.ri
 	for f in ${intel_path}/sof-tplg-v${version}/*; do
 		vinstall ${f} 0644 /usr/${intel_path}/sof-tplg
 	done