[gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-ucm-conf/, media-libs/alsa-ucm-conf/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-ucm-conf/, media-libs/alsa-ucm-conf/files/

[Lars Wendler]

commit:     b46327024c6174706a8a4860da3df5fcfcd4346a
Author:     Niklāvs Koļesņikovs <89q1r14hd <AT> relay <DOT> firefox <DOT> com>
AuthorDate: Sat Jun  5 18:54:34 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jun  5 20:09:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4632702

media-libs/alsa-ucm-conf: adds a small upstream patch used by Fedora

Not entirely sure what this does but it's very small, already
upstreamed and cherry picked by Fedora's maintainer who also maintains
ALSA, so it's probably a good idea to have.

Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd <AT> relay.firefox.com>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...nf-1.2.5.ebuild => alsa-ucm-conf-1.2.5-r1.ebuild} |  2 ++
 ...tel-the-lookups-are-supported-from-syntax-4.patch | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
similarity index 83%
rename from media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild
rename to media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
index 167ded14299..444cc259d28 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
@@ -17,6 +17,8 @@ DEPEND="${RDEPEND}"
 MY_P="${PN}-1.2.4.81.g4884e"
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${PN}-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch" ) # bug #793410
+
 src_install() {
 	insinto /usr/share/alsa
 	doins -r ucm{,2}

diff --git a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch
new file mode 100644
index 00000000000..6564be8977c
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch
@@ -0,0 +1,20 @@
+From 3f34021beffba4e39f064a14c5faceeaa224b766 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Tue, 1 Jun 2021 21:08:53 +0200
+Subject: [PATCH] HDA-Intel: the lookups are supported from syntax 4
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ ucm2/HDA-Intel/HDA-Intel.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ucm2/HDA-Intel/HDA-Intel.conf b/ucm2/HDA-Intel/HDA-Intel.conf
+index 5794e72..8a8e0e7 100644
+--- a/ucm2/HDA-Intel/HDA-Intel.conf
++++ b/ucm2/HDA-Intel/HDA-Intel.conf
+@@ -1,4 +1,4 @@
+-Syntax 3
++Syntax 4
+
+ Define.Use ""	# a non-empty string to use UCM configuration for HDA devices
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-ucm-conf/, media-libs/alsa-ucm-conf/files/

[Andreas Sturmlechner]

commit:     048ea5a7fc1f1732295ff871b0f3f232ede8cb59
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 12:16:56 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 17:36:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=048ea5a7

media-libs/alsa-ucm-conf: drop 1.2.10-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/alsa-ucm-conf/Manifest                  |  1 -
 .../alsa-ucm-conf/alsa-ucm-conf-1.2.10-r1.ebuild   | 24 ----------------------
 .../files/alsa-ucm-conf-1.2.10-fix-splitpcm.patch  | 21 -------------------
 3 files changed, 46 deletions(-)

diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index cd2c71d2e425..698a8e2773c5 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,3 +1,2 @@
-DIST alsa-ucm-conf-1.2.10.tar.bz2 44749 BLAKE2B 215842f1f59c2dea5e3f3fe880dc49d6263998746a50c2591b8a9786ead3afae2c713e179ff6e8caa518b3a8516a1b031872c1fad2a17fbd3afbb0390a803693 SHA512 172956a2c127e9afa5be9c6ada43bfa9fda825823f8f6acbe252edef3381afe3adfa3299c1419f04375599be7721a551c6800be99db44b091611aeb824ffcd72
 DIST alsa-ucm-conf-1.2.11.tar.bz2 49172 BLAKE2B 8b57ad990eac676ca8f5044a81a57a85951e425bd059679ac3dc7097e3c4a089cb73bbd01869335c4e94161d9f3f86aba7549b6a666e69ba76578d785e53fbb4 SHA512 b202e7410a579789be0005564b4868f70bca0fd8664c02add95fc9ff90ab64faebda978fbd3e83a3274c37242dccf8efbebd03f529e35ca3033daf55f425cb8d
 DIST alsa-ucm-conf-1.2.12.tar.bz2 52618 BLAKE2B 65f429afa6a9134f1896acac3827f6065ce9315f1920d27d5ea97244fe376f1f7780c9537cf33b8a91eeaebfde7489842bd603a7d60c0d20b6017f2e7e1eda4e SHA512 391dde123271172d899c04865d1d6e21b4ad0060ee9b2256dfbc6fc89ad48edcaa43c861893ab0e5c70d972e20d15c528defc19c00308e7465f13f954cce25d7

diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10-r1.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10-r1.ebuild
deleted file mode 100644
index 69aaf86bc695..000000000000
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 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}-fix-splitpcm.patch
-)
-
-src_install() {
-	insinto /usr/share/alsa
-	doins -r ucm{,2}
-}

diff --git a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.10-fix-splitpcm.patch b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.10-fix-splitpcm.patch
deleted file mode 100644
index 35202a4454b3..000000000000
--- a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.10-fix-splitpcm.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/alsa-project/alsa-ucm-conf/commit/b68aa52acdd2763fedad5eec0f435fbf43e5ccc6
-
-From b68aa52acdd2763fedad5eec0f435fbf43e5ccc6 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Mon, 4 Sep 2023 16:39:52 +0200
-Subject: [PATCH] SplitPCM: Device argument may not be set
-
-Link: https://github.com/alsa-project/alsa-ucm-conf/issues/346
-Fixes: 10967ea ("SplitPCM: Fix Device variable in SplitPCMDevice macro")
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---- a/ucm2/common/pcm/split.conf
-+++ b/ucm2/common/pcm/split.conf
-@@ -326,7 +326,7 @@ DefineMacro.SplitPCMDevice {
- 	If.0 {
- 		Condition {
- 			Type String
--			Empty "${var:__Device}"
-+			Empty "${var:-__Device}"
- 		}
- 		True.Define.__Device "0"
- 	}