From 019e45e6b5a0308878835e9d33eb239c272eb099 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <jkysela@redhat.com>
Date: Mon, 20 Jun 2022 10:48:51 +0200
Subject: [PATCH] Update to v2.1.1 + v2.1.1a (topology)

Resolves: rhbz#2065605
---
 .gitignore             |  2 ++
 alsa-sof-firmware.spec | 18 ++++++++++++++++--
 sources                |  3 ++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c35590..318b865 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
 /sof-bin-b77c851.tar.gz
 /sof-bin-v1.8.tar.gz
 /sof-bin-v1.9.3.tar.gz
+/sof-bin-v2.1.1.tar.gz
+/sof-tplg-v2.1.1a.tar.gz
diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec
index 6ce81dd..eac6afc 100644
--- a/alsa-sof-firmware.spec
+++ b/alsa-sof-firmware.spec
@@ -3,21 +3,27 @@
 %define _binaries_in_noarch_packages_terminate_build   0
 %global _firmwarepath  /usr/lib/firmware
 
-%global sof_ver 1.9.3
+%global sof_ver 2.1.1
 #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 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:        2%{?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}
 
@@ -46,6 +52,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*
@@ -101,6 +112,9 @@ if st and st.type == "link" then
 end
 
 %changelog
+* Mon Jun 20 2022 Jaroslav Kysela <perex@perex.cz> - 2.1.1-1
+- Update to v2.1.1 + v2.1.1a (topology)
+
 * Mon Dec 20 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.3-2
 - Update to v1.9.3
 
diff --git a/sources b/sources
index 04db3c9..c765245 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (sof-bin-v1.9.3.tar.gz) = 0c04bf47ecf65d3352b730e79968cb020211c274f64a3cc21e4c5e49c5a9706ab4d541aaea931e72c1bcc67fcde6387bc6bf952a33691aaab06e6b93aa73a024
+SHA512 (sof-bin-v2.1.1.tar.gz) = 77e9562f67014d78b213fe428edef6a08dcc058a9a762da09a486c002c3aa0b907ea7c8ba6d4f88f5ddab5e564de06df9f2ed77206341a0fe2e1aaab1d9740ce
+SHA512 (sof-tplg-v2.1.1a.tar.gz) = 48f8aa8023313d44ddce6c5a2c9f9e9acdd3320b52e2718eaf949d030e79e8ea547e101374f59fd7492e763983af030a5ecfa3725c48e72cddfdefecb9421ece