From 28c4432a464631e2a474d5d0edc95e4c76c55b9d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 5 Mar 2016 09:27:01 -0600 Subject: [PATCH] respin disable_flat_volumes.patch --- pulseaudio-8.0-disable_flat_volumes.patch | 28 +++++++++++------------ pulseaudio.spec | 5 +++- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pulseaudio-8.0-disable_flat_volumes.patch b/pulseaudio-8.0-disable_flat_volumes.patch index 4dbf3b0..10bd9eb 100644 --- a/pulseaudio-8.0-disable_flat_volumes.patch +++ b/pulseaudio-8.0-disable_flat_volumes.patch @@ -1,6 +1,6 @@ diff -up pulseaudio-8.0/man/pulse-daemon.conf.5.xml.in.disable_flat_volumes pulseaudio-8.0/man/pulse-daemon.conf.5.xml.in --- pulseaudio-8.0/man/pulse-daemon.conf.5.xml.in.disable_flat_volumes 2015-12-31 00:28:35.000000000 -0600 -+++ pulseaudio-8.0/man/pulse-daemon.conf.5.xml.in 2016-03-04 09:49:48.833444284 -0600 ++++ pulseaudio-8.0/man/pulse-daemon.conf.5.xml.in 2016-03-05 09:04:37.041037742 -0600 @@ -215,7 +215,7 @@ License along with PulseAudio; if not, s

flat-volumes= Enable 'flat' volumes, i.e. where possible let the sink volume equal the maximum of the volumes of @@ -10,21 +10,9 @@ diff -up pulseaudio-8.0/man/pulse-daemon.conf.5.xml.in.disable_flat_volumes puls -diff -up pulseaudio-8.0/src/daemon/daemon-conf.c.disable_flat_volumes pulseaudio-8.0/src/daemon/daemon-conf.c ---- pulseaudio-8.0/src/daemon/daemon-conf.c.disable_flat_volumes 2015-12-31 00:28:35.000000000 -0600 -+++ pulseaudio-8.0/src/daemon/daemon-conf.c 2016-03-04 09:51:32.250215876 -0600 -@@ -526,7 +526,7 @@ int pa_daemon_conf_load(pa_daemon_conf * - { "cpu-limit", pa_config_parse_not_bool, &c->no_cpu_limit, NULL }, - { "disable-shm", pa_config_parse_bool, &c->disable_shm, NULL }, - { "enable-shm", pa_config_parse_not_bool, &c->disable_shm, NULL }, -- { "flat-volumes", pa_config_parse_bool, &c->flat_volumes, NULL }, -+ { "flat-volumes", pa_config_parse_not_bool, &c->flat_volumes, NULL }, - { "lock-memory", pa_config_parse_bool, &c->lock_memory, NULL }, - { "enable-deferred-volume", pa_config_parse_bool, &c->deferred_volume, NULL }, - { "exit-idle-time", pa_config_parse_int, &c->exit_idle_time, NULL }, diff -up pulseaudio-8.0/src/daemon/daemon.conf.in.disable_flat_volumes pulseaudio-8.0/src/daemon/daemon.conf.in --- pulseaudio-8.0/src/daemon/daemon.conf.in.disable_flat_volumes 2015-09-09 23:51:41.000000000 -0500 -+++ pulseaudio-8.0/src/daemon/daemon.conf.in 2016-03-04 09:50:46.453874189 -0600 ++++ pulseaudio-8.0/src/daemon/daemon.conf.in 2016-03-05 09:04:37.041037742 -0600 @@ -57,7 +57,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl ; enable-lfe-remixing = yes ; lfe-crossover-freq = 120 @@ -34,3 +22,15 @@ diff -up pulseaudio-8.0/src/daemon/daemon.conf.in.disable_flat_volumes pulseaudi ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl ; rlimit-fsize = -1 +diff -up pulseaudio-8.0/src/pulsecore/core.c.disable_flat_volumes pulseaudio-8.0/src/pulsecore/core.c +--- pulseaudio-8.0/src/pulsecore/core.c.disable_flat_volumes 2015-12-31 00:28:35.000000000 -0600 ++++ pulseaudio-8.0/src/pulsecore/core.c 2016-03-05 09:04:37.041037742 -0600 +@@ -136,7 +136,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, + c->exit_idle_time = -1; + c->scache_idle_time = 20; + +- c->flat_volumes = true; ++ c->flat_volumes = false; + c->disallow_module_loading = false; + c->disallow_exit = false; + c->running_as_daemon = false; diff --git a/pulseaudio.spec b/pulseaudio.spec index d233fb5..3df3bdb 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -19,7 +19,7 @@ Name: pulseaudio Summary: Improved Linux Sound Server Version: %{pa_major}%{?pa_minor:.%{pa_minor}} -Release: 4%{?snap:.%{snap}git%{shortcommit}}%{?dist} +Release: 5%{?snap:.%{snap}git%{shortcommit}}%{?dist} License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/PulseAudio %if 0%{?gitrel} @@ -569,6 +569,9 @@ exit 0 %changelog +* Sat Mar 05 2016 Rex Dieter - 8.0-5 +- respin disable_flat_volumes.patch + * Fri Mar 04 2016 Rex Dieter - 8.0-4 - RFE: Disable PulseAudio's flat volumes f24+ (#1265267)