diff --git a/0066-install-dell-dock-tb16-usb-audio.conf.patch b/0066-install-dell-dock-tb16-usb-audio.conf.patch deleted file mode 100644 index f44e48b..0000000 --- a/0066-install-dell-dock-tb16-usb-audio.conf.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4aed58955b87f5aa1dfd13725ca3a38774d152ca Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Wed, 1 Nov 2017 09:03:05 -0500 -Subject: [PATCH 66/66] install dell-dock-tb16-usb-audio.conf - -introduced in 60c0edd5286dbb731c671ad3e6886c1e3e1eb067 ---- - src/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index e610db74..03482502 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1312,7 +1312,8 @@ dist_alsaprofilesets_DATA = \ - 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/steelseries-arctis-usb-audio.conf -+ modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf \ -+ modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf - - if HAVE_UDEV - dist_udevrules_DATA = \ --- -2.14.3 - diff --git a/0074-build-sys-add-the-Dell-dock-TB16-configuration.patch b/0074-build-sys-add-the-Dell-dock-TB16-configuration.patch new file mode 100644 index 0000000..dd5dc96 --- /dev/null +++ b/0074-build-sys-add-the-Dell-dock-TB16-configuration.patch @@ -0,0 +1,27 @@ +From 2f1dcea363342154a1f6af7bd4ade3f87403b744 Mon Sep 17 00:00:00 2001 +From: Hui Wang +Date: Mon, 13 Nov 2017 10:17:19 +0800 +Subject: [PATCH 74/85] 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 e610db74..03482502 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1312,7 +1312,8 @@ dist_alsaprofilesets_DATA = \ + 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/steelseries-arctis-usb-audio.conf ++ modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf \ ++ modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf + + if HAVE_UDEV + dist_udevrules_DATA = \ +-- +2.14.3 + diff --git a/0084-sink-source-Don-t-finish-move-if-unlink-happens-afte.patch b/0084-sink-source-Don-t-finish-move-if-unlink-happens-afte.patch new file mode 100644 index 0000000..afd14bc --- /dev/null +++ b/0084-sink-source-Don-t-finish-move-if-unlink-happens-afte.patch @@ -0,0 +1,59 @@ +From 59d264ac56d644f626251daa44ef7b39a9a9fe03 Mon Sep 17 00:00:00 2001 +From: Georg Chini +Date: Sun, 3 Dec 2017 22:29:09 +0100 +Subject: [PATCH 84/85] sink, source: Don't finish move if unlink happens after + pa_*_move_all_start() + +When a sink input was unlinked between the calls to pa_sink_move_all_start() and +pa_sink_move_all_finish(), pa_sink_move_all_finish() tried to finish the move +of the already unlinked sink input, which lead to an assertion in +pa_sink_input_finish_move(). The same applies for the source side. + +This patch fixes the problem by checking the state of the sink input or +source output in pa_*_move_all_finish(). + +Bug report: https://bugs.freedesktop.org/show_bug.cgi?id=103752 +--- + src/pulsecore/sink.c | 6 ++++-- + src/pulsecore/source.c | 6 ++++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c +index 017b9539..39bf18f1 100644 +--- a/src/pulsecore/sink.c ++++ b/src/pulsecore/sink.c +@@ -920,9 +920,11 @@ void pa_sink_move_all_finish(pa_sink *s, pa_queue *q, bool save) { + pa_assert(q); + + while ((i = PA_SINK_INPUT(pa_queue_pop(q)))) { +- if (pa_sink_input_finish_move(i, s, save) < 0) +- pa_sink_input_fail_move(i); ++ if (PA_SINK_INPUT_IS_LINKED(i->state)) { ++ if (pa_sink_input_finish_move(i, s, save) < 0) ++ pa_sink_input_fail_move(i); + ++ } + pa_sink_input_unref(i); + } + +diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c +index d579c357..6099c10d 100644 +--- a/src/pulsecore/source.c ++++ b/src/pulsecore/source.c +@@ -860,9 +860,11 @@ void pa_source_move_all_finish(pa_source *s, pa_queue *q, bool save) { + pa_assert(q); + + while ((o = PA_SOURCE_OUTPUT(pa_queue_pop(q)))) { +- if (pa_source_output_finish_move(o, s, save) < 0) +- pa_source_output_fail_move(o); ++ if (PA_SOURCE_OUTPUT_IS_LINKED(o->state)) { ++ if (pa_source_output_finish_move(o, s, save) < 0) ++ pa_source_output_fail_move(o); + ++ } + pa_source_output_unref(o); + } + +-- +2.14.3 + diff --git a/pulseaudio.spec b/pulseaudio.spec index a51504d..9b158c2 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -25,7 +25,7 @@ Name: pulseaudio Summary: Improved Linux Sound Server Version: %{pa_major}%{?pa_minor:.%{pa_minor}} -Release: 6%{?snap:.%{snap}git%{shortcommit}}%{?dist} +Release: 7%{?snap:.%{snap}git%{shortcommit}}%{?dist} License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/PulseAudio %if 0%{?gitrel} @@ -61,6 +61,8 @@ Patch15: 0015-alsa-mixer-round-not-truncate-in-to_alsa_dB.patch Patch16: 0016-alsa-mixer-add-support-for-Steelseries-Arctis-7-head.patch Patch18: 0018-build-sys-add-the-Arctis-configuration.patch Patch35: 0035-alsa-mixer-Prioritize-hdmi-mappings-over-iec958-mapp.patch +Patch74: 0074-build-sys-add-the-Dell-dock-TB16-configuration.patch +Patch84: 0084-sink-source-Don-t-finish-move-if-unlink-happens-afte.patch ## upstreamable patches # patchset from https://bugs.freedesktop.org/show_bug.cgi?id=100488 @@ -70,8 +72,6 @@ Patch101: v5-1-4-bluetooth-use-consistent-profile-names.patch Patch102: v5-2-4-bluetooth-separate-HSP-and-HFP.patch Patch103: v5-3-4-bluetooth-add-correct-HFP-rfcomm-negotiation.patch Patch104: v5-4-4-bluetooth-make-native-the-default-backend.patch -# addendum to patch4 above -- rex -Patch105: 0066-install-dell-dock-tb16-usb-audio.conf.patch # patchset from https://bugs.freedesktop.org/show_bug.cgi?id=100488 fixing pa # crashing on Bay/Cherry Trail unless realtime-scheduling=no is set Patch106: Fix-realtime-scheduling-on-byt-cht.patch @@ -261,6 +261,8 @@ This package contains GDM integration hooks for the PulseAudio sound server. %patch16 -p1 %patch18 -p1 %patch35 -p1 +%patch74 -p1 +%patch84 -p1 ## upstreamable patches %patch100 -p1 @@ -271,7 +273,6 @@ This package contains GDM integration hooks for the PulseAudio sound server. %patch103 -p1 %patch104 -p1 %endif -%patch105 -p1 %patch106 -p1 %patch1 -p1 -b .autostart @@ -616,6 +617,9 @@ exit 0 %changelog +* Mon Dec 04 2017 Rex Dieter - 11.1-7 +- backport 'pa_sink_input_assert_ref()' crashfix (#1472285) + * Wed Nov 08 2017 Hans de Goede - 11.1-6 - Fix pa crashing on Bay- and Cherry-Trail devices