From 205b7b4acb8603ad751697cabedaa38895db829b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 31 May 2016 10:03:22 -0500 Subject: [PATCH] rebase disable_flat_volumes.patch --- pulseaudio-8.0-disable_flat_volumes.patch | 48 ----------------------- pulseaudio-9.0-disable_flat_volumes.patch | 48 +++++++++++++++++++++++ pulseaudio.spec | 2 +- 3 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 pulseaudio-8.0-disable_flat_volumes.patch create mode 100644 pulseaudio-9.0-disable_flat_volumes.patch diff --git a/pulseaudio-8.0-disable_flat_volumes.patch b/pulseaudio-8.0-disable_flat_volumes.patch deleted file mode 100644 index a81c2c5..0000000 --- a/pulseaudio-8.0-disable_flat_volumes.patch +++ /dev/null @@ -1,48 +0,0 @@ -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-05 12:56:59.045489407 -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-05 12:56:59.046489418 -0600 -@@ -68,7 +68,7 @@ static const pa_daemon_conf default_conf - .realtime_priority = 5, /* Half of JACK's default rtprio */ - .disallow_module_loading = false, - .disallow_exit = false, -- .flat_volumes = true, -+ .flat_volumes = false, - .exit_idle_time = 20, - .scache_idle_time = 20, - .script_commands = 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-05 12:59:15.521500440 -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 -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 12:56:59.046489418 -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-9.0-disable_flat_volumes.patch b/pulseaudio-9.0-disable_flat_volumes.patch new file mode 100644 index 0000000..3e489d6 --- /dev/null +++ b/pulseaudio-9.0-disable_flat_volumes.patch @@ -0,0 +1,48 @@ +diff -up pulseaudio-8.99.2/man/pulse-daemon.conf.5.xml.in.disable_flat_volumes pulseaudio-8.99.2/man/pulse-daemon.conf.5.xml.in +--- pulseaudio-8.99.2/man/pulse-daemon.conf.5.xml.in.disable_flat_volumes 2016-05-26 23:21:17.000000000 -0500 ++++ pulseaudio-8.99.2/man/pulse-daemon.conf.5.xml.in 2016-05-31 10:01:55.679976730 -0500 +@@ -220,7 +220,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.99.2/src/daemon/daemon-conf.c.disable_flat_volumes pulseaudio-8.99.2/src/daemon/daemon-conf.c +--- pulseaudio-8.99.2/src/daemon/daemon-conf.c.disable_flat_volumes 2016-05-26 23:21:17.000000000 -0500 ++++ pulseaudio-8.99.2/src/daemon/daemon-conf.c 2016-05-31 10:01:55.680976735 -0500 +@@ -68,7 +68,7 @@ static const pa_daemon_conf default_conf + .realtime_priority = 5, /* Half of JACK's default rtprio */ + .disallow_module_loading = false, + .disallow_exit = false, +- .flat_volumes = true, ++ .flat_volumes = false, + .exit_idle_time = 20, + .scache_idle_time = 20, + .script_commands = NULL, +diff -up pulseaudio-8.99.2/src/daemon/daemon.conf.in.disable_flat_volumes pulseaudio-8.99.2/src/daemon/daemon.conf.in +--- pulseaudio-8.99.2/src/daemon/daemon.conf.in.disable_flat_volumes 2016-05-31 10:01:55.680976735 -0500 ++++ pulseaudio-8.99.2/src/daemon/daemon.conf.in 2016-05-31 10:02:28.048133267 -0500 +@@ -57,7 +57,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl + ; enable-lfe-remixing = no + ; lfe-crossover-freq = 0 + +-; flat-volumes = yes ++; flat-volumes = no + + ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl + ; rlimit-fsize = -1 +diff -up pulseaudio-8.99.2/src/pulsecore/core.c.disable_flat_volumes pulseaudio-8.99.2/src/pulsecore/core.c +--- pulseaudio-8.99.2/src/pulsecore/core.c.disable_flat_volumes 2016-05-26 23:21:17.000000000 -0500 ++++ pulseaudio-8.99.2/src/pulsecore/core.c 2016-05-31 10:01:55.681976740 -0500 +@@ -135,7 +135,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 6362b1c..e232505 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -47,7 +47,7 @@ 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 +Patch2: pulseaudio-9.0-disable_flat_volumes.patch ## upstream patches