commit 936693db4ecbf5a9b5307b601ef9ddc2785d22f4
Author: Jan Palus <[email protected]>
Date: Tue Dec 7 01:23:27 2021 +0100
up to 1.2.6
alsa-lib.spec | 21 ++++++++++-----------
symbol_mismatch.patch | 11 -----------
2 files changed, 10 insertions(+), 22 deletions(-)
---
diff --git a/alsa-lib.spec b/alsa-lib.spec
index dd78972..9d48e8d 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -13,22 +13,22 @@ Summary(pt_BR.UTF-8): Biblioteca para o ALSA
(Advanced Linux Sound Architecture)
Summary(ru.UTF-8): Библиотека API для работы с драйвером ALSA
Summary(uk.UTF-8): Бібліотека API для роботи з драйвером ALSA
Name: alsa-lib
-Version: 1.2.5.1
+Version: 1.2.6
# alsa-*-conf tarballs are not released for each patch version
-%define confver 1.2.5.1
-Release: 2
+%define topology_confver 1.2.5.1
+%define ucm_confver 1.2.6
+Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}.tar.bz2
-# Source0-md5: c8335793e7828803311edc48fb71662e
+# Source0-md5: 2b806663952273dc5f463c67a6c3d726
Source1: %{name}-modprobe.conf
Source2: %{name}-asound.conf
Source3: smixer.conf
-Source4:
ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{confver}.tar.bz2
+Source4:
ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{topology_confver}.tar.bz2
# Source4-md5: 066d6a980e09a2fa44b4cc1d06ecc0ea
-Source5:
ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-%{confver}.tar.bz2
-# Source5-md5: 86ac831b4273c762196f8c1f67907c69
-Patch0: symbol_mismatch.patch
+Source5:
ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-%{ucm_confver}.tar.bz2
+# Source5-md5: 44a3e97680947ee89b2d283213a5cd57
URL: https://www.alsa-project.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
@@ -201,7 +201,6 @@ Moduł wiązania Pythona dla interfejsu miksera architektury
ALSA.
%prep
%setup -q
-%patch0 -p1
cp -p %{SOURCE3} src/conf
%build
@@ -256,8 +255,8 @@ install -d
$RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/alsa/conf.d,%{_datadir}/alsa/
ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo libasound.so.*.*) \
$RPM_BUILD_ROOT%{_libdir}/libasound.so
-tar xf %{SOURCE4} --strip-components=1 -C $RPM_BUILD_ROOT%{_datadir}/alsa
alsa-topology-conf-%{confver}/topology
-tar xf %{SOURCE5} --strip-components=1 -C $RPM_BUILD_ROOT%{_datadir}/alsa
alsa-ucm-conf-%{confver}/ucm alsa-ucm-conf-%{confver}/ucm2
+tar xf %{SOURCE4} --strip-components=1 -C $RPM_BUILD_ROOT%{_datadir}/alsa
alsa-topology-conf-%{topology_confver}/topology
+tar xf %{SOURCE5} --strip-components=1 -C $RPM_BUILD_ROOT%{_datadir}/alsa
alsa-ucm-conf-%{ucm_confver}/ucm alsa-ucm-conf-%{ucm_confver}/ucm2
install -D utils/alsa.m4 $RPM_BUILD_ROOT%{_aclocaldir}/alsa.m4
install %{SOURCE1} $RPM_BUILD_ROOT/etc/modprobe.d/alsa-base.conf
diff --git a/symbol_mismatch.patch b/symbol_mismatch.patch
deleted file mode 100644
index 35a30b6..0000000
--- a/symbol_mismatch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- alsa-lib-1.2.5.1/src/control/control_empty.c.orig 2021-06-15
15:45:18.783814585 +0000
-+++ alsa-lib-1.2.5.1/src/control/control_empty.c 2021-06-15
15:45:29.317123597 +0000
-@@ -30,7 +30,7 @@
-
- #ifndef PIC
- /* entry for static linking */
--const char *_snd_module_ctl_empty = "";
-+const char *_snd_module_control_empty = "";
- #endif
-
- /*! \page control_plugins
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/alsa-lib.git/commitdiff/1fb7dd8ce6caddbf8f1eb4273b704976d36ce15c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
