From 38ea78274c6d53a20b8eb24685eb55c6b8a7bdba Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 20 Nov 2020 18:07:11 +0000
Subject: [PATCH] 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#e72f339e1c9ca331972f47128ff42c77f02fef2f
---
 .gitignore             |  1 +
 alsa-sof-firmware.spec | 23 +++++++++++++----------
 sources                |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index c5cc832..7c87519 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /sof-bin-topology-1.5-dmic-20db-fix.tar.gz
 /sof-bin-e6d11bf.tar.gz
 /sof-bin-47b436a.tar.gz
+/sof-bin-da8cb04.tar.gz
diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec
index 5026cf7..4fa6378 100644
--- a/alsa-sof-firmware.spec
+++ b/alsa-sof-firmware.spec
@@ -5,13 +5,13 @@
 
 
 %global sof_version 1.6
-%global sof_commit 47b436af36c18c3b4f409e1d9452aea18e17abc8
+%global sof_commit da8cb04cbd2f6031a2465794282f103ec83f15fe
 %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:        1%{?dist}
+Release:        3%{?dist}
 # See later in the spec for a breakdown of licensing
 License:        BSD
 URL:            https://github.com/thesofproject/sof-bin
@@ -38,28 +38,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/v%{sof_version}/* intel/sof
-rmdir intel/sof/v%{sof_version}
+mv intel/sof/%{sof_version}/* intel/sof
+rmdir intel/sof/%{sof_version}
 
 # rename intel signed firmware files
 for platform in apl cnl icl tgl; do
-  mv intel/sof/intel-signed/sof-$platform-v%{sof_version}.ri intel/sof/intel-signed/sof-$platform.ri
+  mv intel/sof/intel-signed/sof-$platform-%{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 tgl; do
-  mv intel/sof/public-signed/sof-$platform-v%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri
+  mv intel/sof/public-signed/sof-$platform-%{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-v%{sof_version}.ri intel/sof/sof-$platform.ri
+  mv intel/sof/sof-$platform-%{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-v%{sof_version}.ldc intel/sof/sof-$platform.ldc
+for platform in apl bdw byt cht cnl icl tgl; do
+  mv intel/sof/sof-$platform-%{sof_version}.ldc intel/sof/sof-$platform.ldc
 done
 
 # add missing symlink
@@ -68,7 +68,7 @@ ln -s intel-signed/sof-cnl.ri intel/sof/sof-cfl.ri
 
 # move topology files
 rm -f intel/sof-tplg
-mv intel/sof-tplg-v%{sof_version} intel/sof-tplg
+mv intel/sof-tplg-%{sof_version} intel/sof-tplg
 
 # remove NXP firmware files
 rm -rf nxp ../../LICENCE.NXP
@@ -115,6 +115,9 @@ if st and st.type == "link" then
 end
 
 %changelog
+* Wed Oct 14 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-3
+- Update to v1.6 (Nov 19)
+
 * Wed Oct 14 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-1
 - Update to v1.6 (Oct 13)
 
diff --git a/sources b/sources
index 63b02cf..e20e77b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sof-bin-47b436a.tar.gz) = 447726c70344f029c246f83d8071da953e7a90b2f810ecd46a42802956173e4faabf86f65a18fbfbea570190f081cb026b688209218b9ac9b51fee94fbacc0ca
+SHA512 (sof-bin-da8cb04.tar.gz) = a20c25b293903a7ab9581545e584500c9c09133bd9c71c233fa4ccae3a5678357af185953d592a634c5254590855df1ce1ed280413b19cdaa5364715281020bb