From 9c9426377ad14378441878e19cfba52426d1b83473ee246ea32bbd8c2d56ffb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 5 Dec 2024 10:54:05 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main alsa-ucm-conf revision abc0ce6fa9be95fcb1be013be841e323 --- ...da-dsp-Fix-handling-of-empty-sys_ven.patch | 37 +++++++++++ ...the-case-where-sysfs-dmi-product_nam.patch | 62 +++++++++++++++++++ alsa-ucm-conf-1.2.12.tar.bz2 | 3 - alsa-ucm-conf-1.2.12.tar.bz2.sig | 16 ----- alsa-ucm-conf-1.2.13.tar.bz2 | 3 + alsa-ucm-conf-1.2.13.tar.bz2.sig | 16 +++++ alsa-ucm-conf.changes | 16 +++++ alsa-ucm-conf.spec | 5 +- 8 files changed, 138 insertions(+), 20 deletions(-) create mode 100644 0001-UCM2-Intel-sof-hda-dsp-Fix-handling-of-empty-sys_ven.patch create mode 100644 0002-sof-hda-dsp-Fix-the-case-where-sysfs-dmi-product_nam.patch delete mode 100644 alsa-ucm-conf-1.2.12.tar.bz2 delete mode 100644 alsa-ucm-conf-1.2.12.tar.bz2.sig create mode 100644 alsa-ucm-conf-1.2.13.tar.bz2 create mode 100644 alsa-ucm-conf-1.2.13.tar.bz2.sig diff --git a/0001-UCM2-Intel-sof-hda-dsp-Fix-handling-of-empty-sys_ven.patch b/0001-UCM2-Intel-sof-hda-dsp-Fix-handling-of-empty-sys_ven.patch new file mode 100644 index 0000000..771c05f --- /dev/null +++ b/0001-UCM2-Intel-sof-hda-dsp-Fix-handling-of-empty-sys_ven.patch @@ -0,0 +1,37 @@ +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 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 + diff --git a/0002-sof-hda-dsp-Fix-the-case-where-sysfs-dmi-product_nam.patch b/0002-sof-hda-dsp-Fix-the-case-where-sysfs-dmi-product_nam.patch new file mode 100644 index 0000000..6700200 --- /dev/null +++ b/0002-sof-hda-dsp-Fix-the-case-where-sysfs-dmi-product_nam.patch @@ -0,0 +1,62 @@ +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 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 + diff --git a/alsa-ucm-conf-1.2.12.tar.bz2 b/alsa-ucm-conf-1.2.12.tar.bz2 deleted file mode 100644 index 1eff4b6..0000000 --- a/alsa-ucm-conf-1.2.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:168e7c0549b7bf8991092fa2bfb903631df779dc4c43ee8f4277fcb772d8c035 -size 52618 diff --git a/alsa-ucm-conf-1.2.12.tar.bz2.sig b/alsa-ucm-conf-1.2.12.tar.bz2.sig deleted file mode 100644 index f156887..0000000 --- a/alsa-ucm-conf-1.2.12.tar.bz2.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmZm7lQACgkQg4BZbabl -nJEltA/+ObioojjXbUKa7k7Kn5ETuqNDo0Z6VBY1KutIUjw4FYPR0pBOjepV9ser -y/nKMa4aUhTl/iND/g40b+VHe1E1Eyeix1jpJg8aac8nr4+dMdR06n3oiMbl0yKz -6+4dMVvM168kqjpiIBVx+hbUfmgZq5EoSyq6wCVTuap5X0KzJkY5vsGaF+J70PFL -EV7RAfgpqn3cgqQsysjV4c7iT6uJ3QpLfsBVm9McFRiXq0AMJ0xtetKgGT0BrfZS -0fOqOgIln16KfMmquaMid+GajVdzIxslc/ax5tEP3nSHIsk7Dr3NOk1CIP85nf57 -K2CpNwj5wb0h+LZN5LwYACcozBXNvSm5gYS7yVJ7T+X95FlEHc9ar/RD5NagKsaz -VeX2NbFDiD8jBEjvP+/qiyS/pWM/POcfUE1iN0tTKohyBRJDRBFvcw8uATiwkAue -48zHbH8eFX7MqNLZyREgTwz+u0qaHm1NTPnDY8E7LX04+lB97jC6eqqN18qxR4j1 -9DOmYBSiQK3YH85DJh0vLsp2++qeoKhaBaQkbJASiLSEBJ1tVk3wiOtO9Ebp+miA -W3Ap0N1LCCDliuu3KOQKsDtB/L87e0sQN/1f088GRYKGwwQQp5f/7GouAr1G7eci -URDJPNhDQtYMGAs3XjWl45AzIq+iMBN3rnPUZOMHWJAWvvPUjx8= -=3242 ------END PGP SIGNATURE----- diff --git a/alsa-ucm-conf-1.2.13.tar.bz2 b/alsa-ucm-conf-1.2.13.tar.bz2 new file mode 100644 index 0000000..1d1f6fa --- /dev/null +++ b/alsa-ucm-conf-1.2.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4483b6e3983cca08fd326a73fbae449b5036e444fb1a07c0dee74b504b7ab5af +size 58408 diff --git a/alsa-ucm-conf-1.2.13.tar.bz2.sig b/alsa-ucm-conf-1.2.13.tar.bz2.sig new file mode 100644 index 0000000..b8bb363 --- /dev/null +++ b/alsa-ucm-conf-1.2.13.tar.bz2.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmczJNYACgkQg4BZbabl +nJE+xA/8DNCG+MnrIO2nP0ToWyCI4QiVJlz1YJYs4sqq6R4IR+cl+XEEEREjHpC2 +80d5/A0LkTWvMKEDxK6WwKr2Y7UF6XXvHKH+YzBSISsP5OAtVsbA7b4njXSXMNCM +xS54g9eL4E7eWttWM7WRCqhqtBv1oZXmTp4VJeR1VKTRFTDaJY/kheu0jkvJziHp +yDQJsAupKeVSjm4BWuZJV3z6n8iBVe1kfGNo0ylpXh6WnzwmHuAqzw83504Z0lyt +xgvEimC3P4Yg/PPZBve9g8ey9KS2dtn/nk94nfcD+2rcT/a5aTDxIXn7LOyq0HHQ +OZ2OfVtpS+eidIZsJmNKEIrSOBtRg5PU/yxpOZX2B7ypawdCFN+l2EQjQXXfWdW0 +GSltPni7y//2lQ47ymKdc0lVN8rchvcUP0Ydqc513efEFHctFur9Xn4WFnGVAdGc +QhUkMND/uFe2IKL1/qJEDfYEB3omECnf/MEn+eMZQ9YC7T+CxlgSY6tZp9V9XJQW +A6rvQOevKZHYuAkUQofoCYe8uk9xkVHZuIggUKV/MEE0ElxknFbJPLvK+iRtAPi0 +RiBmdNQg4i/JW4fL2pGZv8KDreW3TNF9kDvhlpw7KMgRVqtIOydufD0cpaRilwXX +t3rEnXpC5VAOwRgaS90M3hZxovKvhNvjJi7bcgm8A1gbjtB/tqE= +=lHyI +-----END PGP SIGNATURE----- diff --git a/alsa-ucm-conf.changes b/alsa-ucm-conf.changes index 5adc6cf..5210d31 100644 --- a/alsa-ucm-conf.changes +++ b/alsa-ucm-conf.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Nov 13 15:48:52 UTC 2024 - Takashi Iwai + +- 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 + +------------------------------------------------------------------- +Tue Nov 12 14:15:03 UTC 2024 - Takashi Iwai + +- Update to version 1.2.13: + * Updates for USB-audio, Mediatek, Qualcomm, ACP, SoundWire, + wsa884x, wcd938x, Intel AVS, SOF HDA, etc + For details, see: + https://www.alsa-project.org/wiki/Changes_v1.2.12_v1.2.13#alsa-ucm-conf + ------------------------------------------------------------------- Thu Jun 13 14:57:35 UTC 2024 - Takashi Iwai diff --git a/alsa-ucm-conf.spec b/alsa-ucm-conf.spec index d374e72..e5d3d81 100644 --- a/alsa-ucm-conf.spec +++ b/alsa-ucm-conf.spec @@ -17,7 +17,7 @@ Name: alsa-ucm-conf -Version: 1.2.12 +Version: 1.2.13 Release: 0 Summary: ALSA UCM Profiles License: BSD-3-Clause @@ -26,6 +26,9 @@ Source: %{url}/files/pub/lib/alsa-ucm-conf-%{version}.tar.bz2 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