Accepting request 980995 from multimedia:libs

- Backport upstream fixes for Steinberg UR44:
  0001-Steinberg-UR44-fix-the-Line2-channel-mapping.patch
  0002-Steinberg-UR44-fix-the-Line2-channel-mapping-2nd.patch
  0003-Steinberg-UR44-fix-the-direction-for-steinberg_ur44_.patch

OBS-URL: https://build.opensuse.org/request/show/980995
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa-ucm-conf?expand=0&rev=23
This commit is contained in:
Dominique Leuenberger 2022-06-07 09:44:57 +00:00 committed by Git OBS Bridge
commit 0d7a1a2b35
5 changed files with 102 additions and 0 deletions

View File

@ -0,0 +1,29 @@
From 8edc0606b7ac69fa71ad4349882cc2dd0a29074d Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 3 Jun 2022 07:59:33 +0200
Subject: [PATCH 1/3] Steinberg UR44: fix the Line2 channel mapping
Link: https://github.com/alsa-project/alsa-ucm-conf/issues/163
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/USB-Audio/Steinberg/UR44-HiFi.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf b/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf
index 2f826b465bf6..e7f5944d8e56 100644
--- a/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf
+++ b/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf
@@ -58,8 +58,8 @@ SectionDevice."Line2" {
Direction Playback
HWChannels 4
Channels 2
- Channel0 0
- Channel1 1
+ Channel0 2
+ Channel1 3
ChannelPos0 FL
ChannelPos0 FR
}
--
2.35.3

View File

@ -0,0 +1,35 @@
From 3b6317cd79a25cd9a064a80a080ea3c65d4d9942 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 3 Jun 2022 08:01:33 +0200
Subject: [PATCH 2/3] Steinberg UR44: fix the Line2 channel mapping (2nd)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/USB-Audio/Steinberg/UR44-HiFi.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf b/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf
index e7f5944d8e56..cd9521410882 100644
--- a/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf
+++ b/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf
@@ -43,7 +43,7 @@ SectionDevice."Line1" {
Channel0 0
Channel1 1
ChannelPos0 FL
- ChannelPos0 FR
+ ChannelPos1 FR
}
}
@@ -61,7 +61,7 @@ SectionDevice."Line2" {
Channel0 2
Channel1 3
ChannelPos0 FL
- ChannelPos0 FR
+ ChannelPos1 FR
}
}
--
2.35.3

View File

@ -0,0 +1,27 @@
From ef3b6513b6581705d36432428a7f6a4ae23b1276 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 3 Jun 2022 21:34:19 +0200
Subject: [PATCH 3/3] Steinberg UR44: fix the direction for
steinberg_ur44_mono_in
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/USB-Audio/Steinberg/UR44-HiFi.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf b/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf
index cd9521410882..7926a0feacd1 100644
--- a/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf
+++ b/ucm2/USB-Audio/Steinberg/UR44-HiFi.conf
@@ -16,7 +16,7 @@ Macro [
{
SplitPCM {
Name "steinberg_ur44_mono_in"
- Direction Playback
+ Direction Capture
Channels 1
HWChannels 6
HWChannelPos0 MONO
--
2.35.3

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jun 6 10:58:35 UTC 2022 - Takashi Iwai <tiwai@suse.com>
- Backport upstream fixes for Steinberg UR44:
0001-Steinberg-UR44-fix-the-Line2-channel-mapping.patch
0002-Steinberg-UR44-fix-the-Line2-channel-mapping-2nd.patch
0003-Steinberg-UR44-fix-the-direction-for-steinberg_ur44_.patch
-------------------------------------------------------------------
Wed Jun 1 05:59:14 UTC 2022 - Takashi Iwai <tiwai@suse.com>

View File

@ -24,6 +24,9 @@ License: BSD-3-Clause
URL: https://www.alsa-project.org
Source: %{url}/files/pub/lib/alsa-ucm-conf-%{version}.tar.bz2
Source1: %{url}/files/pub/lib/alsa-ucm-conf-%{version}.tar.bz2.sig
Patch1: 0001-Steinberg-UR44-fix-the-Line2-channel-mapping.patch
Patch2: 0002-Steinberg-UR44-fix-the-Line2-channel-mapping-2nd.patch
Patch3: 0003-Steinberg-UR44-fix-the-direction-for-steinberg_ur44_.patch
BuildRequires: fdupes
BuildArch: noarch
Requires: libasound2 >= 1.2.6.1