From bfccb9d7e5c8e8eeee659d0d63901c86406d7c90 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
Date: Wed, 2 Aug 2023 12:10:45 +0000
Subject: [PATCH] import CS alsa-sof-firmware-2.2.5-2.el9

---
 .alsa-sof-firmware.metadata  |  3 ++-
 .gitignore                   |  3 ++-
 SPECS/alsa-sof-firmware.spec | 39 +++++++++++++++++++++++++++++++-----
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/.alsa-sof-firmware.metadata b/.alsa-sof-firmware.metadata
index a7f8152..9545464 100644
--- a/.alsa-sof-firmware.metadata
+++ b/.alsa-sof-firmware.metadata
@@ -1 +1,2 @@
-2a5336a8c5ced0e8bb9ba5237a52e7ac37833b13 SOURCES/sof-bin-v2.2.4.tar.gz
+5b7d9cb372cb48d824b59b9bf61540a6af882c10 SOURCES/sof-bin-v2.2.5.tar.gz
+d953442c016b705d91fc5306424bc6468c50d21a SOURCES/sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg.gz
diff --git a/.gitignore b/.gitignore
index ae42e7e..afe106c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-SOURCES/sof-bin-v2.2.4.tar.gz
+SOURCES/sof-bin-v2.2.5.tar.gz
+SOURCES/sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg.gz
diff --git a/SPECS/alsa-sof-firmware.spec b/SPECS/alsa-sof-firmware.spec
index 009df16..5e1aa25 100644
--- a/SPECS/alsa-sof-firmware.spec
+++ b/SPECS/alsa-sof-firmware.spec
@@ -2,8 +2,9 @@
 # in the end package are expected.
 %define _binaries_in_noarch_packages_terminate_build   0
 %global _firmwarepath  /usr/lib/firmware
+%global _xz_opts -9 --check=crc32
 
-%global sof_ver 2.2.4
+%global sof_ver 2.2.5
 #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}}
@@ -16,7 +17,7 @@
 Summary:        Firmware and topology files for Sound Open Firmware project
 Name:           alsa-sof-firmware
 Version:        %{sof_ver}
-Release:        1%{?sof_ver_rel}%{?dist}
+Release:        2%{?sof_ver_rel}%{?dist}
 # See later in the spec for a breakdown of licensing
 License:        BSD
 URL:            https://github.com/thesofproject/sof-bin
@@ -24,6 +25,7 @@ Source:         https://github.com/thesofproject/sof-bin/releases/download/%{sof
 %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
+Source10:       sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg.gz
 BuildRequires:  alsa-topology >= %{tplg_version}
 BuildRequires:  alsa-topology-utils >= %{tplg_version}
 
@@ -64,11 +66,31 @@ rm -rf firmware/intel/sof-tplg/sof-imx8*
 # remove Mediatek firmware files
 rm -rf firmware/intel/sof-tplg/sof-mt8*
 
+# Extra topology for Dell SKU 0BDA
+zcat %{SOURCE10} > firmware/intel/sof-tplg/$(basename %{SOURCE10} .gz)
+chmod 0644 firmware/intel/sof-tplg/$(basename %{SOURCE10} .gz)
+
+# 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; \
+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
 # 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
+# use xz compression
+xz -z %{_xz_opts} firmware/*.bin
+chmod 0644 firmware/*.bin.xz
 
 %install
 mkdir -p %{buildroot}%{_firmwarepath}
@@ -77,7 +99,7 @@ cp -ra firmware/* %{buildroot}%{_firmwarepath}
 # gather files and directories
 FILEDIR=$(pwd)
 pushd %{buildroot}/%{_firmwarepath}
-find -P . -name "*.ri" | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.files
+find -P . -name "*.ri.xz" | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.files
 #find -P . -name "*.tplg" | sed -e '/^.$/d' >> $FILEDIR/alsa-sof-firmware.files
 find -P . -name "*.ldc" | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.debug-files
 find -P . -type d | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.dirs
@@ -93,11 +115,11 @@ cat alsa-sof-firmware.files
 %dir %{_firmwarepath}
 
 # Licence: 3-clause BSD
-%{_firmwarepath}/*.bin
+%{_firmwarepath}/*.bin.xz
 
 # Licence: 3-clause BSD
 # .. for files with suffix .tplg
-%{_firmwarepath}/intel/sof-tplg
+%{_firmwarepath}/intel/sof-tplg/*.tplg.xz
 
 # Licence: SOF (3-clause BSD plus others)
 # .. for files with suffix .ri
@@ -112,6 +134,13 @@ if st and st.type == "link" then
 end
 
 %changelog
+* Thu Jun 15 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.5-2
+- add sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg for Dell SKU 0BDA
+- add xz compression support (with CRC32)
+
+* Mon May 15 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.5-1
+- Update to v2.2.5
+
 * Mon Jan  9 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.4-1
 - Update to v2.2.4