diff --git a/.gitignore b/.gitignore index 6e71e1a..2740a24 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,9 @@ /sof-bin-da8cb04.tar.gz /sof-bin-faa5bdc.tar.gz /sof-bin-b77c851.tar.gz +/sof-bin-f31c9ce.tar.gz +/sof-bin-6bd5501.tar.gz +/sof-bin-v1.8.tar.gz +/sof-bin-v1.9.tar.gz +/sof-bin-v1.9.2.tar.gz +/sof-bin-v1.9.3.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 0892bde..db07d6f 100644 --- a/alsa-sof-firmware.spec +++ b/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.9.3 +#global sof_ver_pre rc1 +%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: 2%{?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} Conflicts: alsa-firmware <= 1.2.1-6 # noarch, since the package is firmware @@ -33,53 +37,32 @@ 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* + +# remove Mediatek firmware files +rm -rf firmware/intel/sof-tplg/sof-mt8* %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) @@ -99,6 +82,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 @@ -116,6 +102,27 @@ if st and st.type == "link" then end %changelog +* Wed Dec 15 2021 Jaroslav Kysela - 1.9.3-1 +- Update to v1.9.3 + +* Tue Nov 23 2021 Jaroslav Kysela - 1.9.2-1 +- Update to v1.9.2 + +* Tue Oct 5 2021 Jaroslav Kysela - 1.9-1 +- Update to v1.9 + +* Tue Jun 22 2021 Jaroslav Kysela - 1.8-1 +- Update to v1.8 + +* Thu Jun 3 2021 Jaroslav Kysela - 1.7-1 +- Update to v1.7 + +* Thu Mar 11 2021 Jaroslav Kysela - 1.6.1-4 +- Add SST Skylake HDA topology binary (bug#1933423) + +* Fri Mar 5 2021 Jaroslav Kysela - 1.6.1-3 +- Add TGL-H firmware files + * Tue Jan 26 2021 Fedora Release Engineering - 1.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 2875adc..04db3c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-b77c851.tar.gz) = 85ef3cdeff44f55cb4d393268616763238c345aac0755360807c8c238f8fe88360ed609b39f9d736c85a9e8a70dac54f82b6d6d5669a6d7269914480d46091a1 +SHA512 (sof-bin-v1.9.3.tar.gz) = 0c04bf47ecf65d3352b730e79968cb020211c274f64a3cc21e4c5e49c5a9706ab4d541aaea931e72c1bcc67fcde6387bc6bf952a33691aaab06e6b93aa73a024