From df86ba6bf42935dc50687c151f95940b935fdc42 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 24 Oct 2023 10:03:49 +0200
Subject: [PATCH] update to v2023.09

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 .gitignore             |  1 +
 alsa-sof-firmware.spec | 51 +++++++++++++++++++++++++-----------------
 sources                |  2 +-
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa16fc2..5a34694 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /sof-bin-v2.2.4.tar.gz
 /sof-bin-v2.2.5.tar.gz
 /sof-bin-v2.2.6.tar.gz
+/sof-bin-2023.09.tar.gz
diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec
index 7df7c0b..de4eff0 100644
--- a/alsa-sof-firmware.spec
+++ b/alsa-sof-firmware.spec
@@ -4,10 +4,11 @@
 %global _firmwarepath  /usr/lib/firmware
 %global _xz_opts -9 --check=crc32
 
-%global sof_ver 2.2.6
+%global sof_ver 2023.09
 #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_ver_pkg0 %{sof_ver}%{?sof_ver_pre:-%{sof_ver_pre}}
+%global sof_ver_pkg v%{sof_ver_pkg0}
 
 %global with_sof_addon 0
 %global sof_ver_addon 0
@@ -21,7 +22,7 @@ Release:        1%{?sof_ver_rel}%{?dist}
 # See later in the spec for a breakdown of licensing
 License:        BSD-3-Clause
 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
+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
@@ -44,15 +45,13 @@ License:        BSD
 This package contains the debug files for the Sound Open Firmware project.
 
 %prep
-%autosetup -n sof-bin-%{sof_ver_pkg}
+%autosetup -n sof-bin-%{sof_ver_pkg0}
 
-mkdir -p firmware/intel/sof
+mkdir -p firmware/intel
 
-# we have the version in the package name
-mv sof-%{sof_ver_pkg}/* firmware/intel/sof
-
-# move topology files
-mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg
+for d in sof sof-ipc4 sof-ace-tplg sof-tplg; do \
+  mv "${d}" firmware/intel; \
+done
 
 %if 0%{?with_sof_addon}
 tar xvzf %{SOURCE2}
@@ -60,24 +59,29 @@ mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg
 %endif
 
 # remove NXP firmware files
-rm LICENCE.NXP
+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*
 
 # use xz compression
-find -P firmware/intel/sof -type f -name "*.ri" -exec xz -z %{_xz_opts} {} \;
-for f in $(find -P firmware/intel/sof -type l -name "*.ri"); do \
-  l=$(readlink "${f}"); \
-  d=$(dirname "${f}"); \
-  b=$(basename "${f}"); \
-  rm "${f}"; \
-  pushd "${d}"; \
-  ln -svf "${l}.xz" "${b}.xz"; \
-  popd; \
+xz -z %{_xz_opts} manifest.txt
+for d in sof sof-ipc4; do \
+  find -P "firmware/intel/${d}" -type f -name "*.ri" -exec xz -z %{_xz_opts} {} \;
+  for f in $(find -P "firmware/intel/${d}" -type l -name "*.ri"); do \
+    l=$(readlink "${f}"); \
+    n=$(dirname "${f}"); \
+    b=$(basename "${f}"); \
+    rm "${f}"; \
+    pushd "${n}"; \
+    ln -svf "${l}.xz" "${b}.xz"; \
+    popd; \
+  done
+done
+for d in sof-tplg sof-ace-tplg; do \
+  find -P "firmware/intel/${d}"  -type f -name "*.tplg" -exec xz -z %{_xz_opts} {} \;
 done
-find -P firmware/intel/sof-tplg  -type f -name "*.tplg" -exec xz -z %{_xz_opts} {} \;
 
 %build
 # SST topology files (not SOF related, but it's a Intel hw support
@@ -108,6 +112,7 @@ cat alsa-sof-firmware.files
 %files -f alsa-sof-firmware.files
 %license LICENCE*
 %doc README*
+%doc manifest.txt.xz
 %dir %{_firmwarepath}
 
 # Licence: 3-clause BSD
@@ -116,6 +121,7 @@ cat alsa-sof-firmware.files
 # Licence: 3-clause BSD
 # .. for files with suffix .tplg
 %{_firmwarepath}/intel/sof-tplg/*.tplg.xz
+%{_firmwarepath}/intel/sof-ace-tplg/*.tplg.xz
 
 # Licence: SOF (3-clause BSD plus others)
 # .. for files with suffix .ri
@@ -130,6 +136,9 @@ if st and st.type == "link" then
 end
 
 %changelog
+* Tue Oct 24 2023 Jaroslav Kysela <perex@perex.cz> - 2023.09-1
+- Update to v2023.09
+
 * Wed Aug  9 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.6-1
 - Update to v2.2.6
 
diff --git a/sources b/sources
index 9404509..0cb8e26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sof-bin-v2.2.6.tar.gz) = 33a836fdc9006aead24e14c15703040164b0878d48c6dd32f0a6ae558c99a43c768eb793e308550fd32dfb0e0f93783cff6c42f2618557ebac2a057425115e9e
+SHA512 (sof-bin-2023.09.tar.gz) = 7ef81549c76164629400622fa1b512b6061a37b9ba14383d69ac10b2e7dc35c4f35bd6444b15e725c749c23564ec84646960fedcd776b5c2ec11bda3933a633d