From 7a1e2657ee2e2f06c907de8a5c2fa154eaa1505c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 1 Sep 2023 18:21:55 +0200 Subject: [PATCH 1/5] update to 1.2.10 Signed-off-by: Jaroslav Kysela --- alsa-lib-1.0.14-glibc-open.patch | 11 -- alsa-lib-1.2.10-glibc-open.patch | 10 ++ alsa-lib.spec | 11 +- alsa-ucm-conf.patch | 179 ------------------------------- sources | 4 +- 5 files changed, 19 insertions(+), 196 deletions(-) delete mode 100644 alsa-lib-1.0.14-glibc-open.patch create mode 100644 alsa-lib-1.2.10-glibc-open.patch diff --git a/alsa-lib-1.0.14-glibc-open.patch b/alsa-lib-1.0.14-glibc-open.patch deleted file mode 100644 index bc625bd..0000000 --- a/alsa-lib-1.0.14-glibc-open.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 new file mode 100644 index 0000000..2e53a92 --- /dev/null +++ b/alsa-lib-1.2.10-glibc-open.patch @@ -0,0 +1,10 @@ +--- 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 2efade0..386a27d 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -2,14 +2,14 @@ #define prever_dot .rc3 #define postver a -%define version_alsa_lib 1.2.9 -%define version_alsa_ucm 1.2.9 +%define version_alsa_lib 1.2.10 +%define version_alsa_ucm 1.2.10 %define version_alsa_tplg 1.2.5 Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: %{version_alsa_lib} -Release: 4%{?prever_dot}%{?dist} +Release: 1%{?prever_dot}%{?dist} License: LGPL-2.1-or-later URL: http://www.alsa-project.org/ @@ -22,7 +22,7 @@ Source12: modprobe-dist-oss.conf Source40: alsa-ucm-conf.patch Patch0: alsa-git.patch Patch1: alsa-lib-1.2.3.1-config.patch -Patch2: alsa-lib-1.0.14-glibc-open.patch +Patch2: alsa-lib-1.2.10-glibc-open.patch BuildRequires: doxygen BuildRequires: autoconf automake libtool @@ -167,6 +167,9 @@ rm %{buildroot}/%{_includedir}/asoundlib.h %{_datadir}/alsa/topology %changelog +* 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 diff --git a/alsa-ucm-conf.patch b/alsa-ucm-conf.patch index 836a828..e69de29 100644 --- a/alsa-ucm-conf.patch +++ b/alsa-ucm-conf.patch @@ -1,179 +0,0 @@ -From 906f692e4ed84dc136c270c05e1b490a554de99b Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Thu, 4 May 2023 14:36:49 +0200 -Subject: [PATCH 1/3] sof-essx8336: Dmic is not a valid UCM device identifier, - use Mic - -Signed-off-by: Jaroslav Kysela ---- - ucm2/Intel/sof-essx8336/sof-essx8336.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ucm2/Intel/sof-essx8336/sof-essx8336.conf b/ucm2/Intel/sof-essx8336/sof-essx8336.conf -index f74e007..f579a45 100644 ---- a/ucm2/Intel/sof-essx8336/sof-essx8336.conf -+++ b/ucm2/Intel/sof-essx8336/sof-essx8336.conf -@@ -32,7 +32,7 @@ If.devdmic { - Haystack "${CardComponents}" - Needle "cfg-dmics:" - } -- True.Define.DeviceDmic "Dmic" -+ True.Define.DeviceDmic "Mic" - } - - SectionUseCase."HiFi" { --- -2.39.2 - - -From 9fa70add76388087613d02b821acd656268060c4 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 16 May 2023 16:26:38 +0200 -Subject: [PATCH 2/3] sof-hda-dsp,sof-soundwire: add CaptureMicInfoFile fields - for dmics - -Signed-off-by: Jaroslav Kysela ---- - ucm2/Intel/sof-hda-dsp/HiFi.conf | 1 + - ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 3 +++ - ucm2/sof-soundwire/dmic.conf | 1 + - ucm2/sof-soundwire/rt715-sdca.conf | 11 ++++++----- - ucm2/sof-soundwire/rt715.conf | 1 + - ucm2/sof-soundwire/sof-soundwire.conf | 11 +++++++++++ - 6 files changed, 23 insertions(+), 5 deletions(-) - -diff --git a/ucm2/Intel/sof-hda-dsp/HiFi.conf b/ucm2/Intel/sof-hda-dsp/HiFi.conf -index 265949e..2063fc0 100644 ---- a/ucm2/Intel/sof-hda-dsp/HiFi.conf -+++ b/ucm2/Intel/sof-hda-dsp/HiFi.conf -@@ -22,6 +22,7 @@ If.dmic { - Value { - CapturePriority 100 - CapturePCM "hw:${CardId},6" -+ CaptureMicInfoFile "${var:LibDir}/dmics-nhlt.json" - If.chn { - Condition { - Type RegexMatch -diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf -index e430a7b..44acd69 100644 ---- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf -+++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf -@@ -12,6 +12,7 @@ If.devdmic { - True { - Define.DeviceDmic "Mic1" - Define.DeviceMic "Mic2" -+ Include.card-init.File "/lib/card-init.conf" - FixedBootSequence [ - # - # users expect to turn the LED on when only internal -@@ -19,6 +20,8 @@ If.devdmic { - # when all internal inputs are off - # - sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch" -+ # dmic array info -+ exec "-nhlt-dmic-info -o ${var:LibDir}/dmics-nhlt.json" - ] - } - } -diff --git a/ucm2/sof-soundwire/dmic.conf b/ucm2/sof-soundwire/dmic.conf -index 755840a..c53d381 100644 ---- a/ucm2/sof-soundwire/dmic.conf -+++ b/ucm2/sof-soundwire/dmic.conf -@@ -17,5 +17,6 @@ SectionDevice."Mic" { - CaptureMixerElem "Dmic0" - CaptureVolume "Dmic0 Capture Volume" - CaptureSwitch "Dmic0 Capture Switch" -+ CaptureMicInfoFile "${var:LibDir}/dmics-nhlt.json" - } - } -diff --git a/ucm2/sof-soundwire/rt715-sdca.conf b/ucm2/sof-soundwire/rt715-sdca.conf -index 6e481e1..268a247 100644 ---- a/ucm2/sof-soundwire/rt715-sdca.conf -+++ b/ucm2/sof-soundwire/rt715-sdca.conf -@@ -12,10 +12,11 @@ SectionDevice."Mic" { - ] - - Value { -- CapturePriority 100 -- CapturePCM "hw:${CardId},4" -- CaptureSwitch "rt714 FU02 Capture Switch" -- CaptureVolume "rt714 FU02 Capture Volume" -- CaptureMixerElem "rt714 FU02" -+ CapturePriority 100 -+ CapturePCM "hw:${CardId},4" -+ CaptureSwitch "rt714 FU02 Capture Switch" -+ CaptureVolume "rt714 FU02 Capture Volume" -+ CaptureMixerElem "rt714 FU02" -+ CaptureMicInfoFile "${var:LibDir}/dmics-nhlt.json" - } - } -diff --git a/ucm2/sof-soundwire/rt715.conf b/ucm2/sof-soundwire/rt715.conf -index a733c08..090b663 100644 ---- a/ucm2/sof-soundwire/rt715.conf -+++ b/ucm2/sof-soundwire/rt715.conf -@@ -26,5 +26,6 @@ SectionDevice."Mic" { - CaptureSwitch "${var:rt715ctl} Switch" - CaptureVolume "${var:rt715ctl} Volume" - CaptureMixerElem "${var:rt715ctl}" -+ CaptureMicInfoFile "${var:LibDir}/dmics-nhlt.json" - } - } -diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf -index 786ba63..3368d65 100644 ---- a/ucm2/sof-soundwire/sof-soundwire.conf -+++ b/ucm2/sof-soundwire/sof-soundwire.conf -@@ -92,3 +92,14 @@ If.pga_init_pga5 { - cset "name='PGA5.0 5 Master Capture Switch' 1" - ] - } -+ -+If.mics-array { -+ Condition { -+ Type String -+ Empty "${var:Mics1}" -+ } -+ False.FixedBootSequence { -+ # dmic array info -+ exec "-nhlt-dmic-info -o ${var:LibDir}/dmics-nhlt.json" -+ } -+} --- -2.39.2 - - -From 5cdbc7e283cd80994f31f2e2a3f4df8af778ccb8 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 16 May 2023 17:39:00 +0200 -Subject: [PATCH 3/3] sof-hda-dsp: move card-init include to top - -... otherwise the rm is called after the nhlt-dmic-info - -Signed-off-by: Jaroslav Kysela ---- - ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf -index 44acd69..98098e7 100644 ---- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf -+++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf -@@ -3,6 +3,8 @@ Syntax 6 - Define.DeviceMic "Mic" - Define.DeviceDmic "" - -+Include.card-init.File "/lib/card-init.conf" -+ - If.devdmic { - Condition { - Type String -@@ -12,7 +14,6 @@ If.devdmic { - True { - Define.DeviceDmic "Mic1" - Define.DeviceMic "Mic2" -- Include.card-init.File "/lib/card-init.conf" - FixedBootSequence [ - # - # users expect to turn the LED on when only internal --- -2.39.2 - diff --git a/sources b/sources index d92c338..98f5c7a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (alsa-lib-1.2.9.tar.bz2) = 8f39c8166c3648d46695a9287d9b9a35e5bfffed11d79e868ff7aba92d0fee792e82784186ebeb2a3e44d6b617c916025c7fce9a802565bb8e0dc8fdcce2311a -SHA512 (alsa-ucm-conf-1.2.9.tar.bz2) = 3aced4d4df76044a5525f1217851e05f7ad177389d2008e3e3dd0fb4d2cf72cd0897b140659a7729cc37d5b737c2d0cf5b607df4f576647044accd560d8cb87b +SHA512 (alsa-lib-1.2.10.tar.bz2) = 4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939 +SHA512 (alsa-ucm-conf-1.2.10.tar.bz2) = 172956a2c127e9afa5be9c6ada43bfa9fda825823f8f6acbe252edef3381afe3adfa3299c1419f04375599be7721a551c6800be99db44b091611aeb824ffcd72 SHA512 (alsa-topology-conf-1.2.5.tar.bz2) = 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51 From d04738ec317db6198a6158764b7b470b1bacadda Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 4 Sep 2023 10:19:43 +0200 Subject: [PATCH 2/5] fix control.h header file (ump) Signed-off-by: Jaroslav Kysela --- alsa-git.patch | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ alsa-lib.spec | 5 ++- 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/alsa-git.patch b/alsa-git.patch index e69de29..3ba704a 100644 --- a/alsa-git.patch +++ b/alsa-git.patch @@ -0,0 +1,82 @@ +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 386a27d..38c30a9 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -9,7 +9,7 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: %{version_alsa_lib} -Release: 1%{?prever_dot}%{?dist} +Release: 2%{?prever_dot}%{?dist} License: LGPL-2.1-or-later URL: http://www.alsa-project.org/ @@ -167,6 +167,9 @@ rm %{buildroot}/%{_includedir}/asoundlib.h %{_datadir}/alsa/topology %changelog +* Mon Sep 4 2023 Jaroslav Kysela - 1.2.10-2 +- fix control.h header file (ump) + * Fri Sep 1 2023 Jaroslav Kysela - 1.2.10-1 - update to 1.2.10 From 86d56deab268d145d9c40b22fbd799ef32dfb6c9 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 4 Sep 2023 17:17:29 +0200 Subject: [PATCH 3/5] fix SplitPCM (alsa-ucm) Signed-off-by: Jaroslav Kysela --- alsa-lib.spec | 5 +++-- alsa-ucm-conf.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/alsa-lib.spec b/alsa-lib.spec index 38c30a9..62ca19b 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -9,7 +9,7 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: %{version_alsa_lib} -Release: 2%{?prever_dot}%{?dist} +Release: 3%{?prever_dot}%{?dist} License: LGPL-2.1-or-later URL: http://www.alsa-project.org/ @@ -167,8 +167,9 @@ rm %{buildroot}/%{_includedir}/asoundlib.h %{_datadir}/alsa/topology %changelog -* Mon Sep 4 2023 Jaroslav Kysela - 1.2.10-2 +* 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 diff --git a/alsa-ucm-conf.patch b/alsa-ucm-conf.patch index e69de29..bd3790c 100644 --- a/alsa-ucm-conf.patch +++ b/alsa-ucm-conf.patch @@ -0,0 +1,28 @@ +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 + From 5033476669317c84c320f56b6d62d190b5af8a9a Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 29 Jan 2024 14:22:58 +0100 Subject: [PATCH 4/5] update to 1.2.11 Signed-off-by: Jaroslav Kysela --- alsa-git.patch | 82 --------------------------------------------- alsa-lib.spec | 9 +++-- alsa-ucm-conf.patch | 28 ---------------- sources | 4 +-- 4 files changed, 8 insertions(+), 115 deletions(-) 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 62ca19b..51bf412 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -2,14 +2,14 @@ #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 Name: alsa-lib Version: %{version_alsa_lib} -Release: 3%{?prever_dot}%{?dist} +Release: 2%{?prever_dot}%{?dist} License: LGPL-2.1-or-later URL: http://www.alsa-project.org/ @@ -167,6 +167,9 @@ 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-3 - fix control.h header file (ump) - fix SplitPCM (alsa-ucm) 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 From 6b5633596f27d8d6cfa70f82fd4297ed775feedf Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 10 Jun 2024 14:19:37 +0200 Subject: [PATCH 5/5] update to 1.2.12 Signed-off-by: Jaroslav Kysela --- alsa-lib.spec | 13 ++++++++----- sources | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/alsa-lib.spec b/alsa-lib.spec index 51bf412..92134ea 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -2,14 +2,14 @@ #define prever_dot .rc3 #define postver a -%define version_alsa_lib 1.2.11 -%define version_alsa_ucm 1.2.11 +%define version_alsa_lib 1.2.12 +%define version_alsa_ucm 1.2.12 %define version_alsa_tplg 1.2.5 Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: %{version_alsa_lib} -Release: 2%{?prever_dot}%{?dist} +Release: 1%{?prever_dot}%{?dist} License: LGPL-2.1-or-later URL: http://www.alsa-project.org/ @@ -20,7 +20,7 @@ Source10: asound.conf Source11: modprobe-dist-alsa.conf Source12: modprobe-dist-oss.conf Source40: alsa-ucm-conf.patch -Patch0: alsa-git.patch +#Patch0: alsa-git.patch Patch1: alsa-lib-1.2.3.1-config.patch Patch2: alsa-lib-1.2.10-glibc-open.patch @@ -70,7 +70,7 @@ contains alsa-lib configuration of SoC topology %prep %setup -q -n %{name}-%{version}%{?prever}%{?postver} -%patch -P0 -p1 -b .alsa-git +#patch -P0 -p1 -b .alsa-git %patch -P1 -p1 -b .config %patch -P2 -p1 -b .glibc-open @@ -167,6 +167,9 @@ rm %{buildroot}/%{_includedir}/asoundlib.h %{_datadir}/alsa/topology %changelog +* 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 diff --git a/sources b/sources index 0d62672..a2a4b9b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (alsa-lib-1.2.11.tar.bz2) = 7bf2c541dff5262c0302a1c716ca10cdb5105f4e0ad48f3341c3c7e975b0c3ea835a298a05974c3e216a85912c368d8025ba3cdda3ff04a7683133ce5b2a286d -SHA512 (alsa-ucm-conf-1.2.11.tar.bz2) = b202e7410a579789be0005564b4868f70bca0fd8664c02add95fc9ff90ab64faebda978fbd3e83a3274c37242dccf8efbebd03f529e35ca3033daf55f425cb8d +SHA512 (alsa-lib-1.2.12.tar.bz2) = 053e36e51c0ff28f07028b89c8845b50682a5c14035ab85c2fc8cae2f2f0d05e4cd45ed879602c15c1596fb7fe84bfd50ec0d119dfb55c66589a2d458a9b317d +SHA512 (alsa-ucm-conf-1.2.12.tar.bz2) = 391dde123271172d899c04865d1d6e21b4ad0060ee9b2256dfbc6fc89ad48edcaa43c861893ab0e5c70d972e20d15c528defc19c00308e7465f13f954cce25d7 SHA512 (alsa-topology-conf-1.2.5.tar.bz2) = 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51