Compare commits

..

4 commits

Author SHA1 Message Date
Jaroslav Kysela
9547c9ae12 fix snd_seq_has_queue_tempo_base symbol version
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2024-11-15 10:03:49 +01:00
Jaroslav Kysela
073d4bad7b fix SOF HDA UCM configuration
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2024-11-13 16:44:33 +01:00
Jaroslav Kysela
6f935e207e update to 1.2.13
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2024-11-12 13:50:57 +01:00
Jaroslav Kysela
a86ef66656 update to 1.2.12
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2024-06-10 15:13:22 +02:00
4 changed files with 148 additions and 46 deletions

42
alsa-git.patch Normal file
View file

@ -0,0 +1,42 @@
From 76edab4e595bd5f3f4c636cccc8d7976d3c519d6 Mon Sep 17 00:00:00 2001
From: Nicholas Vinson <nvinson234@gmail.com>
Date: Thu, 14 Nov 2024 07:49:53 -0500
Subject: [PATCH] src/Versions.in.in: Update *_tempo_base name
Change @SYMBOL_PREFIX@snd_has_tempo_base to
@SYMBOL_PREFIX@snd_has_queue_tempo_base.
Starting with version 1.2.13, alsa-lib fails to link with ld.lld-19 due
to "version script assignment of 'ALSA_1.2.13' to symbol
'snd_seq_has_tempo_base' failed: symbol not defined".
Per commit 769d1db1b0a213a39c7e59c0d1d724e7f45b1ac3 the correct name for
the symbol is @SYMBOL_PREFIX@snd_has_queue_tempo_base; therefore, update
src/Vesions.in.in to match.
Fixes bug #420
Fixes Gentoo bug 943399 (https://bugs.gentoo.org/943399)
Closes: https://github.com/alsa-project/alsa-lib/pull/421
Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/Versions.in.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Versions.in.in b/src/Versions.in.in
index 350ec3d8..7ad6a633 100644
--- a/src/Versions.in.in
+++ b/src/Versions.in.in
@@ -212,7 +212,7 @@ ALSA_1.2.13 {
@SYMBOL_PREFIX@snd_seq_create_ump_block;
@SYMBOL_PREFIX@snd_seq_queue_tempo_get_tempo_base;
@SYMBOL_PREFIX@snd_seq_queue_tempo_set_tempo_base;
- @SYMBOL_PREFIX@snd_seq_has_tempo_base;
+ @SYMBOL_PREFIX@snd_seq_has_queue_tempo_base;
@SYMBOL_PREFIX@snd_seq_port_info_get_ump_is_midi1;
@SYMBOL_PREFIX@snd_seq_port_info_set_ump_is_midi1;
#endif
--
2.47.0

View file

@ -2,17 +2,14 @@
#define prever_dot .rc3
#define postver a
%define version_alsa_lib 1.2.15.3
%define version_alsa_ucm 1.2.15.3
%define version_alsa_lib 1.2.13
%define version_alsa_ucm 1.2.13
%define version_alsa_tplg 1.2.5
%global lib_patch 0
%global ucm_patch 0
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/
@ -22,12 +19,8 @@ Source2: ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{version_alsa_t
Source10: asound.conf
Source11: modprobe-dist-alsa.conf
Source12: modprobe-dist-oss.conf
%if %{ucm_patch}
Source40: alsa-ucm-conf.patch
%endif
%if %{lib_patch}
Patch0: alsa-git.patch
%endif
Patch1: alsa-lib-1.2.3.1-config.patch
Patch2: alsa-lib-1.2.10-glibc-open.patch
@ -77,9 +70,7 @@ contains alsa-lib configuration of SoC topology
%prep
%setup -q -n %{name}-%{version}%{?prever}%{?postver}
%if %{lib_patch}
%patch -P0 -p1 -b .alsa-git
%endif
%patch -P1 -p1 -b .config
%patch -P2 -p1 -b .glibc-open
@ -125,9 +116,7 @@ mkdir -p %{buildroot}/%{_datadir}/alsa/ucm2
# Unpack UCMs
tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/ucm" "*/ucm2"
%if %{ucm_patch}
patch -d %{buildroot}/%{_datadir}/alsa -p1 < %{SOURCE40}
%endif
# Create topology directory
mkdir -p %{buildroot}/%{_datadir}/alsa/topology
@ -178,39 +167,9 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
%{_datadir}/alsa/topology
%changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.15.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Tue Jan 13 2026 Jaroslav Kysela <perex@perex.cz> - 1.2.15.3-1
- update to 1.2.15.3
* Thu Jan 8 2026 Jaroslav Kysela <perex@perex.cz> - 1.2.15.2-1
- update to 1.2.15.2
* Fri Dec 19 2025 Jaroslav Kysela <perex@perex.cz> - 1.2.15.1-1
- update to 1.2.15.1
* Wed Dec 10 2025 Jaroslav Kysela <perex@perex.cz> - 1.2.15-4
- update to 1.2.15
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.14-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Jun 24 2025 Jaroslav Kysela <perex@perex.cz> - 1.2.14-3
- update to latest alsa-ucm-conf files
* Mon Apr 14 2025 Jaroslav Kysela <perex@perex.cz> - 1.2.14-2
- update to 1.2.14
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.13-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Nov 15 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.13-3
- update to 1.2.13
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jun 10 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.12-1
- update to 1.2.12

101
alsa-ucm-conf.patch Normal file
View file

@ -0,0 +1,101 @@
From 11b028a9a01e47fc9b48e4a566803752011902e2 Mon Sep 17 00:00:00 2001
From: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Date: Wed, 13 Nov 2024 14:48:38 +0200
Subject: [PATCH 1/2] UCM2: Intel: sof-hda-dsp: Fix handling of empty
sys_vendor
The mistake in UCM syntax caused in alsaucm start error:
ALSA lib ucm_cond.c:367:(if_eval) unknown If.Condition.Type
Fixes: 13022a97711d ("sof-hda-dsp: Fix the case where sysfs dmi
sys_vendor attribute is not set")
Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/463
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/Intel/sof-hda-dsp/HiFi-sof.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
index fea8159..c755ba2 100644
--- a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
+++ b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
@@ -6,8 +6,8 @@ Define.SOFVendor "$${sys:devices/virtual/dmi/id/sys_vendor}"
If.SOFVendor {
Condition {
- Type Empty
- String "${var:SOFVendor}"
+ Type String
+ Empty "${var:SOFVendor}"
}
True.Define.SOFVendor "${sys:devices/virtual/dmi/id/board_vendor}"
}
--
2.47.0
From 6397c663d7086b87ca5cbba323ea3dcd0ecd3200 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 13 Nov 2024 16:19:15 +0100
Subject: [PATCH 2/2] sof-hda-dsp: Fix the case where sysfs dmi product_name
attribute is not set
!!DMI Information
!!---------------
Manufacturer:
Product Name:
Product Version:
Firmware Version: R6G07
System SKU: Default string
Board Vendor: Default string
Board Name: Default string
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2292583
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/Intel/sof-hda-dsp/HiFi-sof.conf | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
index c755ba2..5fd1843 100644
--- a/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
+++ b/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf
@@ -3,6 +3,7 @@
# File paths for controlling SOF processing
Define.SOFVendor "$${sys:devices/virtual/dmi/id/sys_vendor}"
+Define.SOFProduct "$${sys:devices/virtual/dmi/id/product_name}"
If.SOFVendor {
Condition {
@@ -12,6 +13,14 @@ If.SOFVendor {
True.Define.SOFVendor "${sys:devices/virtual/dmi/id/board_vendor}"
}
+If.SOFProduct {
+ Condition {
+ Type String
+ Empty "${var:SOFProduct}"
+ }
+ True.Define.SOFProduct "${sys:devices/virtual/dmi/id/board_name}"
+}
+
If.SOFIPCVer {
Condition {
Type ControlExists
@@ -43,7 +52,7 @@ If.SOFPath {
HeadphoneIirBlob "${var:BlobPath}/eq_iir/pass.blob"
HeadphoneFirBlob "${var:BlobPath}/eq_fir/pass.blob"
HeadphoneDrcBlob "${var:BlobPath}/drc/passthrough.blob"
- ConfPathFromDMI "${var:SOFVendor}/${sys:devices/virtual/dmi/id/product_name}.conf"
+ ConfPathFromDMI "${var:SOFVendor}/${var:SOFProduct}"
SOFProductConfig "/blobs/sof/product_configs/${var:ConfPathFromDMI}"
SOFConfFullPath "${ConfTopDir}${var:SOFProductConfig}"
SOFUserConfig "/blobs/sof/user_configs/${var:ConfPathFromDMI}"
--
2.47.0

View file

@ -1,3 +1,3 @@
SHA512 (alsa-lib-1.2.15.3.tar.bz2) = 7fc0fa8a5ae02d3404d2c262c6a14fcbb8b08e25993eac86b9e89b8419ed4d293b422da77b3eb7a1930f26c316b638e5aa7bdba78b0ada9908b0362d132a0cc0
SHA512 (alsa-ucm-conf-1.2.15.3.tar.bz2) = 079aeb45bc3f98448f6e48a1267db5d3f46a51d7060eb8275d0a084574e23eec34f07108610538e898c397fa24941ccf1bb7722c6b4bb0fa9c48904addc03973
SHA512 (alsa-lib-1.2.13.tar.bz2) = b0c0666e38e881dca985b61386523c045c71072a88be4952c986ffbe2107ec736da528858ebeffdf439de5c290914bf3facc654100a228c6d26fff9429142ef0
SHA512 (alsa-ucm-conf-1.2.13.tar.bz2) = cad867268851ac178f3a5378a00e292184b0e0ec7955f297ae7ed56073d3dddb06c08666b23b1bf6b0065068a9370ee34608bd687763658c79d34b64059b1c85
SHA512 (alsa-topology-conf-1.2.5.tar.bz2) = 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51