diff --git a/.alsa-sof-firmware.metadata b/.alsa-sof-firmware.metadata index 5efb45e..d9d22d0 100644 --- a/.alsa-sof-firmware.metadata +++ b/.alsa-sof-firmware.metadata @@ -1,2 +1 @@ -20e9e52e04924e870341036d7676e6bd93e9a4aa SOURCES/sof-bin-e6d11bf.tar.gz -953fd1d80134587741ccad7d95c3e693f71eeffc SOURCES/sof-bin-topology-1.5-dmic-20db-fix.tar.gz +0a4150c8e7d680e8711ebe8aaf0ee9ee62f53688 SOURCES/sof-bin-b77c851.tar.gz diff --git a/.gitignore b/.gitignore index 490128e..48f6b58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/sof-bin-e6d11bf.tar.gz -SOURCES/sof-bin-topology-1.5-dmic-20db-fix.tar.gz +SOURCES/sof-bin-b77c851.tar.gz diff --git a/SPECS/alsa-sof-firmware.spec b/SPECS/alsa-sof-firmware.spec index 81b0050..3627a33 100644 --- a/SPECS/alsa-sof-firmware.spec +++ b/SPECS/alsa-sof-firmware.spec @@ -4,20 +4,18 @@ %global _firmwarepath /usr/lib/firmware -%global sof_version 1.5 -%global sof_commit e6d11bf44f0c7ad6032d201e753aa254bb075ee7 +%global sof_version 1.6.1 +%global sof_commit b77c851bc4ec1b6b552eaf1a61a66f3df4a13ab8 %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: 2%{?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-5 # noarch, since the package is firmware BuildArch: noarch @@ -43,13 +41,13 @@ 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 +for platform in apl cnl ehl icl tgl; do 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 +for platform in apl cnl icl tgl; do mv intel/sof/public-signed/sof-$platform-v%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri done @@ -59,11 +57,12 @@ for platform in bdw byt cht; do done # rename debug files -for platform in apl bdw byt cht cnl icl; do +for platform in apl bdw byt cht cnl ehl icl tgl; do mv intel/sof/sof-$platform-v%{sof_version}.ldc intel/sof/sof-$platform.ldc done -# add missing symlink +# add missing symlinks +ln -s intel-signed/sof-apl.ri intel/sof/sof-glk.ri ln -s intel-signed/sof-cnl.ri intel/sof/sof-cml.ri ln -s intel-signed/sof-cnl.ri intel/sof/sof-cfl.ri @@ -72,10 +71,8 @@ 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 +rm -rf nxp ../../LICENCE.NXP +rm -rf intel/sof-tplg/sof-imx8* %build @@ -111,6 +108,15 @@ cat alsa-sof-firmware.files %files debug -f alsa-sof-firmware.debug-files %changelog +* Sun Jan 3 2021 Jaroslav Kysela - 1.6.1-1 +- Update to v1.6.1 + +* Thu Dec 10 2020 Jaroslav Kysela - 1.6-2 +- Update to v1.6 (Dec 9) + +* Wed Nov 11 2020 Jaroslav Kysela - 1.6-1 +- Update to v1.6 (Oct 13) + * Mon Jun 8 2020 Jaroslav Kysela - 1.5-2 - Update to v1.5