Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/alsa-sof-firmware.git#bd5ec4762d089c5851b155b1d375f49b024d9ea7
This commit is contained in:
DistroBaker 2021-03-19 14:45:54 +00:00
parent ac75caa877
commit c20e5dd206

View File

@ -3,19 +3,22 @@
%define _binaries_in_noarch_packages_terminate_build 0 %define _binaries_in_noarch_packages_terminate_build 0
%global _firmwarepath /usr/lib/firmware %global _firmwarepath /usr/lib/firmware
%global sof_version 1.6.1 %global sof_version 1.6.1
%global sof_commit f31c9ce30ac2792ec39e19da489aee7631e00654 %global sof_commit f31c9ce30ac2792ec39e19da489aee7631e00654
%global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7}) %global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7})
%global tplg_version 1.2.4
Summary: Firmware and topology files for Sound Open Firmware project Summary: Firmware and topology files for Sound Open Firmware project
Name: alsa-sof-firmware Name: alsa-sof-firmware
Version: %{sof_version} Version: %{sof_version}
Release: 3%{?dist} Release: 4%{?dist}
# See later in the spec for a breakdown of licensing # See later in the spec for a breakdown of licensing
License: BSD License: BSD
URL: https://github.com/thesofproject/sof-bin URL: https://github.com/thesofproject/sof-bin
Source: https://github.com/thesofproject/sof-bin/archive/%{sof_commit}/sof-bin-%{sof_shortcommit}.tar.gz Source: https://github.com/thesofproject/sof-bin/archive/%{sof_commit}/sof-bin-%{sof_shortcommit}.tar.gz
BuildRequires: alsa-topology >= %{tplg_version}
BuildRequires: alsa-topology-utils >= %{tplg_version}
Conflicts: alsa-firmware <= 1.2.1-6 Conflicts: alsa-firmware <= 1.2.1-6
# noarch, since the package is firmware # noarch, since the package is firmware
@ -76,6 +79,10 @@ rm -rf nxp ../../LICENCE.NXP
rm -rf intel/sof-tplg/sof-imx8* rm -rf intel/sof-tplg/sof-imx8*
%build %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 lib/firmware/skl_hda_dsp_generic-tplg.bin
%install %install
mkdir -p %{buildroot}%{_firmwarepath} mkdir -p %{buildroot}%{_firmwarepath}
@ -99,6 +106,9 @@ cat alsa-sof-firmware.files
%doc README* %doc README*
%dir %{_firmwarepath} %dir %{_firmwarepath}
# Licence: 3-clause BSD
%{_firmwarepath}/*.bin
# Licence: 3-clause BSD # Licence: 3-clause BSD
# .. for files with suffix .tplg # .. for files with suffix .tplg
%{_firmwarepath}/intel/sof-tplg %{_firmwarepath}/intel/sof-tplg
@ -116,7 +126,10 @@ if st and st.type == "link" then
end end
%changelog %changelog
* Fri Mar 5 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-3 * Thu Mar 11 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-4
- Add SST Skylake HDA topology binary (bug#1933423)
* Fri Mar 5 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-3
- Add TGL-H firmware files - Add TGL-H firmware files
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2