From 8060be47c9c8c30cb449b6c709bf2e8b49e554ae2af3dfcd3627a5487822f52a Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 6 Jun 2022 11:01:04 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=45 --- ...g-UR44-fix-the-Line2-channel-mapping.patch | 29 +++++++++++++++ ...44-fix-the-Line2-channel-mapping-2nd.patch | 35 +++++++++++++++++++ ...ix-the-direction-for-steinberg_ur44_.patch | 27 ++++++++++++++ alsa-ucm-conf.changes | 8 +++++ alsa-ucm-conf.spec | 3 ++ 5 files changed, 102 insertions(+) create mode 100644 0001-Steinberg-UR44-fix-the-Line2-channel-mapping.patch create mode 100644 0002-Steinberg-UR44-fix-the-Line2-channel-mapping-2nd.patch create mode 100644 0003-Steinberg-UR44-fix-the-direction-for-steinberg_ur44_.patch diff --git a/0001-Steinberg-UR44-fix-the-Line2-channel-mapping.patch b/0001-Steinberg-UR44-fix-the-Line2-channel-mapping.patch new file mode 100644 index 0000000..7bf00f8 --- /dev/null +++ b/0001-Steinberg-UR44-fix-the-Line2-channel-mapping.patch @@ -0,0 +1,29 @@ +From 8edc0606b7ac69fa71ad4349882cc2dd0a29074d Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +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 +--- + 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 + diff --git a/0002-Steinberg-UR44-fix-the-Line2-channel-mapping-2nd.patch b/0002-Steinberg-UR44-fix-the-Line2-channel-mapping-2nd.patch new file mode 100644 index 0000000..626761f --- /dev/null +++ b/0002-Steinberg-UR44-fix-the-Line2-channel-mapping-2nd.patch @@ -0,0 +1,35 @@ +From 3b6317cd79a25cd9a064a80a080ea3c65d4d9942 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +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 +--- + 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 + diff --git a/0003-Steinberg-UR44-fix-the-direction-for-steinberg_ur44_.patch b/0003-Steinberg-UR44-fix-the-direction-for-steinberg_ur44_.patch new file mode 100644 index 0000000..67efbc0 --- /dev/null +++ b/0003-Steinberg-UR44-fix-the-direction-for-steinberg_ur44_.patch @@ -0,0 +1,27 @@ +From ef3b6513b6581705d36432428a7f6a4ae23b1276 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +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 +--- + 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 + diff --git a/alsa-ucm-conf.changes b/alsa-ucm-conf.changes index 1f652df..f57fcc3 100644 --- a/alsa-ucm-conf.changes +++ b/alsa-ucm-conf.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 6 10:58:35 UTC 2022 - Takashi Iwai + +- 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 diff --git a/alsa-ucm-conf.spec b/alsa-ucm-conf.spec index 58a5cc1..63d28a3 100644 --- a/alsa-ucm-conf.spec +++ b/alsa-ucm-conf.spec @@ -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