update to 1.2.12

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

alsa-lib-1.0.14-glibc-open.patch

@@ -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)

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 <limits.h>
+ #include <signal.h>
+ 
++#undef open
+ 
+ char *command;
+ 

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.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:  4%{?prever_dot}%{?dist}
+Release:  1%{?prever_dot}%{?dist}
 License:  LGPL-2.1-or-later
 URL:      http://www.alsa-project.org/
 
@@ -20,9 +20,9 @@ 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.0.14-glibc-open.patch
+Patch2:   alsa-lib-1.2.10-glibc-open.patch
 
 BuildRequires:  doxygen
 BuildRequires:  autoconf automake libtool
@@ -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,19 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
 %{_datadir}/alsa/topology
 
 %changelog
+* Mon Jun 10 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.12-1
+- update to 1.2.12
+
+* Mon Jan 29 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.11-2
+- update to 1.2.11
+
+* Mon Sep  4 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.10-3
+- fix control.h header file (ump)
+- fix SplitPCM (alsa-ucm)
+
+* Fri Sep  1 2023 Jaroslav Kysela <perex@perex.cz> - 1.2.10-1
+- update to 1.2.10
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

alsa-ucm-conf.patch

@@ -1,179 +0,0 @@
-From 906f692e4ed84dc136c270c05e1b490a554de99b Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-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 <perex@perex.cz>
----
- 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 <perex@perex.cz>
-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 <perex@perex.cz>
----
- 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 <perex@perex.cz>
-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 <perex@perex.cz>
----
- 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
-

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.12.tar.bz2) = 053e36e51c0ff28f07028b89c8845b50682a5c14035ab85c2fc8cae2f2f0d05e4cd45ed879602c15c1596fb7fe84bfd50ec0d119dfb55c66589a2d458a9b317d
+SHA512 (alsa-ucm-conf-1.2.12.tar.bz2) = 391dde123271172d899c04865d1d6e21b4ad0060ee9b2256dfbc6fc89ad48edcaa43c861893ab0e5c70d972e20d15c528defc19c00308e7465f13f954cce25d7
 SHA512 (alsa-topology-conf-1.2.5.tar.bz2) = 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51