Compare commits

...

No commits in common. "c8" and "c9" have entirely different histories.
c8 ... c9

4 changed files with 97 additions and 49 deletions

View File

@ -1,2 +1,3 @@
4b3a804d873807f2e48ecf6278d71655651e1e9d SOURCES/alsa-lib-1.2.10.tar.bz2 4b3a804d873807f2e48ecf6278d71655651e1e9d SOURCES/alsa-lib-1.2.10.tar.bz2
8c1d225b9fe108797349e8d0cb6161271aab0f50 SOURCES/alsa-topology-conf-1.2.5.tar.bz2
5f1ed71a3e30698b6467c2572896fda146f6f74b SOURCES/alsa-ucm-conf-1.2.10.tar.bz2 5f1ed71a3e30698b6467c2572896fda146f6f74b SOURCES/alsa-ucm-conf-1.2.10.tar.bz2

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
SOURCES/alsa-lib-1.2.10.tar.bz2 SOURCES/alsa-lib-1.2.10.tar.bz2
SOURCES/alsa-topology-conf-1.2.5.tar.bz2
SOURCES/alsa-ucm-conf-1.2.10.tar.bz2 SOURCES/alsa-ucm-conf-1.2.10.tar.bz2

View File

@ -6,34 +6,27 @@
%define version_alsa_ucm 1.2.10 %define version_alsa_ucm 1.2.10
%define version_alsa_tplg 1.2.5 %define version_alsa_tplg 1.2.5
%if 0%{?rhel}
%global _without_topology 1
%endif
Summary: The Advanced Linux Sound Architecture (ALSA) library Summary: The Advanced Linux Sound Architecture (ALSA) library
Name: alsa-lib Name: alsa-lib
Version: %{version_alsa_lib} Version: %{version_alsa_lib}
Release: 2%{?prever_dot}%{?dist} Release: 2%{?prever_dot}%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.alsa-project.org/ URL: http://www.alsa-project.org/
Source: https://www.alsa-project.org/files/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2 Source: https://www.alsa-project.org/files/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
Source1: https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-%{version_alsa_ucm}.tar.bz2 Source1: https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-%{version_alsa_ucm}.tar.bz2
%if 0%{!?_without_topology:1}
Source2: https://www.alsa-project.org/files/pub/lib/alsa-topology-conf-%{version_alsa_tplg}.tar.bz2 Source2: https://www.alsa-project.org/files/pub/lib/alsa-topology-conf-%{version_alsa_tplg}.tar.bz2
%endif
Source10: asound.conf Source10: asound.conf
Source11: modprobe-dist-alsa.conf Source11: modprobe-dist-alsa.conf
Source12: modprobe-dist-oss.conf Source12: modprobe-dist-oss.conf
Source20: alsa-ucm-conf.patch Source40: alsa-ucm-conf.patch
Patch0: alsa-git.patch Patch0: alsa-git.patch
Patch1: alsa-lib-1.2.3-config.patch Patch1: alsa-lib-1.2.3.1-config.patch
Patch2: alsa-lib-1.2.10-glibc-open.patch Patch2: alsa-lib-1.2.10-glibc-open.patch
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
Requires(post): /sbin/ldconfig, coreutils BuildRequires: make
%description %description
The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
@ -45,7 +38,6 @@ the older OSS API, providing binary compatibility for most OSS programs.
%package devel %package devel
Summary: Development files from the ALSA library Summary: Development files from the ALSA library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: pkgconfig Requires: pkgconfig
@ -58,29 +50,23 @@ against the ALSA libraries and interfaces.
%package -n alsa-ucm %package -n alsa-ucm
Summary: ALSA Use Case Manager configuration Summary: ALSA Use Case Manager configuration
Group: System Environment/Libraries
BuildArch: noarch BuildArch: noarch
License: BSD License: BSD
Requires: %{name} >= %{version_alsa_lib} Requires: %{name} >= %{version_alsa_lib}
%description -n alsa-ucm %description -n alsa-ucm
The Advanced Linux Sound Architecture (ALSA) Universal Configuration The Advanced Linux Sound Architecture (ALSA) Use Case Manager configuration
Manager allows configuration of Audio input/output names and routing contains alsa-lib configuration of Audio input/output names and routing
%if 0%{!?_without_topology:1}
%package -n alsa-topology %package -n alsa-topology
Summary: ALSA Topology configuration Summary: ALSA Topology configuration
Group: System Environment/Libraries
BuildArch: noarch BuildArch: noarch
License: BSD License: BSD
Requires: %{name} >= %{version_alsa_lib} Requires: %{name} >= %{version_alsa_lib}
%endif
%if 0%{!?_without_topology:1}
%description -n alsa-topology %description -n alsa-topology
The Advanced Linux Sound Architecture (ALSA) topology configuration The Advanced Linux Sound Architecture (ALSA) topology configuration
contains alsa-lib configuration of SoC topology contains alsa-lib configuration of SoC topology
%endif
%prep %prep
%setup -q -n %{name}-%{version}%{?prever}%{?postver} %setup -q -n %{name}-%{version}%{?prever}%{?postver}
@ -89,6 +75,16 @@ contains alsa-lib configuration of SoC topology
%patch -P 2 -p1 -b .glibc-open %patch -P 2 -p1 -b .glibc-open
%build %build
# This package uses top level ASM constructs which are incompatible with LTO.
# Top level ASMs are often used to implement symbol versioning. gcc-10
# introduces a new mechanism for symbol versioning which works with LTO.
# Converting packages to use that mechanism instead of toplevel ASMs is
# recommended.
# Note: The v1.2.4 contains changes wich are compatible with gcc-10 LTO
# although using the old ASM constructs.
# Enable custom LTO flags
%define _lto_cflags -flto -ffat-lto-objects -flto-partition=none
autoreconf -vif autoreconf -vif
%configure --disable-aload --with-plugindir=%{_libdir}/alsa-lib --disable-alisp %configure --disable-aload --with-plugindir=%{_libdir}/alsa-lib --disable-alisp
@ -120,15 +116,13 @@ mkdir -p %{buildroot}/%{_datadir}/alsa/ucm2
# Unpack UCMs # Unpack UCMs
tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/ucm" "*/ucm2" tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/ucm" "*/ucm2"
patch -d %{buildroot}/%{_datadir}/alsa -p1 < %{SOURCE20} patch -d %{buildroot}/%{_datadir}/alsa -p1 < %{SOURCE40}
# Create topology directory # Create topology directory
mkdir -p %{buildroot}/%{_datadir}/alsa/topology mkdir -p %{buildroot}/%{_datadir}/alsa/topology
# Unpack topologies # Unpack topologies
%if 0%{!?_without_topology:1}
tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/topology" tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/topology"
%endif
# Remove libtool archives # Remove libtool archives
find %{buildroot} -name '*.la' -delete find %{buildroot} -name '*.la' -delete
@ -136,9 +130,7 @@ find %{buildroot} -name '*.la' -delete
# Remove /usr/include/asoundlib.h # Remove /usr/include/asoundlib.h
rm %{buildroot}/%{_includedir}/asoundlib.h rm %{buildroot}/%{_includedir}/asoundlib.h
%post -p /sbin/ldconfig %ldconfig_scriptlets
%postun -p /sbin/ldconfig
%files %files
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
@ -170,11 +162,9 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
%{_datadir}/alsa/ucm %{_datadir}/alsa/ucm
%{_datadir}/alsa/ucm2 %{_datadir}/alsa/ucm2
%if 0%{!?_without_topology:1}
%files -n alsa-topology %files -n alsa-topology
# BSD # BSD
%{_datadir}/alsa/topology %{_datadir}/alsa/topology
%endif
%changelog %changelog
* Thu Nov 30 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.10-2 * Thu Nov 30 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.10-2
@ -183,49 +173,105 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
* Mon May 15 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.9-1 * Mon May 15 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.9-1
- update to alsa-lib 1.2.9 and alsa-ucm-conf 1.2.9 - update to alsa-lib 1.2.9 and alsa-ucm-conf 1.2.9
* Mon Feb 20 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.8-3
- fixes for UCM sof-soundwire boot configuration
* Thu Jan 5 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.8-2 * Thu Jan 5 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.8-2
- update to alsa-lib 1.2.8 and alsa-ucm-conf 1.2.8 - update to alsa-lib 1.2.8 and alsa-ucm-conf 1.2.8
- remove alsa-topology package for rhel
* Fri Jul 8 2022 Jaroslav Kysela <perex@perex.cz> - 1.2.7.2-1 * Fri Jul 8 2022 Jaroslav Kysela <perex@perex.cz> - 1.2.7.2-1
- Updated to 1.2.7.2 - update to alsa-lib 1.2.7.2 and alsa-ucm-conf 1.2.7.2
* Fri Feb 11 2022 Jaroslav Kysela <perex@perex.cz> - 1.2.6.1-3 * Wed Feb 9 2022 Jaroslav Kysela <perex@perex.cz> - 1.2.6.1-3
- import fixes from upstream (UCM: AMD ACP6x, HDA, sof-hda-dsp) - import fixes from upstream (UCM: AMD ACP6x, HDA, sof-hda-dsp)
* Mon Dec 20 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.6.1-1 * Mon Dec 20 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.6.1-1
- Updated to alsa-lib 1.2.6.1 and alsa-ucm-conf 1.2.6.3 - update to alsa-lib 1.2.6.1 and alsa-ucm-conf 1.2.6.3
* Mon Jun 14 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.5-4 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.5.1-2
- Updated to 1.2.5 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Feb 1 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.4-5 * Thu Jul 29 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.5.1-1
- Apply fixes from upstream (alsa-lib, alsa-ucm-conf) - update to 1.2.5.1
* Mon Oct 19 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.4-3 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.4-6
- Updated to 1.2.4 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Jun 29 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.3.2-1 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Oct 19 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.4-4
- update to 1.2.4
- enable LTO
* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3.2-5
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 1 2020 Jeff Law <law@redhat.com> - 1.2.3.2-3
- Disable LTO
* Mon Jun 29 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.3.2-2
- update to 1.2.3.2 - update to 1.2.3.2
* Tue Mar 17 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-3 * Thu Jun 18 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.3.1-1
- Fix for HDA Intel dual codecs - update to 1.2.3.1
* Tue Dec 10 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-2 * Sun Jun 7 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.3-8
- update to 1.2.3
* Mon Apr 6 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.2-2
- UCM2 fixes (RemoveDevice), bug#1786723
* Wed Feb 19 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.2-1
- Updated to 1.2.2
* Sun Feb 9 2020 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-6
- More UCM2 related fixes
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Dec 9 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-4
- Fixes for sof-hda-dsp UCM2 configuration
* Tue Dec 3 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-3
- Fixed more UCM2 related issues
* Fri Nov 29 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-1
- Updated to 1.2.1.2 - Updated to 1.2.1.2
- UCM fixes
* Fri Nov 15 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1-2 * Tue Nov 19 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1.1-1
- Updated to 1.2.1.1
* Wed Nov 13 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1-3
- Updated to 1.2.1 - Updated to 1.2.1
* Mon May 27 2019 Jaroslav Kysela <perex@perex.cz> - 1.1.9-4 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.9-2
- Moved topology files to alsa-topology - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 10 2019 Jaroslav Kysela <perex@perex.cz> - 1.1.9-1
- Updated to 1.1.9 - Updated to 1.1.9
* Fri Jan 25 2019 Jaroslav Kysela <jkysela@redhat.com> - 1.1.6-3 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.8-2
- Sync with the RHEL 7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
- Add Dell WD15/WD19 Dock to USB-Audio.conf and create UCM configs
- Resolves: rhbz#1664247 * Mon Jan 7 2019 Jaroslav Kysela <perex@perex.cz> - 1.1.8-1
- Updated to 1.1.8
* Tue Dec 25 2018 Hans de Goede <hdegoede@redhat.com> - 1.1.7-3
- Fix broken chtrt5645 UCM profile, fixing mic input on chtrt5645 devices
* Wed Oct 24 2018 Jaroslav Kysela <perex@perex.cz> - 1.1.7-2
- Moved topology files to alsa-topology
- Updated to 1.1.7
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Apr 04 2018 Jaroslav Kysela <perex@perex.cz> - 1.1.6-2 * Wed Apr 04 2018 Jaroslav Kysela <perex@perex.cz> - 1.1.6-2
- Changed add-on directory to /etc/alsa/conf.d - Changed add-on directory to /etc/alsa/conf.d