Import from AlmaLinux stable repository

.alsa-sof-firmware.metadata

@@ -1 +0,0 @@
-353b7a21a8880dc33c39c9880ca2bab35be7c8ca SOURCES/sof-bin-f31c9ce.tar.gz

.gitignore

@@ -1 +1,2 @@
-SOURCES/sof-bin-f31c9ce.tar.gz
+SOURCES/skl_hda_dsp_generic-tplg.bin
+SOURCES/sof-bin-2023.09.2.tar.gz

SPECS/alsa-sof-firmware.spec

@@ -3,19 +3,29 @@
 %define _binaries_in_noarch_packages_terminate_build   0
 %global _firmwarepath  /usr/lib/firmware
 
+%global sof_ver 2023.09.2
+#global sof_ver_pre rc1
+%global sof_ver_rel %{?sof_ver_pre:.%{sof_ver_pre}}
+%global sof_ver_pkg0 %{sof_ver}%{?sof_ver_pre:-%{sof_ver_pre}}
+%global sof_ver_pkg v%{sof_ver_pkg0}
 
-%global sof_version 1.6.1
-%global sof_commit f31c9ce30ac2792ec39e19da489aee7631e00654
-%global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7})
+%global with_sof_addon 0
+%global sof_ver_addon 0
+
+%global tplg_version 1.2.4
 
 Summary:        Firmware and topology files for Sound Open Firmware project
 Name:           alsa-sof-firmware
-Version:        %{sof_version}
-Release:        2%{?dist}
+Version:        %{sof_ver}
+Release:        1%{?sof_ver_rel}%{?dist}
 # See later in the spec for a breakdown of licensing
-License:        BSD
+License:        BSD-3-Clause
 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_pkg0}.tar.gz
+%if 0%{?with_sof_addon}
+Source2:        https://github.com/thesofproject/sof-bin/releases/download/v%{sof_ver_addon}/sof-tplg-v%{sof_ver_addon}.tar.gz
+%endif
+Source10:       skl_hda_dsp_generic-tplg.bin
 
 # noarch, since the package is firmware
 BuildArch:      noarch
@@ -32,53 +42,35 @@ 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_pkg0}
 
-cd lib/firmware
+mkdir -p firmware/intel
 
-# 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 tgl-h; 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
+for d in sof sof-ipc4 sof-ace-tplg sof-tplg; do \
+  mv "${d}" firmware/intel; \
 done
 
-# rename public signed firmware files
-for platform in apl cnl icl jsl tgl tgl-h; 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 tgl-h; 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
-
-# move topology files
-rm -f intel/sof-tplg
-mv intel/sof-tplg-v%{sof_version} intel/sof-tplg
+%if 0%{?with_sof_addon}
+tar xvzf %{SOURCE2}
+mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg
+%endif
 
 # remove NXP firmware files
-rm -rf nxp ../../LICENCE.NXP
-rm -rf intel/sof-tplg/sof-imx8*
+rm Notice.NXP LICENCE.NXP
+rm -rf firmware/intel/sof-tplg/sof-imx8*
+
+# remove Mediatek firmware files
+rm -rf firmware/intel/sof-tplg/sof-mt8*
+
+# SST topology files (not SOF related, but it's a Intel hw support
+# and this package seems a good place to distribute them
+cp %{SOURCE10} firmware/skl_hda_dsp_generic-tplg.bin
 
 %build
 
 %install
 mkdir -p %{buildroot}%{_firmwarepath}
-cp -ra lib/firmware/* %{buildroot}%{_firmwarepath}
+cp -ra firmware/* %{buildroot}%{_firmwarepath}
 
 # gather files and directories
 FILEDIR=$(pwd)
@@ -96,11 +88,16 @@ cat alsa-sof-firmware.files
 %files -f alsa-sof-firmware.files
 %license LICENCE*
 %doc README*
+%doc manifest.txt
 %dir %{_firmwarepath}
 
+# Licence: 3-clause BSD
+%{_firmwarepath}/*.bin
+
 # Licence: 3-clause BSD
 # .. for files with suffix .tplg
-%{_firmwarepath}/intel/sof-tplg
+%{_firmwarepath}/intel/sof-tplg/*.tplg
+%{_firmwarepath}/intel/sof-ace-tplg/*.tplg
 
 # Licence: SOF (3-clause BSD plus others)
 # .. for files with suffix .ri
@@ -108,8 +105,40 @@ cat alsa-sof-firmware.files
 %files debug -f alsa-sof-firmware.debug-files
 
 %changelog
-* Fri Mar  5 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2
-- Add TGL-H firmware files
+* Thu Nov  16 2023 Jaroslav Kysela <perex@perex.cz> - 2023.09.1-2
+- Update to v2023.09.2
+- SPDX license
+
+* Mon May 15 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.5-1
+- Update to v2.2.5
+
+* Mon Jan  9 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.4-2
+- Update to v2.2.4
+
+* Wed Dec  7 2022 Jaroslav Kysela <perex@perex.cz> - 2.2.3-1
+- Update to v2.2.3
+
+* Thu Sep 29 2022 Jaroslav Kysela <perex@perex.cz> - 2.2.2-1
+- Update to v2.2.2
+
+* Mon Jun 20 2022 Jaroslav Kysela <perex@perex.cz> - 2.1.1-1
+- Update to v2.1.1 + v2.1.1a (topology)
+
+* Wed May 11 2022 Jaroslav Kysela <perex@perex.cz> - 1.9.3-3
+- Add sof-adl-rt711-l2-rt1316-l01.tplg topology file
+
+* Thu Dec 16 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.3-1
+- Update to v1.9.3
+
+* Tue Nov 23 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.2-1
+- Update to v1.9.2
+
+* Tue Oct 26 2021 Jaroslav Kysela <perex@perex.cz> - 1.9-1
+- Update to v1.9
+
+* 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