diff --git a/alsa-git.patch b/alsa-git.patch index 3ba704a..e69de29 100644 --- a/alsa-git.patch +++ b/alsa-git.patch @@ -1,82 +0,0 @@ -From 9685505bf438467d9b11919b332b066d3a1c94d0 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 09:37:29 +0200 -Subject: [PATCH 1/2] gitcompile: Add static build - -Signed-off-by: Jaroslav Kysela ---- - gitcompile | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/gitcompile b/gitcompile -index 0fe092ce..c70448f7 100755 ---- a/gitcompile -+++ b/gitcompile -@@ -32,6 +32,10 @@ if [ $# -ne 0 ]; then - lto="-flto -flto-partition=none" - echo "Forced lto build..." - shift ;; -+ static) -+ static=yes -+ echo "Selected static build..." -+ shift ;; - *) - endloop=yes - ;; -@@ -75,6 +79,12 @@ if [ "$python2" = "yes" ]; then - args="$args --enable-python2" - fi - -+if [ "$static" = "yes" ]; then -+ #args="$args --enable-shared=no --enable-static=yes" -+ args="$args --disable-shared" -+fi -+ -+ - touch ltconfig - libtoolize --force --copy --automake - aclocal $ACLOCAL_FLAGS --- -2.41.0 - - -From fcce13a6726c52882bd8b7131c61c4eba308792c Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 09:38:26 +0200 -Subject: [PATCH 2/2] control.h: Fix ump header file detection -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Apparently, the control.h is used from apps separately (outside -asoundlib.h). Avoid errors like: - -/usr/include/alsa/control.h:417:47: error: ‘snd_ump_endpoint_info_t’ has not been declared - 417 | int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info); - | ^~~~~~~~~~~~~~~~~~~~~~~ -/usr/include/alsa/control.h:418:44: error: ‘snd_ump_block_info_t’ has not been declared - 418 | int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info); - | ^~~~~~~~~~~~~~~~~~~~ - -Fixes: https://github.com/alsa-project/alsa-lib/issues/348 -Signed-off-by: Jaroslav Kysela ---- - include/control.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/control.h b/include/control.h -index ab482ba4..e7541d56 100644 ---- a/include/control.h -+++ b/include/control.h -@@ -413,6 +413,8 @@ int snd_ctl_pcm_prefer_subdevice(snd_ctl_t *ctl, int subdev); - int snd_ctl_rawmidi_next_device(snd_ctl_t *ctl, int * device); - int snd_ctl_rawmidi_info(snd_ctl_t *ctl, snd_rawmidi_info_t * info); - int snd_ctl_rawmidi_prefer_subdevice(snd_ctl_t *ctl, int subdev); -+#endif -+#ifdef __ALSA_UMP_H - int snd_ctl_ump_next_device(snd_ctl_t *ctl, int *device); - int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info); - int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info); --- -2.41.0 - diff --git a/alsa-lib.spec b/alsa-lib.spec index 170ca4c..01e1ca8 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -2,8 +2,8 @@ #define prever_dot .rc3 #define postver a -%define version_alsa_lib 1.2.10 -%define version_alsa_ucm 1.2.10 +%define version_alsa_lib 1.2.11 +%define version_alsa_ucm 1.2.11 %define version_alsa_tplg 1.2.5 Summary: The Advanced Linux Sound Architecture (ALSA) library @@ -167,13 +167,15 @@ rm %{buildroot}/%{_includedir}/asoundlib.h %{_datadir}/alsa/topology %changelog +* Mon Jan 29 2024 Jaroslav Kysela - 1.2.11-2 +- update to 1.2.11 + * Mon Sep 4 2023 Jaroslav Kysela - 1.2.10-2 - update to 1.2.10 - SPDX licences - fix control.h header file (ump) - fix SplitPCM (alsa-ucm) - * Thu May 4 2023 Jaroslav Kysela - 1.2.9-1 - update to 1.2.9 diff --git a/alsa-ucm-conf.patch b/alsa-ucm-conf.patch index bd3790c..e69de29 100644 --- a/alsa-ucm-conf.patch +++ b/alsa-ucm-conf.patch @@ -1,28 +0,0 @@ -From b68aa52acdd2763fedad5eec0f435fbf43e5ccc6 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:39:52 +0200 -Subject: [PATCH] SplitPCM: Device argument may not be set - -Link: https://github.com/alsa-project/alsa-ucm-conf/issues/346 -Fixes: 10967ea ("SplitPCM: Fix Device variable in SplitPCMDevice macro") -Signed-off-by: Jaroslav Kysela ---- - ucm2/common/pcm/split.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ucm2/common/pcm/split.conf b/ucm2/common/pcm/split.conf -index 80f23e6..9ed2f95 100644 ---- a/ucm2/common/pcm/split.conf -+++ b/ucm2/common/pcm/split.conf -@@ -326,7 +326,7 @@ DefineMacro.SplitPCMDevice { - If.0 { - Condition { - Type String -- Empty "${var:__Device}" -+ Empty "${var:-__Device}" - } - True.Define.__Device "0" - } --- -2.41.0 - diff --git a/sources b/sources index 98f5c7a..0d62672 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (alsa-lib-1.2.10.tar.bz2) = 4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939 -SHA512 (alsa-ucm-conf-1.2.10.tar.bz2) = 172956a2c127e9afa5be9c6ada43bfa9fda825823f8f6acbe252edef3381afe3adfa3299c1419f04375599be7721a551c6800be99db44b091611aeb824ffcd72 +SHA512 (alsa-lib-1.2.11.tar.bz2) = 7bf2c541dff5262c0302a1c716ca10cdb5105f4e0ad48f3341c3c7e975b0c3ea835a298a05974c3e216a85912c368d8025ba3cdda3ff04a7683133ce5b2a286d +SHA512 (alsa-ucm-conf-1.2.11.tar.bz2) = b202e7410a579789be0005564b4868f70bca0fd8664c02add95fc9ff90ab64faebda978fbd3e83a3274c37242dccf8efbebd03f529e35ca3033daf55f425cb8d SHA512 (alsa-topology-conf-1.2.5.tar.bz2) = 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51