diff -Nru alsa-lib-1.1.7/debian/changelog alsa-lib-1.1.7/debian/changelog --- alsa-lib-1.1.7/debian/changelog 2018-12-01 08:57:47.000000000 +0000 +++ alsa-lib-1.1.7/debian/changelog 2018-12-11 11:20:38.000000000 +0000 @@ -1,3 +1,11 @@ +alsa-lib (1.1.7-2ubuntu0.1) unstable; urgency=medium + + * Cherry picked 0009-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch + * Cherry picked 0010-conf-USB-Audio-Add-Dell-WD19-Dock-in-the-IEC958-blac.patch + * (LP: #1806532) + + -- Hui Wang Tue, 11 Dec 2018 11:20:38 +0000 + alsa-lib (1.1.7-2) unstable; urgency=medium * Cherry picked 0008-pcm-interval-Interpret-x-x-1-correctly-and-return-x-.patch. diff -Nru alsa-lib-1.1.7/debian/patches/0009-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch alsa-lib-1.1.7/debian/patches/0009-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch --- alsa-lib-1.1.7/debian/patches/0009-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.1.7/debian/patches/0009-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch 2018-12-11 11:19:01.000000000 +0000 @@ -0,0 +1,50 @@ +From 5a066fa63bbb02a6280111dc5c5d2e44dabe061a Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Thu, 18 Oct 2018 09:38:38 +0200 +Subject: [PATCH 1/2] conf/ucm/Dell-WD15-Dock: Fix incorrect device names + +The device name string for Dell WD15 (and its variants) dock is set as +"WD15Dock", while the actual device name to be used is "Dock". + +Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1112292 +Fixes: 8ebb40c96970 ("conf/ucm: Add a UCM profile for Dell WD15 Dock USB-audio") +Signed-off-by: Takashi Iwai +(cherry picked from commit 6eced6b4b6dca9f62ea3d13a40c5991231df3c5c) +Signed-off-by: Hui Wang +--- + src/conf/ucm/Dell-WD15-Dock/HiFi.conf | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/conf/ucm/Dell-WD15-Dock/HiFi.conf b/src/conf/ucm/Dell-WD15-Dock/HiFi.conf +index b07f3440..1b6bd212 100644 +--- a/src/conf/ucm/Dell-WD15-Dock/HiFi.conf ++++ b/src/conf/ucm/Dell-WD15-Dock/HiFi.conf +@@ -3,7 +3,7 @@ SectionDevice."Headphone" { + + Value { + PlaybackChannels "2" +- PlaybackPCM "hw:WD15Dock,0" ++ PlaybackPCM "hw:Dock,0" + } + } + +@@ -12,7 +12,7 @@ SectionDevice."LineOut" { + + Value { + PlaybackChannels "2" +- PlaybackPCM "hw:WD15Dock,1" ++ PlaybackPCM "hw:Dock,1" + } + } + +@@ -21,6 +21,6 @@ SectionDevice."Mic" { + + Value { + CaptureChannels "2" +- CapturePCM "hw:WD15Dock,0" ++ CapturePCM "hw:Dock,0" + } + } +-- +2.19.1 + diff -Nru alsa-lib-1.1.7/debian/patches/0010-conf-USB-Audio-Add-Dell-WD19-Dock-in-the-IEC958-blac.patch alsa-lib-1.1.7/debian/patches/0010-conf-USB-Audio-Add-Dell-WD19-Dock-in-the-IEC958-blac.patch --- alsa-lib-1.1.7/debian/patches/0010-conf-USB-Audio-Add-Dell-WD19-Dock-in-the-IEC958-blac.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.1.7/debian/patches/0010-conf-USB-Audio-Add-Dell-WD19-Dock-in-the-IEC958-blac.patch 2018-12-11 11:19:01.000000000 +0000 @@ -0,0 +1,35 @@ +From 7c38ab04d8886ba9a62443bb413bfa6075aa3792 Mon Sep 17 00:00:00 2001 +From: Hui Wang +Date: Wed, 28 Nov 2018 17:16:45 +0800 +Subject: [PATCH 2/2] conf: USB-Audio: Add Dell WD19 Dock in the IEC958 + blacklist + +This Dock doesn't have IEC958 physical output, so add it to the +blacklist to prevent it being opened. + +[ Also adding WD15 Dock entry that has the same problem -- tiwai ] + +Signed-off-by: Hui Wang +Signed-off-by: Takashi Iwai +(cherry picked from commit 7ca1f6e78c15846951e5d970a864382180be7213) +Signed-off-by: Hui Wang +--- + src/conf/cards/USB-Audio.conf | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf +index 05779c47..1c677937 100644 +--- a/src/conf/cards/USB-Audio.conf ++++ b/src/conf/cards/USB-Audio.conf +@@ -60,6 +60,8 @@ USB-Audio.pcm.iec958_device { + "SWTOR Gaming Headset by Razer" 999 + "USB Device 0x46d_0x821" 999 + "USB Device 0x46d_0x992" 999 ++ "WD15 Dock" 999 ++ "WD19 Dock" 999 + } + + # Second iec958 device number, if any. +-- +2.19.1 + diff -Nru alsa-lib-1.1.7/debian/patches/series alsa-lib-1.1.7/debian/patches/series --- alsa-lib-1.1.7/debian/patches/series 2018-12-01 08:57:47.000000000 +0000 +++ alsa-lib-1.1.7/debian/patches/series 2018-12-11 11:20:01.000000000 +0000 @@ -6,3 +6,5 @@ 0006-Enabled-extended-namehints-in-alsa.conf.patch 0007-Add-a-configuration-for-tegra-alc5632-based-cards.patch 0008-pcm-interval-Interpret-x-x-1-correctly-and-return-x-.patch +0009-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch +0010-conf-USB-Audio-Add-Dell-WD19-Dock-in-the-IEC958-blac.patch