diff --git a/.gitignore b/.gitignore index 8cfe27b..0c7dea9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /sof-bin-72a04d5.tar.gz +/sof-bin-topology-1.5-dmic-20db-fix.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index c015b75..561b405 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,18 +4,19 @@ %global _firmwarepath /usr/lib/firmware -%global sof_version 1.4.2 -%global sof_commit 72a04d57d04c2df6e9dbf4eba0a98f40c252ee0b +%global sof_version 1.5 +%global sof_commit e6d11bf44f0c7ad6032d201e753aa254bb075ee7 %global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7}) Summary: Firmware and topology files for Sound Open Firmware project Name: alsa-sof-firmware Version: %{sof_version} -Release: 6%{?dist} +Release: 1%{?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/archive/%{sof_commit}/sof-bin-%{sof_shortcommit}.tar.gz +Source10: https://www.alsa-project.org/files/pub/misc/sof/sof-bin-topology-1.5-dmic-20db-fix.tar.gz Conflicts: alsa-firmware <= 1.2.1-6 # noarch, since the package is firmware @@ -38,28 +39,28 @@ This package contains the debug files for the Sound Open Firmware project. cd lib/firmware # we have the version in the package name -mv intel/sof/v1.4.2/* intel/sof -rmdir intel/sof/v1.4.2 +mv intel/sof/v%{sof_version}/* intel/sof +rmdir intel/sof/v%{sof_version} # rename intel signed firmware files for platform in apl cnl icl; do - mv intel/sof/intel-signed/sof-$platform-v1.4.2.ri intel/sof/intel-signed/sof-$platform.ri + mv intel/sof/intel-signed/sof-$platform-v%{sof_version}.ri intel/sof/intel-signed/sof-$platform.ri ln -sf intel-signed/sof-$platform.ri intel/sof/sof-$platform.ri done # rename public signed firmware files for platform in apl cnl icl; do - mv intel/sof/public-signed/sof-$platform-v1.4.2.ri intel/sof/public-signed/sof-$platform.ri + mv intel/sof/public-signed/sof-$platform-v%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri done # rename unsigned firmware files for platform in bdw byt cht; do - mv intel/sof/sof-$platform-v1.4.2.ri intel/sof/sof-$platform.ri + mv intel/sof/sof-$platform-v%{sof_version}.ri intel/sof/sof-$platform.ri done # rename debug files for platform in apl bdw byt cht cnl icl; do - mv intel/sof/sof-$platform-v1.4.2.ldc intel/sof/sof-$platform.ldc + mv intel/sof/sof-$platform-v%{sof_version}.ldc intel/sof/sof-$platform.ldc done # add missing symlink @@ -67,12 +68,15 @@ ln -s intel-signed/sof-cnl.ri intel/sof/sof-cml.ri ln -s intel-signed/sof-cnl.ri intel/sof/sof-cfl.ri # move topology files -rm intel/sof-tplg -mv intel/sof-tplg-v1.4.2 intel/sof-tplg +rm -f intel/sof-tplg +mv intel/sof-tplg-v%{sof_version} intel/sof-tplg # remove NXP firmware files rm -rf nxp +# patch the topology files (DMIC equalizer fix) +tar xvzf %{SOURCE10} -C intel/sof-tplg + %build %install @@ -114,6 +118,9 @@ if st and st.type == "link" then end %changelog +* Mon Jun 1 2020 Jaroslav Kysela - 1.5-1 +- Update to v1.5 + * Tue May 12 2020 Jaroslav Kysela - 1.4.2-6 - Fix the upgrade (make /usr/lib/firmware/intel/sof-tplg directory again) - Remove the version from all paths diff --git a/sources b/sources index cba2231..1be40c3 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (sof-bin-72a04d5.tar.gz) = 546d6cb0747fcf7ae09d163b369e1f4be3c1a72af6feb58a29f146c2d8d9a03955edb9e6ce80b2df73f70b94f782c7da890ab0a3e55024c9c4ef3037db19de85 +SHA512 (sof-bin-topology-1.5-dmic-20db-fix.tar.gz) = d933433a1327cc32f2b4c783aee7fca8d5d89f04ebb764b9e6ebb46c84b0035b54083aab50118879da16eedaf8301063be87c680eec09f4b2c4d2915735b7247