From 571d96efea0b3da45952defc5ae91b6c99e13904 Mon Sep 17 00:00:00 2001
From: Rex Dieter
Date: Fri, 4 Mar 2016 10:03:41 -0600
Subject: [PATCH] RFE: Disable PulseAudio's flat volumes f24+ (#1265267)
---
pulseaudio-8.0-disable_flat_volumes.patch | 36 +++++++++++++++++++++++
pulseaudio.spec | 12 +++++++-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 pulseaudio-8.0-disable_flat_volumes.patch
diff --git a/pulseaudio-8.0-disable_flat_volumes.patch b/pulseaudio-8.0-disable_flat_volumes.patch
new file mode 100644
index 0000000..4dbf3b0
--- /dev/null
+++ b/pulseaudio-8.0-disable_flat_volumes.patch
@@ -0,0 +1,36 @@
+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
+@@ -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
+ the inputs connected to it. Takes a boolean argument, defaults
+- to yes.
++ to no.
+
+
+
+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
+@@ -57,7 +57,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl
+ ; enable-lfe-remixing = yes
+ ; lfe-crossover-freq = 120
+
+-; flat-volumes = yes
++; flat-volumes = no
+
+ ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
+ ; rlimit-fsize = -1
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 37f9344..d233fb5 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: 3%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 4%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -39,6 +39,10 @@ Source5: default.pa-for-gdm
# user disables autospawn, or logging in as root
Patch1: pulseaudio-autostart.patch
+# disable flat-volumes by default
+# https://bugzilla.redhat.com/show_bug.cgi?id=1265267
+Patch2: pulseaudio-8.0-disable_flat_volumes.patch
+
## upstream patches
## upstreamable patches
@@ -227,6 +231,9 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
%patch1 -p1 -b .autostart
+%if 0%{?fedora} > 23
+%patch2 -p1 -b .disable_flat_volumes
+%endif
sed -i.no_consolekit -e \
's/^load-module module-console-kit/#load-module module-console-kit/' \
@@ -562,6 +569,9 @@ exit 0
%changelog
+* Fri Mar 04 2016 Rex Dieter - 8.0-4
+- RFE: Disable PulseAudio's flat volumes f24+ (#1265267)
+
* Thu Feb 04 2016 Fedora Release Engineering - 8.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild