diff --git a/.gitignore b/.gitignore index ad203bd..334e4a2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /sof-bin-v1.9.2.tar.gz /sof-bin-v1.9.3.tar.gz /sof-bin-v2.0.tar.gz +/sof-tplg-v2.1.1a.tar.gz +/alsa-sof-firmware-2.1.1-1.fc37.src.rpm +/sof-bin-v2.1.1.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 640a8c5..b666f4c 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,21 +4,27 @@ %global _firmwarepath /usr/lib/firmware %global _xz_opts -9 --check=crc32 -%global sof_ver 2.0 +%global sof_ver 2.1.1 #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 with_sof_addon 1 +%global sof_ver_addon 2.1.1a + %global tplg_version 1.2.4 Summary: Firmware and topology files for Sound Open Firmware project Name: alsa-sof-firmware Version: %{sof_ver} -Release: 3%{?sof_ver_rel}%{?dist} +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/releases/download/%{sof_ver_pkg}/sof-bin-%{sof_ver_pkg}.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 BuildRequires: alsa-topology >= %{tplg_version} BuildRequires: alsa-topology-utils >= %{tplg_version} Conflicts: alsa-firmware <= 1.2.1-6 @@ -48,6 +54,11 @@ mv sof-%{sof_ver_pkg}/* firmware/intel/sof # move topology files mv sof-tplg-%{sof_ver_pkg} firmware/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 LICENCE.NXP rm -rf firmware/intel/sof-tplg/sof-imx8* @@ -119,6 +130,9 @@ if st and st.type == "link" then end %changelog +* Fri Jun 17 2022 Jaroslav Kysela - 2.1.1-1 +- Update to v2.1.1 + v2.1.1a (topology) + * Fri Feb 4 2022 Jaroslav Kysela - 2.0-3 - Use CRC32 for the xz compression diff --git a/sources b/sources index c38d7fc..c765245 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (sof-bin-v2.0.tar.gz) = 44b0c662598e95dfb5dd2dda86d08e3f136c6f99b1ffd4f55b65ea2be35480736c4d751b5108c15b00369a3bb8955e7d9ad410cc93beeb09e8620baf3ce2070c +SHA512 (sof-bin-v2.1.1.tar.gz) = 77e9562f67014d78b213fe428edef6a08dcc058a9a762da09a486c002c3aa0b907ea7c8ba6d4f88f5ddab5e564de06df9f2ed77206341a0fe2e1aaab1d9740ce +SHA512 (sof-tplg-v2.1.1a.tar.gz) = 48f8aa8023313d44ddce6c5a2c9f9e9acdd3320b52e2718eaf949d030e79e8ea547e101374f59fd7492e763983af030a5ecfa3725c48e72cddfdefecb9421ece