import alsa-sof-firmware-1.8-1.el8

.alsa-sof-firmware.metadata

@@ -1 +1 @@
-0a4150c8e7d680e8711ebe8aaf0ee9ee62f53688 SOURCES/sof-bin-b77c851.tar.gz
+8504748ab38905108597dffcd44b85bbea18c52b SOURCES/sof-bin-v1.8.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/sof-bin-b77c851.tar.gz
+SOURCES/sof-bin-v1.8.tar.gz

SPECS/alsa-sof-firmware.spec

@@ -3,19 +3,23 @@
 %define _binaries_in_noarch_packages_terminate_build   0
 %global _firmwarepath  /usr/lib/firmware
 
+%global sof_ver 1.8
+#global sof_ver_pre rc2
+%global sof_ver_rel %{?sof_ver_pre:.%{sof_ver_pre}}
+%global sof_ver_pkg v%{sof_ver}%{?sof_ver_pre:-%{sof_ver_pre}}
 
-%global sof_version 1.6.1
-%global sof_commit b77c851bc4ec1b6b552eaf1a61a66f3df4a13ab8
-%global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7})
+%global tplg_version 1.2.4
 
 Summary:        Firmware and topology files for Sound Open Firmware project
 Name:           alsa-sof-firmware
-Version:        %{sof_version}
-Release:        1%{?dist}
+Version:        %{sof_ver}
+Release:        1%{?sof_ver_rel}%{?dist}
 # See later in the spec for a breakdown of licensing
 License:        BSD
 URL:            https://github.com/thesofproject/sof-bin
-Source:         https://github.com/thesofproject/sof-bin/archive/%{sof_commit}/sof-bin-%{sof_shortcommit}.tar.gz
+Source:         https://github.com/thesofproject/sof-bin/releases/download/%{sof_ver_pkg}/sof-bin-%{sof_ver_pkg}.tar.gz
+BuildRequires:  alsa-topology >= %{tplg_version}
+BuildRequires:  alsa-topology-utils >= %{tplg_version}
 
 # noarch, since the package is firmware
 BuildArch:      noarch
@@ -32,53 +36,29 @@ License:        BSD
 This package contains the debug files for the Sound Open Firmware project.
 
 %prep
-%autosetup -n sof-bin-%{sof_commit}
+%autosetup -n sof-bin-%{sof_ver_pkg}
 
-cd lib/firmware
+mkdir -p firmware/intel/sof
 
 # we have the version in the package name
-mv intel/sof/v%{sof_version}/* intel/sof
-rmdir intel/sof/v%{sof_version}
-
-# rename intel signed firmware files
-for platform in apl cnl ehl icl tgl; do
-  mv intel/sof/intel-signed/sof-$platform-v%{sof_version}.ri intel/sof/intel-signed/sof-$platform.ri
-  ln -sf intel-signed/sof-$platform.ri intel/sof/sof-$platform.ri
-done
-
-# rename public signed firmware files
-for platform in apl cnl icl tgl; do
-  mv intel/sof/public-signed/sof-$platform-v%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri
-done
-
-# rename unsigned firmware files
-for platform in bdw byt cht; do
-  mv intel/sof/sof-$platform-v%{sof_version}.ri intel/sof/sof-$platform.ri
-done
-
-# rename debug files
-for platform in apl bdw byt cht cnl ehl icl tgl; do
-  mv intel/sof/sof-$platform-v%{sof_version}.ldc intel/sof/sof-$platform.ldc
-done
-
-# add missing symlinks
-ln -s intel-signed/sof-apl.ri intel/sof/sof-glk.ri
-ln -s intel-signed/sof-cnl.ri intel/sof/sof-cml.ri
-ln -s intel-signed/sof-cnl.ri intel/sof/sof-cfl.ri
+mv sof-%{sof_ver_pkg}/* firmware/intel/sof
 
 # move topology files
-rm -f intel/sof-tplg
-mv intel/sof-tplg-v%{sof_version} intel/sof-tplg
+mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg
 
 # remove NXP firmware files
-rm -rf nxp ../../LICENCE.NXP
-rm -rf intel/sof-tplg/sof-imx8*
+rm LICENCE.NXP
+rm -rf firmware/intel/sof-tplg/sof-imx8*
 
 %build
+# SST topology files (not SOF related, but it's a Intel hw support
+# and this package seems a good place to distribute them
+alsatplg -c /usr/share/alsa/topology/hda-dsp/skl_hda_dsp_generic-tplg.conf \
+         -o firmware/skl_hda_dsp_generic-tplg.bin
 
 %install
 mkdir -p %{buildroot}%{_firmwarepath}
-cp -ra lib/firmware/* %{buildroot}%{_firmwarepath}
+cp -ra firmware/* %{buildroot}%{_firmwarepath}
 
 # gather files and directories
 FILEDIR=$(pwd)
@@ -98,6 +78,9 @@ cat alsa-sof-firmware.files
 %doc README*
 %dir %{_firmwarepath}
 
+# Licence: 3-clause BSD
+%{_firmwarepath}/*.bin
+
 # Licence: 3-clause BSD
 # .. for files with suffix .tplg
 %{_firmwarepath}/intel/sof-tplg
@@ -108,6 +91,10 @@ cat alsa-sof-firmware.files
 %files debug -f alsa-sof-firmware.debug-files
 
 %changelog
+* Thu Jul 22 2021 Jaroslav Kysela <perex@perex.cz> - 1.8-1
+- Update to v1.8
+- Add SST Skylake HDA topology binary
+
 * Sun Jan  3 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-1
 - Update to v1.6.1