diff --git a/.gitignore b/.gitignore index 8e691fd..0a38ca6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /alsa-firmware-1.*.tar.bz2 +/sof-firmware-*.tar.bz2 diff --git a/alsa-firmware.spec b/alsa-firmware.spec index f2ac86e..d732522 100644 --- a/alsa-firmware.spec +++ b/alsa-firmware.spec @@ -2,14 +2,17 @@ # in the end package are expected. %define _binaries_in_noarch_packages_terminate_build 0 +%define sof_version 1.3.1 + Summary: Firmware for several ALSA-supported sound cards Name: alsa-firmware -Version: 1.0.29 -Release: 9%{?dist} +Version: 1.2.1 +Release: 1%{?dist} # See later in the spec for a breakdown of licensing License: GPL+ and BSD and GPLv2+ and GPLv2 and LGPLv2+ URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/firmware/%{name}-%{version}.tar.bz2 +Source1: ftp://ftp.alsa-project.org/pub/misc/sof/sof-firmware-%{sof_version}.tar.bz2 Requires: alsa-tools-firmware >= %{version} Requires: systemd @@ -57,15 +60,22 @@ mv aica/license.txt LICENSE.aica_firmware mv aica/Dreamcast_sound.txt aica_dreamcast_sound.txt mv ca0132/creative.txt LICENSE.creative_txt +# Intel's SOF +tar xvjf %{SOURCE1} --strip-components=1 +mv lib/firmware/intel/sof/LICENCE LICENSE.sof-intel +rm -f lib/firmware/intel/sof-tplg/LICENCE + + %install make install DESTDIR=%{buildroot} +cp -ra lib/* %{buildroot}/lib %files %doc COPYING README* LICENSE* %doc aica_dreamcast_sound.txt -# License: KOS (BSD-alike) +# License: KOS (3-clause BSD) /lib/firmware/aica_firmware.bin # License: No explicit license; default package license is GPLv2+ @@ -182,11 +192,17 @@ make install DESTDIR=%{buildroot} # Licence: Redistribution allowed, see ca0132/creative.txt /lib/firmware/ctefx.bin /lib/firmware/ctspeq.bin +/lib/firmware/ctefx-desktop.bin +/lib/firmware/ctefx-r3di.bin # Licence: No explicit license; says it's copied from kernel where the cs46xx # driver is labelled as GPLv2+ /lib/firmware/cs46xx +# Licence: SOF (3-clause BSD plus others) +/lib/firmware/intel/sof +/lib/firmware/intel/sof-tplg + # Even with --disable-loader, we still get usxxx firmware here; looking at the # alsa-tools-firmware package, it seems like these devices probably use an old- # style hotplug loading method @@ -195,6 +211,10 @@ make install DESTDIR=%{buildroot} %changelog +* Wed Nov 13 2019 Jaroslav Kysela - 1.2.1-1 +- Updated to 1.2.1 +- Added Intel SOF firmware files + * Wed Jul 24 2019 Fedora Release Engineering - 1.0.29-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index ca023d0..a64926e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -9a1182f8a6ac44cb9af5774cc045565f alsa-firmware-1.0.29.tar.bz2 +SHA512 (alsa-firmware-1.2.1.tar.bz2) = 573bb13d47309253afa7d4d04ef13a7a5e4d18d8f89b1339630266f0ef6638cbb9381b3efce2604ea63fc9cf90a55ecaecf8eb2cccd58da04d0d283a245618b1 +SHA512 (sof-firmware-1.3.1.tar.bz2) = fcce3cf6a3c30a655423fe324c098c77e421b8b2eaf78a3df66b39ad1de86379c48c43334ff26c64d0be7453b022cb316c3141af1f29c473be8ab664b5e928dd