mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-05 14:07:27 -08:00
media-libs/alsa-ucm-conf: drop 1.2.13
Signed-off-by: Petr Vaněk <arkamar@gentoo.org>
This commit is contained in:
Petr Vaněk
parent
9754d868af
commit
57d20aa342
@ -1,2 +1 @@
|
||||
DIST alsa-ucm-conf-1.2.13.tar.bz2 58408 BLAKE2B 87e4bf2285961e316ca853e9245e02447ea9e60fa506e124c072e2b6ed71345fc0c30b19bf8c849f8123a6b95a4facd22225eafccba8164266961110a60ef44c SHA512 cad867268851ac178f3a5378a00e292184b0e0ec7955f297ae7ed56073d3dddb06c08666b23b1bf6b0065068a9370ee34608bd687763658c79d34b64059b1c85
|
||||
DIST alsa-ucm-conf-1.2.14.tar.bz2 72126 BLAKE2B cbb4b81db7670207cac5b85ba9cd4d9df93e4aca573da4caffe0f1e0386a9685b837e58b7ed85ddcfecf3c0f2469e706833dad6f0ef020440c943aa41520f8f0 SHA512 a224e890919306bdcd606dfb873b089950c9fa89f24c02947692ee8ab1a05c419f2a8dc174440d17c8a9575cab293806630f2cb43d74677f7ef0d956b7883dc5
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DESCRIPTION="ALSA ucm configuration files"
|
||||
HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
|
||||
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
|
||||
|
||||
RDEPEND="!<media-libs/alsa-lib-1.2.1"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-ucm2-intel-sys_vendor.patch
|
||||
"${FILESDIR}"/${P}-ucm2-intel-product_name.patch
|
||||
)
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/alsa
|
||||
doins -r ucm{,2}
|
||||
}
|
||||
@ -1,62 +0,0 @@
|
||||
https://github.com/alsa-project/alsa-ucm-conf/commit/6397c663d7086b87ca5cbba323ea3dcd0ecd3200
|
||||
|
||||
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}"
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
https://github.com/alsa-project/alsa-ucm-conf/commit/11b028a9a01e47fc9b48e4a566803752011902e2
|
||||
|
||||
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 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}"
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user