up to 1.2.11

diff --git a/alsa-lib.spec b/alsa-lib.spec
index 42dc1b05d36ca7aca485e0ddaf6a8fbf08bbfb14..0ed7514f1220eef6a33c5de21e3aecc14e59d354 100644 (file)
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -13,22 +13,23 @@ 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.10
+Version:       1.2.11
 # alsa-*-conf tarballs are not released for each patch version
 %define        topology_confver        1.2.5.1
-%define        ucm_confver             1.2.10
+%define        ucm_confver             1.2.11
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}.tar.bz2
-# Source0-md5: aced5acdb6161ed86e5ca3bb10618ca1
+# Source0-md5: 1c5870770047b6a520d18a43f49e42ea
 Source1:       %{name}-modprobe.conf
 Source2:       %{name}-asound.conf
 Source3:       smixer.conf
 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-%{ucm_confver}.tar.bz2
-# Source5-md5: fd158570990bf8c99dac52a585afc328
+# Source5-md5: 125060f9693e27ed9a57e29a2e88c32f
+Patch0:                version-script-path.patch
 URL:           https://www.alsa-project.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -203,6 +204,7 @@ Moduł wiązania Pythona dla interfejsu miksera architektury ALSA.
 %prep
 %setup -q
 cp -p %{SOURCE3} src/conf
+%patch0 -p1
 
 %build
 %{__libtoolize}

diff --git a/version-script-path.patch b/version-script-path.patch
new file mode 100644 (file)
index 0000000..e4b08a6
--- /dev/null
+++ b/version-script-path.patch
@@ -0,0 +1,33 @@
+From 5387a33da48a542480ca6628b1dc1fff7afd5011 Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus@fastmail.com>
+Date: Tue, 30 Jan 2024 14:24:25 +0100
+Subject: [PATCH] topology: correct version script path
+
+contrary to libasound, version script for libatopology is a regular
+source file. while it's often the case that $(builddir) and $(srcdir)
+point to the same directory, they don't always have to. therefore path
+needs to point explicitly to $(srcdir) for Versions script in topology
+
+Fixes: GH-382
+Fixes: dc7da761f3a2 ("topology: separate Versions linker script")
+Signed-off-by: Jan Palus <jpalus@fastmail.com>
+---
+ src/topology/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
+index 04299588..e0b78373 100644
+--- a/src/topology/Makefile.am
++++ b/src/topology/Makefile.am
+@@ -2,7 +2,7 @@ EXTRA_DIST = Versions
+ COMPATNUM=@LIBTOOL_VERSION_INFO@
+ 
+ if VERSIONED_SYMBOLS
+-VSYMS = -Wl,--version-script=Versions
++VSYMS = -Wl,--version-script=$(srcdir)/Versions
+ else
+ VSYMS =
+ endif
+-- 
+2.43.0
+