rpms/pulseaudio
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import pulseaudio-11.1-23.el8

Browse Source
This commit is contained in:
CentOS Sources 2020-01-21 16:05:02 -05:00 committed by Stepan Oksanichenko
parent c6b17e39cf
commit 76b178b36a
4 changed files with 335 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
SOURCES/0001-X11-Add-xauthority-parameter.patch Normal file
View File

@ -0,0 +1,145 @@
From 2bb1f0dbd0772ba57ede8837c2f3856b4e7198c0 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 12 Sep 2019 09:49:40 +0200
Subject: [PATCH 1/3] X11: Add xauthority parameter
Add an xauthority parameter and use it in the startup script.
Based on patch by Alexander Kurtz <kurtz.alex@googlemail.com>
---
src/daemon/start-pulseaudio-x11.in | 6 +++---
src/modules/x11/module-x11-bell.c | 8 ++++++++
src/modules/x11/module-x11-cork-request.c | 8 ++++++++
src/modules/x11/module-x11-publish.c | 8 ++++++++
src/modules/x11/module-x11-xsmp.c | 8 ++++++++
5 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in
index 15c79e187..2afa88563 100755
--- a/src/daemon/start-pulseaudio-x11.in
+++ b/src/daemon/start-pulseaudio-x11.in
@@ -22,14 +22,14 @@ set -e
if [ x"$DISPLAY" != x ] ; then
- @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
- @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null
+ @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY xauthority=$XAUTHORITY" > /dev/null
+ @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY xauthority=$XAUTHORITY" > /dev/null
if [ x"$KDE_FULL_SESSION" = x"true" ]; then
@PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
fi
if [ x"$SESSION_MANAGER" != x ] ; then
- @PACTL_BINARY@ load-module module-x11-xsmp "display=$DISPLAY session_manager=$SESSION_MANAGER" > /dev/null
+ @PACTL_BINARY@ load-module module-x11-xsmp "display=$DISPLAY xauthority=$XAUTHORITY session_manager=$SESSION_MANAGER" > /dev/null
fi
fi
diff --git a/src/modules/x11/module-x11-bell.c b/src/modules/x11/module-x11-bell.c
index 7b2be57bf..ec63c672f 100644
--- a/src/modules/x11/module-x11-bell.c
+++ b/src/modules/x11/module-x11-bell.c
@@ -46,6 +46,7 @@ static const char* const valid_modargs[] = {
"sink",
"sample",
"display",
+ "xauthority",
NULL
};
@@ -127,6 +128,13 @@ int pa__init(pa_module*m) {
u->sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL));
u->x11_client = NULL;
+ if (pa_modargs_get_value(ma, "xauthority", NULL)) {
+ if (setenv("XAUTHORITY", pa_modargs_get_value(ma, "xauthority", NULL), 1)) {
+ pa_log("setenv() for $XAUTHORITY failed");
+ goto fail;
+ }
+ }
+
if (!(u->x11_wrapper = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL))))
goto fail;
diff --git a/src/modules/x11/module-x11-cork-request.c b/src/modules/x11/module-x11-cork-request.c
index 5c76711f2..966907109 100644
--- a/src/modules/x11/module-x11-cork-request.c
+++ b/src/modules/x11/module-x11-cork-request.c
@@ -48,6 +48,7 @@ PA_MODULE_USAGE("display=<X11 display>");
static const char* const valid_modargs[] = {
"display",
+ "xauthority",
NULL
};
@@ -130,6 +131,13 @@ int pa__init(pa_module *m) {
m->userdata = u = pa_xnew0(struct userdata, 1);
u->module = m;
+ if (pa_modargs_get_value(ma, "xauthority", NULL)) {
+ if (setenv("XAUTHORITY", pa_modargs_get_value(ma, "xauthority", NULL), 1)) {
+ pa_log("setenv() for $XAUTHORITY failed");
+ goto fail;
+ }
+ }
+
if (!(u->x11_wrapper = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL))))
goto fail;
diff --git a/src/modules/x11/module-x11-publish.c b/src/modules/x11/module-x11-publish.c
index 553b3417e..fcf306bef 100644
--- a/src/modules/x11/module-x11-publish.c
+++ b/src/modules/x11/module-x11-publish.c
@@ -58,6 +58,7 @@ static const char* const valid_modargs[] = {
"sink",
"source",
"cookie",
+ "xauthority",
NULL
};
@@ -158,6 +159,13 @@ int pa__init(pa_module*m) {
if (!(u->auth_cookie = pa_auth_cookie_get(m->core, pa_modargs_get_value(ma, "cookie", PA_NATIVE_COOKIE_FILE), true, PA_NATIVE_COOKIE_LENGTH)))
goto fail;
+ if (pa_modargs_get_value(ma, "xauthority", NULL)) {
+ if (setenv("XAUTHORITY", pa_modargs_get_value(ma, "xauthority", NULL), 1)) {
+ pa_log("setenv() for $XAUTHORITY failed");
+ goto fail;
+ }
+ }
+
if (!(u->x11_wrapper = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL))))
goto fail;
diff --git a/src/modules/x11/module-x11-xsmp.c b/src/modules/x11/module-x11-xsmp.c
index 29737c531..8f1d46ad3 100644
--- a/src/modules/x11/module-x11-xsmp.c
+++ b/src/modules/x11/module-x11-xsmp.c
@@ -48,6 +48,7 @@ static bool ice_in_use = false;
static const char* const valid_modargs[] = {
"session_manager",
"display",
+ "xauthority",
NULL
};
@@ -141,6 +142,13 @@ int pa__init(pa_module*m) {
goto fail;
}
+ if (pa_modargs_get_value(ma, "xauthority", NULL)) {
+ if (setenv("XAUTHORITY", pa_modargs_get_value(ma, "xauthority", NULL), 1)) {
+ pa_log("setenv() for $XAUTHORITY failed");
+ goto fail;
+ }
+ }
+
if (!(u->x11 = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL))))
goto fail;
--
2.21.0

130
SOURCES/0002-alsa-Use-correct-header-path.patch Normal file
View File

@ -0,0 +1,130 @@
From 24a9694bfb3734b410b81c4d1a4bdfe0ed16b00b Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de>
Date: Wed, 27 Mar 2019 09:35:05 +0100
Subject: [PATCH 2/3] alsa: Use correct header path
Consumers are expected to use <alsa/asoundlib.h> instead of
<asoundlib.h>.
This is in preparation of an change to pkgconfig(alsa) to
not pollute CFLAGS with -I/usr/include/alsa anymore.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
src/modules/alsa/alsa-mixer.c | 2 +-
src/modules/alsa/alsa-mixer.h | 2 +-
src/modules/alsa/alsa-sink.c | 2 +-
src/modules/alsa/alsa-source.c | 2 +-
src/modules/alsa/alsa-ucm.c | 2 +-
src/modules/alsa/alsa-util.c | 2 +-
src/modules/alsa/alsa-util.h | 2 +-
src/modules/alsa/module-alsa-source.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 7de1c7deb..b2c50e611 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -23,7 +23,7 @@
#endif
#include <sys/types.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#include <math.h>
#ifdef HAVE_VALGRIND_MEMCHECK_H
diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
index 4ebf1922b..8474a3d19 100644
--- a/src/modules/alsa/alsa-mixer.h
+++ b/src/modules/alsa/alsa-mixer.h
@@ -21,7 +21,7 @@
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#include <pulse/sample.h>
#include <pulse/mainloop-api.h>
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 827a65081..9eb9913ff 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -25,7 +25,7 @@
#include <signal.h>
#include <stdio.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#ifdef HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 6bec188ea..ac919770a 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -25,7 +25,7 @@
#include <signal.h>
#include <stdio.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#include <pulse/rtclock.h>
#include <pulse/timeval.h>
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
index b42c04079..235276af2 100644
--- a/src/modules/alsa/alsa-ucm.c
+++ b/src/modules/alsa/alsa-ucm.c
@@ -27,7 +27,7 @@
#include <ctype.h>
#include <sys/types.h>
#include <limits.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#ifdef HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index 61fb4903c..f0e5b3642 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -23,7 +23,7 @@
#endif
#include <sys/types.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#include <pulse/sample.h>
#include <pulse/xmalloc.h>
diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
index 8345a0ba5..24f8d70ee 100644
--- a/src/modules/alsa/alsa-util.h
+++ b/src/modules/alsa/alsa-util.h
@@ -21,7 +21,7 @@
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#include <pulse/sample.h>
#include <pulse/channelmap.h>
diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
index 45fb1aca8..bbf02af28 100644
--- a/src/modules/alsa/module-alsa-source.c
+++ b/src/modules/alsa/module-alsa-source.c
@@ -24,7 +24,7 @@
#include <stdio.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
#ifdef HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
--
2.21.0

45
SOURCES/0003-alsa-Fix-inclusion-of-use-case.h.patch Normal file
View File

@ -0,0 +1,45 @@
From 93297a5a87014155540d19e4f619b57d86bcdf6d Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Sun, 21 Apr 2019 11:59:30 +0200
Subject: [PATCH 3/3] alsa: Fix inclusion of use-case.h
The recent change in ALSA upstream stripped -I$include/alsa path from
pkgconfig. We already fixed for this change in some places but still
the code for UCM was overlooked, and this resulted in the unresolved
symbols in alsa card module. Fix them as well.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
configure.ac | 2 +-
src/modules/alsa/alsa-ucm.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3a71fd8c2..b09c138b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -830,7 +830,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
AS_IF([test "x$HAVE_ALSA" = "x1"],
[
save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
- AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
+ AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
CPPFLAGS="$save_CPPFLAGS"
],
HAVE_ALSA_UCM=0)
diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
index 53abf3f90..c926f3cc3 100644
--- a/src/modules/alsa/alsa-ucm.h
+++ b/src/modules/alsa/alsa-ucm.h
@@ -23,7 +23,7 @@
***/
#ifdef HAVE_ALSA_UCM
-#include <use-case.h>
+#include <alsa/use-case.h>
#else
typedef void snd_use_case_mgr_t;
#endif
--
2.21.0

16
SPECS/pulseaudio.spec
View File

@ -39,7 +39,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
Release: 22%{?snap:.%{snap}git%{shortcommit}}%{?dist}
Release: 23%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@ -78,6 +78,10 @@ Patch205: pulseaudio-11.1-glibc_memfd.patch
# disable autospawn
Patch206: pulseaudio-11.1-autospawn_disable.patch
Patch207: 0001-X11-Add-xauthority-parameter.patch
Patch208: 0002-alsa-Use-correct-header-path.patch
Patch209: 0003-alsa-Fix-inclusion-of-use-case.h.patch
## upstream patches
Patch4: 0004-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch
Patch9: 0009-alsa-mixer-set-PCM-Capture-Source-for-iec958-input.patch
@ -343,6 +347,11 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%patch206 -p1 -b .autospawn_disable
%endif
%patch207 -p1
%patch208 -p1
%patch209 -p1
sed -i.no_consolekit -e \
's/^load-module module-console-kit/#load-module module-console-kit/' \
src/daemon/default.pa.in
@ -723,6 +732,11 @@ exit 0
%changelog
* Thu Sep 12 2019 Wim Taymans <wtaymans@redhat.com> - 11.1-23
- Add xauthority parameter to X11 modules
- Fix compilation against newer alsa-lib
- Resolves: rhbz#1723065
* Tue Sep 04 2018 Wim Taymans <wtaymans@redhat.com> - 11.1-22
- Use python3 version of qt5
- Resolves: rhbz#1591134