mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-05 20:36:40 +02:00
main/alsa-ucm-conf: add patches to fix laptop audio regression
This commit is contained in:
Angelo Verlain
Patrycja Rosa
parent
5757c12a67
commit
e26ebeec7d
@ -2,12 +2,16 @@
|
||||
# Maintainer: Minecrell <minecrell@minecrell.net>
|
||||
pkgname=alsa-ucm-conf
|
||||
pkgver=1.2.13
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
pkgdesc="ALSA Use Case Manager configuration"
|
||||
url="https://alsa-project.org"
|
||||
arch="noarch"
|
||||
license="BSD-3-Clause"
|
||||
source="https://alsa-project.org/files/pub/lib/alsa-ucm-conf-$pkgver.tar.bz2"
|
||||
source="
|
||||
https://alsa-project.org/files/pub/lib/alsa-ucm-conf-$pkgver.tar.bz2
|
||||
fix-empty-product_name.patch
|
||||
fix-handling-of-empty-sys-vendor.patch
|
||||
"
|
||||
options="!check" # no tests
|
||||
provider_priority=10
|
||||
# replaced files from downstream pmos
|
||||
@ -21,4 +25,6 @@ package() {
|
||||
|
||||
sha512sums="
|
||||
cad867268851ac178f3a5378a00e292184b0e0ec7955f297ae7ed56073d3dddb06c08666b23b1bf6b0065068a9370ee34608bd687763658c79d34b64059b1c85 alsa-ucm-conf-1.2.13.tar.bz2
|
||||
6934a496cff994a410e9a44810be71a9dff3a03021569899064c984f64b228ae8099281eb8bbf844548593d25dc9b3edf6879bdfa7f55eb4ecb6128ab25969c2 fix-empty-product_name.patch
|
||||
a3d94d6c1bbe8da3d186463722d53f3280590897268672513c43c3d7edfa484ac28d6fc1060bcc179663873ca4eb8353cd80f11097e9b834e14b8df7a5736ae0 fix-handling-of-empty-sys-vendor.patch
|
||||
"
|
||||
|
||||
59
main/alsa-ucm-conf/fix-empty-product_name.patch
Normal file
59
main/alsa-ucm-conf/fix-empty-product_name.patch
Normal file
@ -0,0 +1,59 @@
|
||||
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] 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 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}"
|
||||
34
main/alsa-ucm-conf/fix-handling-of-empty-sys-vendor.patch
Normal file
34
main/alsa-ucm-conf/fix-handling-of-empty-sys-vendor.patch
Normal file
@ -0,0 +1,34 @@
|
||||
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] 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 fea8159e9..c755ba26c 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}"
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user