From 9df3010cc34386ba1175bf7cc193641a84af327a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 12 2017 10:05:51 +0000 Subject: import pulseaudio-6.0-9.el7_3 --- diff --git a/SOURCES/0001-suspend-on-idle-resume-on-unload.patch b/SOURCES/0001-suspend-on-idle-resume-on-unload.patch new file mode 100644 index 0000000..38a2939 --- /dev/null +++ b/SOURCES/0001-suspend-on-idle-resume-on-unload.patch @@ -0,0 +1,46 @@ +From 8479e69deb546135b2f18cf56b2b111360244f22 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Wed, 11 Jan 2017 12:50:13 +0100 +Subject: [PATCH] suspend-on-idle: resume on unload + +We need to resume all sinks we know about when unloading the module or +else they will stay suspended forever. +--- + src/modules/module-suspend-on-idle.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c +index 0a27a70..00c828a 100644 +--- a/src/modules/module-suspend-on-idle.c ++++ b/src/modules/module-suspend-on-idle.c +@@ -495,6 +495,8 @@ fail: + + void pa__done(pa_module*m) { + struct userdata *u; ++ struct device_info *d; ++ void *state; + + pa_assert(m); + +@@ -539,6 +541,18 @@ void pa__done(pa_module*m) { + if (u->source_output_state_changed_slot) + pa_hook_slot_free(u->source_output_state_changed_slot); + ++ PA_HASHMAP_FOREACH(d, u->device_infos, state) { ++ if (d->sink && pa_sink_get_state(d->sink) == PA_SINK_SUSPENDED) { ++ pa_log_debug("Resuming sink %s on module unload.", d->sink->name); ++ pa_sink_suspend(d->sink, false, PA_SUSPEND_IDLE); ++ } ++ ++ if (d->source && pa_source_get_state(d->source) == PA_SOURCE_SUSPENDED) { ++ pa_log_debug("Resuming source %s on module unload.", d->source->name); ++ pa_source_suspend(d->source, false, PA_SUSPEND_IDLE); ++ } ++ } ++ + pa_hashmap_free(u->device_infos); + + pa_xfree(u); +-- +2.9.3 + diff --git a/SPECS/pulseaudio.spec b/SPECS/pulseaudio.spec index 63a8b72..57dc854 100644 --- a/SPECS/pulseaudio.spec +++ b/SPECS/pulseaudio.spec @@ -10,7 +10,7 @@ Name: pulseaudio Summary: Improved Linux Sound Server Version: %{pa_major}%{?pa_minor:.%{pa_minor}} -Release: 8%{?snap:.%{snap}git%{shortcommit}}%{?dist} +Release: 9%{?snap:.%{snap}git%{shortcommit}}%{?dist} License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/PulseAudio Source0: http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz @@ -26,6 +26,7 @@ Patch101: 0001-Avoid-multilib-conflict-in-usr-bin-padsp.patch Patch102: 0002-Add-korean-translation.patch Patch103: pulseaudio-autostart.patch Patch104: 0001-update-translations.patch +Patch105: 0001-suspend-on-idle-resume-on-unload.patch BuildRequires: automake libtool BuildRequires: pkgconfig(bash-completion) @@ -218,6 +219,7 @@ This package contains GDM integration hooks for the PulseAudio sound server. %patch102 -p1 -b .102 %patch103 -p1 -b .103 %patch104 -p1 -b .104 +%patch105 -p1 -b .105 sed -i.no_consolekit -e \ 's/^load-module module-console-kit/#load-module module-console-kit/' \ @@ -542,6 +544,10 @@ exit 0 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa %changelog +* Mon Mar 13 2017 Wim Taymans - 6.0-9 +- suspend-on-idle: resume on unload +- Resolves: #1430806 + * Mon Jun 27 2016 Wim Taymans - 6.0-8 - update translations - Resolves: #1272897