diff --git a/alsa-git.patch b/alsa-git.patch new file mode 100644 index 0000000..e69de29 diff --git a/alsa-lib-1.0.14-glibc-open.patch b/alsa-lib-1.0.14-glibc-open.patch new file mode 100644 index 0000000..bc625bd --- /dev/null +++ b/alsa-lib-1.0.14-glibc-open.patch @@ -0,0 +1,11 @@ +--- alsa-lib-1.0.14/aserver/aserver.c 2007-05-31 10:05:13.000000000 +0200 ++++ alsa-lib-1.0.14.lennart/aserver/aserver.c 2007-08-15 15:53:32.000000000 +0200 +@@ -35,6 +35,8 @@ + + #include "aserver.h" + ++#undef open ++ + char *command; + + #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) diff --git a/alsa-lib-1.2.10-glibc-open.patch b/alsa-lib-1.2.10-glibc-open.patch deleted file mode 100644 index 2e53a92..0000000 --- a/alsa-lib-1.2.10-glibc-open.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- alsa-lib-1.2.10/aserver/aserver.c~ 2023-09-01 17:35:48.000000000 +0200 -+++ alsa-lib-1.2.10/aserver/aserver.c 2023-09-01 18:13:11.339601685 +0200 -@@ -35,6 +35,7 @@ - #include - #include - -+#undef open - - char *command; - diff --git a/alsa-lib.spec b/alsa-lib.spec index df66e75..49316cb 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -2,18 +2,15 @@ #define prever_dot .rc3 #define postver a -%define version_alsa_lib 1.2.15.3 -%define version_alsa_ucm 1.2.15.3 +%define version_alsa_lib 1.2.6.1 +%define version_alsa_ucm 1.2.6.3 %define version_alsa_tplg 1.2.5 -%global lib_patch 0 -%global ucm_patch 0 - Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: %{version_alsa_lib} -Release: 2%{?prever_dot}%{?dist} -License: LGPL-2.1-or-later +Release: 3%{?prever_dot}%{?dist} +License: LGPLv2+ URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2 @@ -22,14 +19,10 @@ Source2: ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{version_alsa_t Source10: asound.conf Source11: modprobe-dist-alsa.conf Source12: modprobe-dist-oss.conf -%if %{ucm_patch} Source40: alsa-ucm-conf.patch -%endif -%if %{lib_patch} Patch0: alsa-git.patch -%endif Patch1: alsa-lib-1.2.3.1-config.patch -Patch2: alsa-lib-1.2.10-glibc-open.patch +Patch2: alsa-lib-1.0.14-glibc-open.patch BuildRequires: doxygen BuildRequires: autoconf automake libtool @@ -58,7 +51,7 @@ against the ALSA libraries and interfaces. %package -n alsa-ucm Summary: ALSA Use Case Manager configuration BuildArch: noarch -License: BSD-3-Clause +License: BSD Requires: %{name} >= %{version_alsa_lib} %description -n alsa-ucm @@ -68,7 +61,7 @@ contains alsa-lib configuration of Audio input/output names and routing %package -n alsa-topology Summary: ALSA Topology configuration BuildArch: noarch -License: BSD-3-Clause +License: BSD Requires: %{name} >= %{version_alsa_lib} %description -n alsa-topology @@ -77,11 +70,9 @@ contains alsa-lib configuration of SoC topology %prep %setup -q -n %{name}-%{version}%{?prever}%{?postver} -%if %{lib_patch} -%patch -P0 -p1 -b .alsa-git -%endif -%patch -P1 -p1 -b .config -%patch -P2 -p1 -b .glibc-open +%patch0 -p1 -b .alsa-git +%patch1 -p1 -b .config +%patch2 -p1 -b .glibc-open %build # This package uses top level ASM constructs which are incompatible with LTO. @@ -125,9 +116,7 @@ mkdir -p %{buildroot}/%{_datadir}/alsa/ucm2 # Unpack UCMs tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/ucm" "*/ucm2" -%if %{ucm_patch} patch -d %{buildroot}/%{_datadir}/alsa -p1 < %{SOURCE40} -%endif # Create topology directory mkdir -p %{buildroot}/%{_datadir}/alsa/topology @@ -178,95 +167,6 @@ rm %{buildroot}/%{_includedir}/asoundlib.h %{_datadir}/alsa/topology %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 1.2.15.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Tue Jan 13 2026 Jaroslav Kysela - 1.2.15.3-1 -- update to 1.2.15.3 - -* Thu Jan 8 2026 Jaroslav Kysela - 1.2.15.2-1 -- update to 1.2.15.2 - -* Fri Dec 19 2025 Jaroslav Kysela - 1.2.15.1-1 -- update to 1.2.15.1 - -* Wed Dec 10 2025 Jaroslav Kysela - 1.2.15-4 -- update to 1.2.15 - -* Wed Jul 23 2025 Fedora Release Engineering - 1.2.14-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 24 2025 Jaroslav Kysela - 1.2.14-3 -- update to latest alsa-ucm-conf files - -* Mon Apr 14 2025 Jaroslav Kysela - 1.2.14-2 -- update to 1.2.14 - -* Thu Jan 16 2025 Fedora Release Engineering - 1.2.13-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Nov 15 2024 Jaroslav Kysela - 1.2.13-3 -- update to 1.2.13 - -* Wed Jul 17 2024 Fedora Release Engineering - 1.2.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jun 10 2024 Jaroslav Kysela - 1.2.12-1 -- update to 1.2.12 - -* Mon Jan 29 2024 Jaroslav Kysela - 1.2.11-2 -- update to 1.2.11 - -* Mon Jan 22 2024 Fedora Release Engineering - 1.2.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.2.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Sep 4 2023 Jaroslav Kysela - 1.2.10-3 -- fix control.h header file (ump) -- fix SplitPCM (alsa-ucm) - -* Fri Sep 1 2023 Jaroslav Kysela - 1.2.10-1 -- update to 1.2.10 - -* Wed Jul 19 2023 Fedora Release Engineering - 1.2.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 6 2023 Jaroslav Kysela - 1.2.9-3 -- SPDX licences - -* Tue May 16 2023 Jaroslav Kysela - 1.2.9-2 -- update ucm (nhlt-dmic-info) - -* Thu May 4 2023 Jaroslav Kysela - 1.2.9-1 -- update to 1.2.9 - -* Wed Jan 18 2023 Fedora Release Engineering - 1.2.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Dec 7 2022 Jaroslav Kysela - 1.2.8-2 -- update lib code to latest git -- update ucm configs to latest git - -* Mon Oct 24 2022 Jaroslav Kysela - 1.2.8-1 -- update to 1.2.8 - -* Wed Jul 20 2022 Fedora Release Engineering - 1.2.7.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 8 2022 Jaroslav Kysela - 1.2.7.1-2 -- update to 1.2.7.2 - -* Fri Jun 17 2022 Jaroslav Kysela - 1.2.7.1-1 -- update to 1.2.7.1 - -* Tue May 31 2022 Jaroslav Kysela - 1.2.7-1 -- update to 1.2.7 - -* Wed Jan 19 2022 Fedora Release Engineering - 1.2.6.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - * Fri Dec 17 2021 Jaroslav Kysela - 1.2.6.1-3 - updated alsa-ucm-conf to 1.2.6.3 @@ -279,22 +179,16 @@ rm %{buildroot}/%{_includedir}/asoundlib.h * Mon Dec 6 2021 Jaroslav Kysela - 1.2.6-1 - update to 1.2.6 -* Sat Nov 13 2021 Peter Robinson - 1.2.5.1-4 -- Add Rockchip ES8316 support - -* Tue Aug 31 2021 Jaroslav Kysela - 1.2.5.1-3 +* Tue Aug 31 2021 Jaroslav Kysela - 1.2.5.1-2 - add UCM related fixes -* Wed Jul 21 2021 Fedora Release Engineering - 1.2.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Mon Jun 14 2021 Jaroslav Kysela - 1.2.5.1-1 - update to 1.2.5.1 * Wed Jun 2 2021 Jaroslav Kysela - 1.2.5-2 - add upstream fixes (conf + ucm) -* Fri May 28 2021 Jaroslav Kysela - 1.2.5-1 +* Mon May 31 2021 Jaroslav Kysela - 1.2.5-1 - update to 1.2.5 * Tue Jan 26 2021 Fedora Release Engineering - 1.2.4-5 diff --git a/alsa-ucm-conf.patch b/alsa-ucm-conf.patch new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources index 8a1161f..b6ee355 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (alsa-lib-1.2.15.3.tar.bz2) = 7fc0fa8a5ae02d3404d2c262c6a14fcbb8b08e25993eac86b9e89b8419ed4d293b422da77b3eb7a1930f26c316b638e5aa7bdba78b0ada9908b0362d132a0cc0 -SHA512 (alsa-ucm-conf-1.2.15.3.tar.bz2) = 079aeb45bc3f98448f6e48a1267db5d3f46a51d7060eb8275d0a084574e23eec34f07108610538e898c397fa24941ccf1bb7722c6b4bb0fa9c48904addc03973 +SHA512 (alsa-lib-1.2.6.1.tar.bz2) = 70e539cf092b5d43e00e4134d8a3e184f0dc34312823e4b58a574320cbf06cb7369bc3251ecb1858033756a7a8c35d36faa8da48d49f6efe0cec905784adbd45 +SHA512 (alsa-ucm-conf-1.2.6.3.tar.bz2) = 14031173dd9b44c506f13172fcf89d1119e4b2d409a749ec8ef4948e75231a5e5091206e826dff9e70f1f803de8cfb9fd94886ef70764c705f65c1c7ebdf649f SHA512 (alsa-topology-conf-1.2.5.tar.bz2) = 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51