From b924040bb0915782c380547b9fba8e1141c4a9eb Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 15 Nov 2022 01:43:53 -0500
Subject: [PATCH] import alsa-sof-firmware-2.1.1-1.el9

---
 .alsa-sof-firmware.metadata  |  3 ++-
 .gitignore                   |  3 ++-
 SPECS/alsa-sof-firmware.spec | 18 ++++++++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.alsa-sof-firmware.metadata b/.alsa-sof-firmware.metadata
index d21cfb4..d60b80c 100644
--- a/.alsa-sof-firmware.metadata
+++ b/.alsa-sof-firmware.metadata
@@ -1 +1,2 @@
-276426a461afd307a523b589931d6a5efec90088 SOURCES/sof-bin-v1.9.3.tar.gz
+2f648e3b14c2c0482b1388d910e69a362bf1c4c0 SOURCES/sof-bin-v2.1.1.tar.gz
+a72be6d3ac7c68fef0aed6d1bb179c8dab81f4f9 SOURCES/sof-tplg-v2.1.1a.tar.gz
diff --git a/.gitignore b/.gitignore
index 46859c6..da8fcc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-SOURCES/sof-bin-v1.9.3.tar.gz
+SOURCES/sof-bin-v2.1.1.tar.gz
+SOURCES/sof-tplg-v2.1.1a.tar.gz
diff --git a/SPECS/alsa-sof-firmware.spec b/SPECS/alsa-sof-firmware.spec
index 6ce81dd..eac6afc 100644
--- a/SPECS/alsa-sof-firmware.spec
+++ b/SPECS/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