From 253cb0374e83cf41cec15abf26a6d026642ceda059d1c4afc0658ed5da8c8cac Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Fri, 10 Jan 2020 16:35:39 +0000
Subject: [PATCH] Accepting request 762886 from
 home:tiwai:branches:multimedia:libs

- Install SOF firmware binaries, too (sof-firmware-1.4.1)
- Comment out superfluous buildreq automake
- Run fdupes for reducing the duplications

OBS-URL: https://build.opensuse.org/request/show/762886
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-firmware?expand=0&rev=32
---
 alsa-firmware.changes      |  7 +++++++
 alsa-firmware.spec         | 43 +++++++++++++++++++++++++-------------
 sof-firmware-1.4.1.tar.bz2 |  3 +++
 3 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 sof-firmware-1.4.1.tar.bz2

diff --git a/alsa-firmware.changes b/alsa-firmware.changes
index 75ff869..7631cfd 100644
--- a/alsa-firmware.changes
+++ b/alsa-firmware.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 10 17:10:20 CET 2020 - tiwai@suse.de
+
+- Install SOF firmware binaries, too (sof-firmware-1.4.1)
+- Comment out superfluous buildreq automake
+- Run fdupes for reducing the duplications
+
 -------------------------------------------------------------------
 Fri Nov 15 17:42:05 CET 2019 - tiwai@suse.de
 
diff --git a/alsa-firmware.spec b/alsa-firmware.spec
index 84199c6..3b0a672 100644
--- a/alsa-firmware.spec
+++ b/alsa-firmware.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package alsa-firmware
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,12 +16,15 @@
 #
 
 
+%define sof_version 1.4.1
+
 Name:           alsa-firmware
 Url:            http://www.alsa-project.org/
 Summary:        Firmware Data Files for ALSA
-License:        GPL-2.0-or-later
+# BuildRequires:  automake
+License:        GPL-2.0-or-later AND BSD-3-Clause
 Group:          Hardware/Other
-BuildRequires:  automake
+BuildRequires:  fdupes
 %if 0%{?suse_version} > 1220
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(udev)
@@ -31,6 +34,7 @@ Release:        0
 Source:         ftp://ftp.alsa-project.org/pub/firmware/alsa-firmware-%{version}.tar.bz2
 Source1:        usx2yaudio.rules
 Source2:        usx2yaudio-old.rules
+Source10:       ftp://ftp.alsa-project.org/pub/misc/sof/sof-firmware-%{sof_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Requires:       alsa
@@ -44,7 +48,7 @@ Requires:       alsa
 Various firmware data files for ALSA drivers.
 
 %prep
-%setup -q
+%setup -q -a 10
 
 %build
 # autoreconf -fi
@@ -55,21 +59,25 @@ Various firmware data files for ALSA drivers.
 make %{?_smp_mflags}
 
 %install
-make DESTDIR="$RPM_BUILD_ROOT" install
+make DESTDIR="%{buildroot}" install
+# SOF firmwares
+mkdir -p %{buildroot}/lib/firmware/intel/
+cp -a usr/lib/firmware/intel/* %{buildroot}/lib/firmware/intel/
+rm -f %{buildroot}/lib/firmware/intel/*/LICENCE
 # remove unnecessary loader firmwares
 for d in vxloader mixartloader pcxhrloader; do
-  rm -rf $RPM_BUILD_ROOT%{_datadir}/alsa/firmware/$d
+  rm -rf %{buildroot}%{_datadir}/alsa/firmware/$d
 done
 %if 0%{?suse_version} >= 1120
 # some files are included in the new "kernel-firmware" package
 for d in ess korg sb16 yamaha; do
-  rm -rf $RPM_BUILD_ROOT/lib/firmware/$d
+  rm -rf %{buildroot}/lib/firmware/$d
 done
 %endif
 # change identical files to symlinks for hdsploader
-pushd $RPM_BUILD_ROOT%{_datadir}/alsa/firmware/hdsploader
+pushd %{buildroot}%{_datadir}/alsa/firmware/hdsploader
 for i in *.bin; do
-  hotplug=$RPM_BUILD_ROOT/lib/firmware/$i
+  hotplug=%{buildroot}/lib/firmware/$i
   if [ -f $hotplug ]; then
     if cmp -s -b $hotplug $i; then
       rm $i
@@ -79,25 +87,30 @@ for i in *.bin; do
 done
 popd
 # FIXME: remove non-existing msnd firmware symlinks
-rm -rf $RPM_BUILD_ROOT/lib/firmware/turtlebeach
+rm -rf %{buildroot}/lib/firmware/turtlebeach
 # install documents
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -c -m 0644 COPYING %{buildroot}%{_docdir}/%{name}
+install -c -m 0644 README %{buildroot}%{_docdir}/%{name}
 for d in echoaudio hdsploader mixartloader pcxhrloader usx2yloader vxloader asihpi ca0132; do
   (cd $d
   n=${d##*/}
-  mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/$n
+  mkdir -p %{buildroot}%{_docdir}/%{name}/$n
   for f in AUTHORS COPYING ChangeLog NEWS README* TODO creative.txt; do
     test -f $f || continue
-    install -c -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}/$n
+    install -c -m 0644 $f %{buildroot}%{_docdir}/%{name}/$n
   done
   )
 done
+mkdir %{buildroot}%{_docdir}/%{name}/sof
+cp usr/lib/firmware/intel/sof/LICENCE %{buildroot}%{_docdir}/%{name}/sof
 # udev rules
 %if 0%{?suse_version} > 1020
-install -D -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_udevdir}/rules.d/52-usx2yaudio.rules
+install -D -c -m 0644 %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/52-usx2yaudio.rules
 %else
-install -D -c -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_udevdir}/rules.d/52-usx2yaudio.rules
+install -D -c -m 0644 %{SOURCE2} %{buildroot}%{_udevdir}/rules.d/52-usx2yaudio.rules
 %endif
+%fdupes -s %{buildroot}
 
 %files
 %defattr(-, root, root)
diff --git a/sof-firmware-1.4.1.tar.bz2 b/sof-firmware-1.4.1.tar.bz2
new file mode 100644
index 0000000..08929fd
--- /dev/null
+++ b/sof-firmware-1.4.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:096ee3fd53f030caedc9546746cb2b6070948b09b5290aafd75970ecec8f9b1b
+size 1057167