Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package alsa-ucm-conf for openSUSE:Factory checked in at 2024-11-15 15:38:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-ucm-conf (Old) and /work/SRC/openSUSE:Factory/.alsa-ucm-conf.new.2017 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-ucm-conf" Fri Nov 15 15:38:28 2024 rev:32 rq:1224009 version:1.2.13 Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-ucm-conf/alsa-ucm-conf.changes 2024-11-13 15:27:15.558701052 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-ucm-conf.new.2017/alsa-ucm-conf.changes 2024-11-15 15:38:51.071392251 +0100 @@ -1,0 +2,7 @@ +Wed Nov 13 15:48:52 UTC 2024 - Takashi Iwai <[email protected]> + +- Backport upstream fixes for sof-hda-dsp: + 0001-UCM2-Intel-sof-hda-dsp-Fix-handling-of-empty-sys_ven.patch + 0002-sof-hda-dsp-Fix-the-case-where-sysfs-dmi-product_nam.patch + +------------------------------------------------------------------- New: ---- 0001-UCM2-Intel-sof-hda-dsp-Fix-handling-of-empty-sys_ven.patch 0002-sof-hda-dsp-Fix-the-case-where-sysfs-dmi-product_nam.patch BETA DEBUG BEGIN: New:- Backport upstream fixes for sof-hda-dsp: 0001-UCM2-Intel-sof-hda-dsp-Fix-handling-of-empty-sys_ven.patch 0002-sof-hda-dsp-Fix-the-case-where-sysfs-dmi-product_nam.patch New: 0001-UCM2-Intel-sof-hda-dsp-Fix-handling-of-empty-sys_ven.patch 0002-sof-hda-dsp-Fix-the-case-where-sysfs-dmi-product_nam.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-ucm-conf.spec ++++++ --- /var/tmp/diff_new_pack.Elf1QI/_old 2024-11-15 15:38:51.523411183 +0100 +++ /var/tmp/diff_new_pack.Elf1QI/_new 2024-11-15 15:38:51.523411183 +0100 @@ -26,6 +26,9 @@ Source1: %{url}/files/pub/lib/alsa-ucm-conf-%{version}.tar.bz2.sig # from https://www.alsa-project.org/files/pub/gpg-release-key-v1.txt Source2: alsa-ucm-conf.keyring +# upstream fixes +Patch1: 0001-UCM2-Intel-sof-hda-dsp-Fix-handling-of-empty-sys_ven.patch +Patch2: 0002-sof-hda-dsp-Fix-the-case-where-sysfs-dmi-product_nam.patch BuildRequires: fdupes BuildArch: noarch Requires: libasound2 >= 1.2.6.1 ++++++ 0001-UCM2-Intel-sof-hda-dsp-Fix-handling-of-empty-sys_ven.patch ++++++ >From 11b028a9a01e47fc9b48e4a566803752011902e2 Mon Sep 17 00:00:00 2001 From: Seppo Ingalsuo <[email protected]> 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 <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]> --- 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 fea8159e9c99..c755ba26cbe6 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.43.0 ++++++ 0002-sof-hda-dsp-Fix-the-case-where-sysfs-dmi-product_nam.patch ++++++ >From 6397c663d7086b87ca5cbba323ea3dcd0ecd3200 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela <[email protected]> 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 <[email protected]> --- 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 c755ba26cbe6..5fd1843ff101 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.43.0
