diff --git a/alsa-lib-1.2.10.tar.bz2 b/alsa-lib-1.2.10.tar.bz2 deleted file mode 100644 index d85108d70de497351ee6c5faedb9d04f22c5c873..0000000000000000000000000000000000000000 Binary files a/alsa-lib-1.2.10.tar.bz2 and /dev/null differ diff --git a/alsa-lib-1.2.12.tar.bz2 b/alsa-lib-1.2.12.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..659a2b1418990d63bfea180dbbd16d34b97a61cb Binary files /dev/null and b/alsa-lib-1.2.12.tar.bz2 differ diff --git a/alsa-lib.spec b/alsa-lib.spec index 7811199e43c40b6e651d0faaa35f637badaab8c6..a17471d4cb7990ef4442826619d38c3ebe2e3d7b 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -1,22 +1,21 @@ -%define version_alsa_ucm 1.2.7.1 +%define version_alsa_lib 1.2.12 +%define version_alsa_ucm 1.2.12 %define version_alsa_tplg 1.2.5.1 Name: alsa-lib -Version: 1.2.10 -Release: 2 +Version: %{version_alsa_lib} +Release: 1 Summary: the user space library that developers compile ALSA applications against -License: LGPLv2+ +License: LGPL-2.1-or-later URL: https://alsa-project.org/ Source0: https://www.alsa-project.org/files/pub/lib/%{name}-%{version}.tar.bz2 -Source1: ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-%{version_alsa_ucm}.tar.bz2 -Source2: ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{version_alsa_tplg}.tar.bz2 +Source1: https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-%{version_alsa_ucm}.tar.bz2 +Source2: https://www.alsa-project.org/files/pub/lib/alsa-topology-conf-%{version_alsa_tplg}.tar.bz2 Source10: asound.conf -Source40: alsa-ucm-conf.patch Patch1: alsa-lib-1.2.5.1-sw.patch -BuildRequires: autoconf, automake, libtool, doxygen, gtk3 -Requires: coreutils +BuildRequires: autoconf, automake, libtool, doxygen %description The alsa-lib is a library to interface with ALSA in the Linux kernel @@ -25,10 +24,8 @@ More detail: https://alsa.opensrc.org/Alsa-lib %package devel Summary: Development header files -Requires: %{name} = %{version} -Requires: pkgconfig -Provides: %{name}-devel = %{version} -Provides: pkgconfig(alsa) +Requires: %{name} = %{version}-%{release} +Provides: %{name}-devel = %{version}-%{release} %description devel This package contains libraries and header files for the ALSA development. @@ -36,8 +33,8 @@ This package contains libraries and header files for the ALSA development. %package -n alsa-ucm Summary: ALSA Use Case Manager configuration BuildArch: noarch -License: BSD -Requires: %{name} >= %{version_alsa_ucm} +License: BSD-3-Clause +Requires: %{name} >= %{version_alsa_lib} %description -n alsa-ucm The Advanced Linux Sound Architecture (ALSA) Use Case Manager configuration @@ -46,17 +43,27 @@ contains alsa-lib configuration of Audio input/output names and routing %package -n alsa-topology Summary: ALSA Topology configuration BuildArch: noarch -License: BSD -Requires: %{name} >= %{version_alsa_tplg} +License: BSD-3-Clause +Requires: %{name} >= %{version_alsa_lib} %description -n alsa-topology The Advanced Linux Sound Architecture (ALSA) topology configuration contains alsa-lib configuration of SoC topology %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-%{version} -a 1 -p1 +%setup -DTq -n %{name}-%{version} -a 2 %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 %configure --disable-aload \ --with-plugindir=%{_libdir}/alsa-lib \ @@ -64,73 +71,73 @@ autoreconf -vif %disable_rpath -make %{?_smp_mflags} VERBOSE=1 -make doc %{?_smp_mflags} +%make_build +%make_build doc %install -make install DESTDIR=%{buildroot} +%make_install +%delete_la # the asound.conf configuration files are required for ALSA to work properly mkdir -p -m 755 %{buildroot}%{_sysconfdir} -install -p -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir} +install -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir} # Create UCM directories mkdir -p %{buildroot}/%{_datadir}/alsa/ucm mkdir -p %{buildroot}/%{_datadir}/alsa/ucm2 # Unpack UCMs -tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "alsa-ucm-conf-%{version_alsa_ucm}/ucm" "alsa-ucm-conf-%{version_alsa_ucm}/ucm2" -patch -d %{buildroot}/%{_datadir}/alsa -p1 < %{SOURCE40} +tar xvjf %{S:1} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "alsa-ucm-conf-%{version_alsa_ucm}/ucm" "alsa-ucm-conf-%{version_alsa_ucm}/ucm2" # Create topology directory mkdir -p %{buildroot}/%{_datadir}/alsa/topology # Unpack topologies -tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "alsa-topology-conf-%{version_alsa_tplg}/topology" - - - -%ldconfig_scriptlets +tar xvjf %{S:2} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "alsa-topology-conf-%{version_alsa_tplg}/topology" %files %license COPYING %doc doc/asoundrc.txt -%{_sysconfdir}/*.conf +%config %{_sysconfdir}/*.conf %{_bindir}/* %{_libdir}/libasound.so.* %{_libdir}/libatopology.so.* -%{_datadir}/alsa/* -%exclude %{_datadir}/alsa/ucm -%exclude %{_datadir}/alsa/ucm2 -%exclude %{_datadir}/alsa/topology +%dir %{_datadir}/alsa +%{_datadir}/alsa/alsa.conf +%{_datadir}/alsa/cards +%{_datadir}/alsa/ctl +%{_datadir}/alsa/pcm %files devel %doc doc/doxygen/ TODO %{_libdir}/libasound.so %{_libdir}/libatopology.so -%exclude %{_libdir}/libasound.la -%exclude %{_libdir}/libatopology.la %{_libdir}/pkgconfig/*.pc %{_includedir}/* %{_datadir}/aclocal/*.m4 %files -n alsa-ucm -# BSD +%license alsa-ucm-conf-%{version_alsa_ucm}/LICENSE +%doc alsa-ucm-conf-%{version_alsa_ucm}/README.md %{_datadir}/alsa/ucm %{_datadir}/alsa/ucm2 %files -n alsa-topology -# BSD +%license alsa-topology-conf-%{version_alsa_tplg}/LICENSE +%doc alsa-topology-conf-%{version_alsa_tplg}/README.md %{_datadir}/alsa/topology %changelog +* Sat Oct 12 2024 Funda Wang - 1.2.12-1 +- Upgrade to 1.2.12 + * Tue Feb 6 2024 taoyuxiang - 1.2.10 - Upgrade to 1.2.10 * Wed Aug 9 2023 zhangnaichuan - 1.2.9-2 - fix: build failuer caused by tar upgrade -* Fri July 21 2023 lijianglin - 1.2.9-1 +* Fri Jul 21 2023 lijianglin - 1.2.9-1 - Upgrade to 1.2.9 * Thu Feb 9 2023 lijianglin - 1.2.8-1 diff --git a/alsa-lib.yaml b/alsa-lib.yaml index 591b5a7ba9926118bd8edaf659b6d7f520ac0983..196595f6e915bb68771294a428091a6ac1378550 100644 --- a/alsa-lib.yaml +++ b/alsa-lib.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: alsa-project/alsa-lib tag_prefix: ^v -seperator: . +separator: . diff --git a/alsa-ucm-conf-1.2.12.tar.bz2 b/alsa-ucm-conf-1.2.12.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..10aac34993138dfff51c9babd4198438b2c01b2d Binary files /dev/null and b/alsa-ucm-conf-1.2.12.tar.bz2 differ diff --git a/alsa-ucm-conf-1.2.7.1.tar.bz2 b/alsa-ucm-conf-1.2.7.1.tar.bz2 deleted file mode 100644 index d36f3025486100897a0c133ff302e813f82f660b..0000000000000000000000000000000000000000 Binary files a/alsa-ucm-conf-1.2.7.1.tar.bz2 and /dev/null differ diff --git a/alsa-ucm-conf.patch b/alsa-ucm-conf.patch deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000