import alsa-lib-1.2.6.1-3.el8

.alsa-lib.metadata

@@ -1,3 +1,3 @@
-66669eca0b5ab98985082d4971316a29d2a2cbbf SOURCES/alsa-lib-1.2.5.tar.bz2
+46c48570b3ef0de554305d00f16845736a9548ab SOURCES/alsa-lib-1.2.6.1.tar.bz2
 8c1d225b9fe108797349e8d0cb6161271aab0f50 SOURCES/alsa-topology-conf-1.2.5.tar.bz2
-d2011adda869a9e1d78a6b029252f2a8cd6a68f6 SOURCES/alsa-ucm-conf-1.2.5.tar.bz2
+044ec8f6d29d61a32f1d6438b7fcd36789dfb463 SOURCES/alsa-ucm-conf-1.2.6.3.tar.bz2

.gitignore

@@ -1,3 +1,3 @@
-SOURCES/alsa-lib-1.2.5.tar.bz2
+SOURCES/alsa-lib-1.2.6.1.tar.bz2
 SOURCES/alsa-topology-conf-1.2.5.tar.bz2
-SOURCES/alsa-ucm-conf-1.2.5.tar.bz2
+SOURCES/alsa-ucm-conf-1.2.6.3.tar.bz2

SOURCES/alsa-ucm-git.patch

@@ -1,24 +1,156 @@
-From 3f34021beffba4e39f064a14c5faceeaa224b766 Mon Sep 17 00:00:00 2001
+From 0b2aa9d22f8897cbe68f1aa2ffe437ad3194ec4b Mon Sep 17 00:00:00 2001
 From: Jaroslav Kysela <perex@perex.cz>
-Date: Tue, 1 Jun 2021 21:08:53 +0200
+Date: Mon, 27 Dec 2021 22:05:16 +0100
-Subject: [PATCH 3/4] HDA-Intel: the lookups are supported from syntax 4
+Subject: [PATCH 1/4] HDA-DualCodecs: fix typo in Speaker condition
 
 Signed-off-by: Jaroslav Kysela <perex@perex.cz>
 ---
- ucm2/HDA-Intel/HDA-Intel.conf | 2 +-
+ ucm2/HDA/DualCodecs/HiFi.conf | 4 ++--
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/ucm2/HDA-Intel/HDA-Intel.conf b/ucm2/HDA-Intel/HDA-Intel.conf
+diff --git a/ucm2/HDA/DualCodecs/HiFi.conf b/ucm2/HDA/DualCodecs/HiFi.conf
-index 5794e72..8a8e0e7 100644
+index 7dcd6b0..1f7e58d 100644
---- a/ucm2/HDA-Intel/HDA-Intel.conf
+--- a/ucm2/HDA/DualCodecs/HiFi.conf
-+++ b/ucm2/HDA-Intel/HDA-Intel.conf
++++ b/ucm2/HDA/DualCodecs/HiFi.conf
-@@ -1,4 +1,4 @@
+@@ -19,7 +19,7 @@ SectionVerb {
--Syntax 3
+ If.speaker {
-+Syntax 4
+ 	Condition {
+ 		Type ControlExists
+-		Control "name='Speaker Volume Switch'"
++		Control "name='Speaker Playback Switch'"
+ 	}
+ 	True {
+ 		SectionVerb {
+@@ -100,7 +100,7 @@ SectionDevice."Headphones" {
+ 	If.speaker {
+ 		Condition {
+ 			Type ControlExists
+-			Control "name='Speaker Volume Switch'"
++			Control "name='Speaker Playback Switch'"
+ 		}
+ 		True.Value.JackHWMute "Speaker"
+ 	}
+-- 
+2.34.1
+
+
+From 369f8b497e15a993d411df81a39ee5c8c1433363 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Fri, 7 Jan 2022 10:57:48 +0100
+Subject: [PATCH 2/4] HDA-acp: avoid to create 'Mic ACP LED' control for the
+ HDMI card
+
+BugLink: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1849#note_1210933
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ ucm2/HDA/HDA.conf | 20 ++++++++++++++------
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf
+index 003d941..ab80fa5 100644
+--- a/ucm2/HDA/HDA.conf
++++ b/ucm2/HDA/HDA.conf
+@@ -43,13 +43,21 @@ If.use {
+ 			Comment "Play HiFi quality Music"
+ 		}
  
- Define.Use ""	# a non-empty string to use UCM configuration for HDA devices
+-		Include.init.File "/HDA/init.conf"
++		If.analog {
++			Condition {
++				Type ControlExists
++				Control "name='Master Playback Switch'"
++			}
++			True {
++				Include.init.File "/HDA/init.conf"
+ 
+-		FixedBootSequence [
+-			cset-new "name='Mic ACP LED Capture Switch' type=bool,count=1 off"
+-			exec "-/sbin/modprobe snd_ctl_led"
+-			sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:Mic ACP LED Capture Switch"
+-		]
++				FixedBootSequence [
++					cset-new "name='Mic ACP LED Capture Switch' type=bool,count=1 off"
++					exec "-/sbin/modprobe snd_ctl_led"
++					sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:Mic ACP LED Capture Switch"
++				]
++			}
++		}
+ 	}
+ }
  
 -- 
-2.30.2
+2.34.1
 
 
+From 642db9b51ff7f8ad022fee0362871ceaa46599bf Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Thu, 27 Jan 2022 21:50:32 +0100
+Subject: [PATCH 3/4] acp6x: add initial support for AMD Yellow Carp - ACP6x
+
+Link: https://github.com/alsa-project/alsa-ucm-conf/issues/136
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ ucm2/HDA/HDA.conf            | 2 +-
+ ucm2/conf.d/acp6x/acp6x.conf | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 120000 ucm2/conf.d/acp6x/acp6x.conf
+
+diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf
+index ab80fa5..411f2e7 100644
+--- a/ucm2/HDA/HDA.conf
++++ b/ucm2/HDA/HDA.conf
+@@ -3,7 +3,7 @@ Syntax 4
+ Define.Use ""	# a non-empty string to use UCM configuration for HDA devices
+ Define.Done ""	# a non-empty string to skip the end error
+ 
+-Define.AcpCardId "$${find-card:field=name,return=id,regex='^acp$'}"
++Define.AcpCardId "$${find-card:field=name,return=id,regex='^(acp|acp6x)$'}"
+ Define.DeviceMic "Mic"
+ 
+ If.dualcodec {
+diff --git a/ucm2/conf.d/acp6x/acp6x.conf b/ucm2/conf.d/acp6x/acp6x.conf
+new file mode 120000
+index 0000000..7298c24
+--- /dev/null
++++ b/ucm2/conf.d/acp6x/acp6x.conf
+@@ -0,0 +1 @@
++../../common/linked-card.conf
+\ No newline at end of file
+-- 
+2.34.1
+
+
+From 8170fffa7bad33c67b7c59ef5d98d92c0c742e91 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 9 Feb 2022 16:19:31 +0100
+Subject: [PATCH 4/4] sof-hda-dsp: fix multiple If.dmic blocks
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix multiple If.dmic blocks - rename the first to devdmic
+initialization.
+
+Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/132
+Reported-by: Kacper Michajłow <kasper93@gmail.com>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf | 2 +-
+ 1 file changed, 1 insertion(+), 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 b47777b..eb243d1 100644
+--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
++++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
+@@ -3,7 +3,7 @@ Syntax 4
+ Define.DeviceMic "Mic"
+ Define.DeviceDmic ""
+ 
+-If.dmic {
++If.devdmic {
+ 	Condition {
+ 		Type String
+ 		Haystack "${CardComponents}"
+-- 
+2.34.1
+

SPECS/alsa-lib.spec

@@ -2,14 +2,14 @@
 #define  prever_dot .rc3
 #define  postver    a
 
-%define version_alsa_lib  1.2.5
+%define version_alsa_lib  1.2.6.1
-%define version_alsa_ucm  1.2.5
+%define version_alsa_ucm  1.2.6.3
 %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:  3%{?prever_dot}%{?dist}
 License:  LGPLv2+
 Group:    System Environment/Libraries
 URL:      http://www.alsa-project.org/
@@ -55,7 +55,7 @@ Summary:   ALSA Use Case Manager configuration
 Group:     System Environment/Libraries
 BuildArch: noarch
 License:   BSD
-Requires:  %{name} >= %{version_alsa_ucm}
+Requires:  %{name} >= %{version_alsa_lib}
 
 %description -n alsa-ucm
 The Advanced Linux Sound Architecture (ALSA) Universal Configuration 
@@ -66,7 +66,7 @@ Summary:   ALSA Topology configuration
 Group:     System Environment/Libraries
 BuildArch: noarch
 License:   BSD
-Requires:  %{name} >= %{version_alsa_tplg}
+Requires:  %{name} >= %{version_alsa_lib}
 
 %description -n alsa-topology
 The Advanced Linux Sound Architecture (ALSA) topology configuration
@@ -163,6 +163,12 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
 %{_datadir}/alsa/topology
 
 %changelog
+* Fri Feb 11 2022 Jaroslav Kysela <perex@perex.cz> - 1.2.6.1-3
+- import fixes from upstream (UCM: AMD ACP6x, HDA, sof-hda-dsp)
+
+* Mon Dec 20 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.6.1-1
+- Updated to alsa-lib 1.2.6.1 and alsa-ucm-conf 1.2.6.3
+
 * Mon Jun 14 2021 Jaroslav Kysela <perex@perex.cz> - 1.2.5-4
 - Updated to 1.2.5