update to latest git

- updates for the ALSA UCM
- sink selection fixes (active_port)
- flat volumes were disabled in the upstream commit
  ba73faa4c05717d74fbfd17e8175731e60d8841d
- qpaeq uses python3 now - upstream commit
  64b259c2c93e69a06c894d5cd0ef39cb95efbcdb
- xauthority parameter was added in the upstream commit
  c7a55174dc5b087cdd96524530aa10ed1d39968e
This commit is contained in:
Jaroslav Kysela 2020-01-13 19:41:34 +01:00
parent f9b9de4aad
commit e9c21c90b7
5 changed files with 16 additions and 84 deletions

View File

@ -1,48 +0,0 @@
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
<p><opt>flat-volumes=</opt> 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 <opt>yes</opt>.</p>
+ to <opt>no</opt>.</p>
</option>
</section>
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;

View File

@ -1,6 +1,7 @@
diff -up pulseaudio-6.0/src/daemon/start-pulseaudio-x11.in.autostart pulseaudio-6.0/src/daemon/start-pulseaudio-x11.in
--- pulseaudio-6.0/src/daemon/start-pulseaudio-x11.in.autostart 2015-02-12 08:10:35.000000000 -0600
+++ pulseaudio-6.0/src/daemon/start-pulseaudio-x11.in 2015-06-22 11:24:13.561614127 -0500
diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in
index 0e84315c3..6533e125b 100755
--- a/src/daemon/start-pulseaudio-x11.in
+++ b/src/daemon/start-pulseaudio-x11.in
@@ -17,6 +17,9 @@
set -e
@ -10,4 +11,4 @@ diff -up pulseaudio-6.0/src/daemon/start-pulseaudio-x11.in.autostart pulseaudio-
+
if [ x"$DISPLAY" != x ] ; then
@PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
@PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY xauthority=$XAUTHORITY" > /dev/null

View File

@ -1,18 +0,0 @@
diff -up pulseaudio-12.99.2/src/utils/qpaeq.qpaeq_python2 pulseaudio-12.99.2/src/utils/qpaeq
--- pulseaudio-12.99.2/src/utils/qpaeq.qpaeq_python2 2019-07-04 19:06:47.000000000 -0500
+++ pulseaudio-12.99.2/src/utils/qpaeq 2019-08-07 10:30:03.134944372 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# qpaeq is a equalizer interface for pulseaudio's equalizer sinks
# Copyright (C) 2009 Jason Newton <nevion@gmail.com
#
@@ -18,7 +18,7 @@
import os,math,sys
try:
- import PyQt5,sip
+# import PyQt5,sip
from PyQt5 import QtWidgets,QtCore
import dbus.mainloop.pyqt5
import dbus

View File

@ -1,10 +1,10 @@
%global pa_major 13.0
#global pa_minor 0
#global snap 20180411
#global gitrel 129
#global gitcommit ba2b748d40f78b9d9f945b5422ca74d05f8d0d07
#global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
%global snap 20200105
%global gitrel 103
%global gitcommit f5d3606fe76302c7dbdb0f6a80400df829a5f846
%global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
# webrtc bits go wonky without this
# see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/
@ -31,7 +31,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
Release: 1%{?snap:.%{snap}git%{shortcommit}}%{?dist}
Release: 2%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@ -51,13 +51,6 @@ Source5: default.pa-for-gdm
# valid even when using systemd socket activation too
Patch201: pulseaudio-autostart.patch
# disable flat-volumes by default
# https://bugzilla.redhat.com/show_bug.cgi?id=1265267
Patch202: pulseaudio-9.0-disable_flat_volumes.patch
# explicitly use /usr/bin/python3
Patch203: pulseaudio-qpaeq_python3.patch
# disable autospawn
Patch206: pulseaudio-11.1-autospawn_disable.patch
@ -257,8 +250,6 @@ This package contains GDM integration hooks for the PulseAudio sound server.
## upstreamable patches
%patch201 -p1 -b .autostart
%patch202 -p1 -b .disable_flat_volumes
%patch203 -p1 -b .qpaeq_python2
%if 0%{?systemd}
%patch206 -p1 -b .autospawn_disable
%endif
@ -653,6 +644,11 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || :
%changelog
* Wed Jan 08 2020 Jaroslav Kysela <perex@perex.cz> - 13.0-2
- Update to upstream gitsnapshot
- ALSA UCM fixes
- active_port sink selection fixes
* Fri Sep 13 2019 Rex Dieter <rdieter@fedoraproject.org> - 13.0-1
- 13.0

View File

@ -1,2 +1,3 @@
SHA512 (pulseaudio-13.0.tar.xz) = d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
SHA512 (pulseaudio-13.0.tar.xz.sha256) = 2ab70694248027d3f2edabb0f7473fd358881246f01387c123d1ded3c8ff4dff0bdcfa0f3604d1e645bce4641f7c27f666e012e7cfa71295751aa8d56032d9f4
SHA512 (pulseaudio-13.0-103-gf5d36.tar.xz) = c9f4feee5503a5b778d682fd2920b7dab5f9c5a3e88108acf56da08e11addd37b6d4b3a8367053a9d2fe00b68cff798937a44fe443a1d27cc69de497eac941e7