From 9a8f45330ca3c2918cdb2bbecd75dd1a24730dd7 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Thu, 17 Apr 2025 09:52:39 +0200 Subject: [PATCH] automatic version update by autodist [release 1.2.14-1mamba;Thu Apr 17 2025] --- ...eam-fix_handling_of_empty_sys_vendor.patch | 34 ----------- ..._when_sysfs_dmi_product_name_not_set.patch | 59 ------------------- alsa-ucm-conf.spec | 12 ++-- 3 files changed, 6 insertions(+), 99 deletions(-) delete mode 100644 alsa-ucm-conf-1.2.13-upstream-fix_handling_of_empty_sys_vendor.patch delete mode 100644 alsa-ucm-conf-1.2.13-upstream-fix_when_sysfs_dmi_product_name_not_set.patch diff --git a/alsa-ucm-conf-1.2.13-upstream-fix_handling_of_empty_sys_vendor.patch b/alsa-ucm-conf-1.2.13-upstream-fix_handling_of_empty_sys_vendor.patch deleted file mode 100644 index 24664a4..0000000 --- a/alsa-ucm-conf-1.2.13-upstream-fix_handling_of_empty_sys_vendor.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 11b028a9a01e47fc9b48e4a566803752011902e2 Mon Sep 17 00:00:00 2001 -From: Seppo Ingalsuo -Date: Wed, 13 Nov 2024 14:48:38 +0200 -Subject: [PATCH] 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 -Signed-off-by: Jaroslav Kysela ---- - 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 fea8159e..c755ba26 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}" - } diff --git a/alsa-ucm-conf-1.2.13-upstream-fix_when_sysfs_dmi_product_name_not_set.patch b/alsa-ucm-conf-1.2.13-upstream-fix_when_sysfs_dmi_product_name_not_set.patch deleted file mode 100644 index 4fdbbb4..0000000 --- a/alsa-ucm-conf-1.2.13-upstream-fix_when_sysfs_dmi_product_name_not_set.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 6397c663d7086b87ca5cbba323ea3dcd0ecd3200 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 13 Nov 2024 16:19:15 +0100 -Subject: [PATCH] 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 ---- - 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 c755ba26..5fd1843f 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}" diff --git a/alsa-ucm-conf.spec b/alsa-ucm-conf.spec index f8a4231..8662d86 100644 --- a/alsa-ucm-conf.spec +++ b/alsa-ucm-conf.spec @@ -1,6 +1,6 @@ Name: alsa-ucm-conf -Version: 1.2.13 -Release: 2mamba +Version: 1.2.14 +Release: 1mamba Summary: ALSA Use Case Manager configuration Group: System/Kernel and Hardware Vendor: openmamba @@ -8,9 +8,8 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/alsa-project/alsa-ucm-conf Source: https://github.com/alsa-project/alsa-ucm-conf.git/v%{version}/alsa-ucm-conf-%{version}.tar.bz2 -Patch0: alsa-ucm-conf-1.2.13-upstream-fix_handling_of_empty_sys_vendor.patch -Patch1: alsa-ucm-conf-1.2.13-upstream-fix_when_sysfs_dmi_product_name_not_set.patch License: BSD +BuildArch: noarch ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END @@ -19,8 +18,6 @@ ALSA Use Case Manager configuration. %prep %setup -q -%patch 0 -p1 -b .upstream-fix_handling_of_empty_sys_vendor -%patch 1 -p1 -b .upstream-fix_when_sysfs_dmi_product_name_not_set %build @@ -42,6 +39,9 @@ cp -a ucm2 %{buildroot}%{_datadir}/alsa %doc LICENSE %changelog +* Thu Apr 17 2025 Automatic Build System 1.2.14-1mamba +- automatic version update by autodist + * Sat Nov 16 2024 Silvan Calarco 1.2.13-2mamba - apply upstream patches to fix HDMI audio detection seen on some platforms