diff -Nru pulseaudio-8.0/debian/changelog pulseaudio-8.0/debian/changelog --- pulseaudio-8.0/debian/changelog 2018-02-13 17:17:05.000000000 +0800 +++ pulseaudio-8.0/debian/changelog 2018-02-13 17:14:55.000000000 +0800 @@ -1,3 +1,16 @@ +pulseaudio (1:8.0-0ubuntu3.8) UNRELEASED; urgency=medium + + [Hui Wang] + * Cherrypick fixes for supporting audio on Dell dock TB16: + - 60c0edd5: Add support for usb audio on the Dell dock TB16 (LP: #1718824) + - 2f1dcea3: build-sys: add the Dell dock TB16 configuration (LP: #1718824) + + [Daniel van Vugt] + * Tidy up: Rename 0901-droid-fix-crash-on-module-load.patch to + 0803-droid-fix-crash-on-module-load.patch + + -- Daniel van Vugt Tue, 12 Dec 2017 11:44:08 +0800 + pulseaudio (1:8.0-0ubuntu3.7) xenial; urgency=medium * debian/patches/0901-droid-fix-crash-on-module-load.patch: [Fix the diff -Nru pulseaudio-8.0/debian/patches/0802-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch pulseaudio-8.0/debian/patches/0802-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch --- pulseaudio-8.0/debian/patches/0802-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch 1970-01-01 08:00:00.000000000 +0800 +++ pulseaudio-8.0/debian/patches/0802-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch 2018-02-13 17:14:55.000000000 +0800 @@ -0,0 +1,95 @@ +From 60c0edd5286dbb731c671ad3e6886c1e3e1eb067 Mon Sep 17 00:00:00 2001 +From: Hui Wang +Date: Fri, 26 May 2017 15:42:40 +0800 +Subject: [PATCH] alsa-mixer: Add support for usb audio in the Dell dock TB16 + +There are one headset jack on the front panel of TB16, through this +jack, we have one stereo headphone output (hw:%f,0,0) and one mono +headset-mic input (hw:%f,0,0); and there is one speaker output jack +(hw:%f,1,0) on the rear panel of TB16. + +The detail information of the Dell dock TB16: +http://www.dell.com/support/article/sg/en/sgbsdt1/SLN301105 + +Signed-off-by: Hui Wang +--- + .../alsa/mixer/profile-sets/90-pulseaudio.rules | 1 + + .../profile-sets/dell-dock-tb16-usb-audio.conf | 55 ++++++++++++++++++++++ + 2 files changed, 56 insertions(+) + create mode 100644 src/modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf + +diff --git a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules +index 70e34e6..805a05b 100644 +--- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules ++++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules +@@ -98,5 +98,6 @@ ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1021", ENV{PULSE_PROFILE_SET}="nativ + ATTRS{idVendor}=="0763", ATTRS{idProduct}=="2012", ENV{PULSE_PROFILE_SET}="maudio-fasttrack-pro.conf" + ATTRS{idVendor}=="045e", ATTRS{idProduct}=="02bb", ENV{PULSE_PROFILE_SET}="kinect-audio.conf" + ATTRS{idVendor}=="041e", ATTRS{idProduct}=="322c", ENV{PULSE_PROFILE_SET}="sb-omni-surround-5.1.conf" ++ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="4014", ENV{PULSE_PROFILE_SET}="dell-dock-tb16-usb-audio.conf" + + LABEL="pulseaudio_end" +diff --git a/src/modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf b/src/modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf +new file mode 100644 +index 0000000..1186552 +--- /dev/null ++++ b/src/modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf +@@ -0,0 +1,55 @@ ++# This file is part of PulseAudio. ++# ++# PulseAudio is free software; you can redistribute it and/or modify ++# it under the terms of the GNU Lesser General Public License as ++# published by the Free Software Foundation; either version 2.1 of the ++# License, or (at your option) any later version. ++# ++# PulseAudio is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with PulseAudio; if not, see . ++ ++; Dell Dock TB16 USB audio ++; ++; This card has two stereo pairs of output, One Mono input. ++; ++; See default.conf for an explanation on the directives used here. ++ ++[General] ++auto-profiles = no ++ ++[Mapping analog-stereo-headphone] ++description = Headphone ++device-strings = hw:%f,0,0 ++channel-map = left,right ++direction = output ++ ++[Mapping analog-stereo-speaker] ++description = Speaker ++device-strings = hw:%f,1,0 ++channel-map = left,right ++direction = output ++ ++[Mapping analog-stereo-mic] ++description = Headset-Mic ++device-strings = hw:%f,0,0 ++channel-map = left,right ++direction = input ++ ++ ++[Profile output:analog-stereo-speaker] ++description = Speaker ++output-mappings = analog-stereo-speaker ++priority = 60 ++skip-probe = yes ++ ++[Profile output:analog-stereo-headphone+input:analog-stereo-mic] ++description = Headset ++output-mappings = analog-stereo-headphone ++input-mappings = analog-stereo-mic ++priority = 80 ++skip-probe = yes +-- +1.9.1 + diff -Nru pulseaudio-8.0/debian/patches/0803-droid-fix-crash-on-module-load.patch pulseaudio-8.0/debian/patches/0803-droid-fix-crash-on-module-load.patch --- pulseaudio-8.0/debian/patches/0803-droid-fix-crash-on-module-load.patch 1970-01-01 08:00:00.000000000 +0800 +++ pulseaudio-8.0/debian/patches/0803-droid-fix-crash-on-module-load.patch 2018-02-13 17:14:55.000000000 +0800 @@ -0,0 +1,14 @@ +Index: pulseaudio-8.0/src/modules/droid/module-droid-card.c +=================================================================== +--- pulseaudio-8.0.orig/src/modules/droid/module-droid-card.c ++++ pulseaudio-8.0/src/modules/droid/module-droid-card.c +@@ -915,6 +915,9 @@ int pa__init(pa_module *m) { + u->card->userdata = u; + u->card->set_profile = card_set_profile; + ++ pa_card_choose_initial_profile(u->card); ++ pa_card_put(u->card); ++ + u->modargs = ma; + u->module = m; + diff -Nru pulseaudio-8.0/debian/patches/0804-build-sys-add-the-Dell-dock-TB16-configuration.patch pulseaudio-8.0/debian/patches/0804-build-sys-add-the-Dell-dock-TB16-configuration.patch --- pulseaudio-8.0/debian/patches/0804-build-sys-add-the-Dell-dock-TB16-configuration.patch 1970-01-01 08:00:00.000000000 +0800 +++ pulseaudio-8.0/debian/patches/0804-build-sys-add-the-Dell-dock-TB16-configuration.patch 2018-02-13 17:14:55.000000000 +0800 @@ -0,0 +1,27 @@ +From 6bdf74c27d92828f71f7343158460393ba260541 Mon Sep 17 00:00:00 2001 +From: Hui Wang +Date: Thu, 23 Nov 2017 08:47:26 +0800 +Subject: [PATCH] build-sys: add the Dell dock TB16 configuration + +Signed-off-by: Hui Wang +--- + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index b0ca2bc..7a2d361 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1285,7 +1285,8 @@ dist_alsaprofilesets_DATA = \ + modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf \ + modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf \ + modules/alsa/mixer/profile-sets/kinect-audio.conf \ +- modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf ++ modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf \ ++ modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf + + if HAVE_UDEV + dist_udevrules_DATA = \ +-- +2.7.4 + diff -Nru pulseaudio-8.0/debian/patches/0901-droid-fix-crash-on-module-load.patch pulseaudio-8.0/debian/patches/0901-droid-fix-crash-on-module-load.patch --- pulseaudio-8.0/debian/patches/0901-droid-fix-crash-on-module-load.patch 2018-02-13 17:17:05.000000000 +0800 +++ pulseaudio-8.0/debian/patches/0901-droid-fix-crash-on-module-load.patch 1970-01-01 08:00:00.000000000 +0800 @@ -1,14 +0,0 @@ -Index: pulseaudio-8.0/src/modules/droid/module-droid-card.c -=================================================================== ---- pulseaudio-8.0.orig/src/modules/droid/module-droid-card.c -+++ pulseaudio-8.0/src/modules/droid/module-droid-card.c -@@ -915,6 +915,9 @@ int pa__init(pa_module *m) { - u->card->userdata = u; - u->card->set_profile = card_set_profile; - -+ pa_card_choose_initial_profile(u->card); -+ pa_card_put(u->card); -+ - u->modargs = ma; - u->module = m; - diff -Nru pulseaudio-8.0/debian/patches/series pulseaudio-8.0/debian/patches/series --- pulseaudio-8.0/debian/patches/series 2018-02-13 17:17:05.000000000 +0800 +++ pulseaudio-8.0/debian/patches/series 2018-02-13 17:14:55.000000000 +0800 @@ -54,7 +54,9 @@ 0700-pulsecore-add-new-card-profile-hook.patch 0701-bluetooth-bluez5-wait-for-all-profiles-to-connect.patch -# Fixes for common crashes, backported from PulseAudio 11.0 +# Fixes backported from PulseAudio 11.0 0800-cb78d6f5-fix-lp1690028-lp1672171.patch 0801-d985276c-fix-lp1539209-lp1562817.patch -0901-droid-fix-crash-on-module-load.patch +0802-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch +0803-droid-fix-crash-on-module-load.patch +0804-build-sys-add-the-Dell-dock-TB16-configuration.patch