12 changed files with 277 additions and 367 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,17 @@
-SOURCES/pulseaudio-14.0.tar.xz
+/.*.log
+/*.src.rpm
+/pulseaudio-*.tar.xz
+/pulseaudio-*.tar.xz.md5
+/pulseaudio-*.tar.xz.sha1
+/pulseaudio-12.2.tar.xz.sha256
+/pulseaudio-12.99.1.tar.xz.sha256
+/pulseaudio-12.99.2.tar.xz.sha256
+/pulseaudio-12.99.3.tar.xz.sha256
+/pulseaudio-13.0.tar.xz.sha256
+/pulseaudio-13.99.1.tar.xz.sha256
+/pulseaudio-13.99.2.tar.xz.sha256
+/pulseaudio-13.99.3.tar.xz.sha256
+/pulseaudio-14.0.tar.xz.sha256
+/pulseaudio-14.1.tar.xz.sha256
+/pulseaudio-14.2.tar.xz.sha256
+/pulseaudio-15.0.tar.xz.sha256sum
--- a/.pulseaudio.metadata
+++ b/.pulseaudio.metadata
@ -1 +0,0 @@
-c37a8551993ed045b3fa55176c9d1df4d2ed17a1 SOURCES/pulseaudio-14.0.tar.xz
--- a/SOURCES/0001-alsa-card-add-dynamic-priority-bonus-base-for-alsa-p.patch
+++ b/SOURCES/0001-alsa-card-add-dynamic-priority-bonus-base-for-alsa-p.patch
@ -1,122 +0,0 @@
-From 832d7ac1144416306de1b6990d70115079bd1935 Mon Sep 17 00:00:00 2001
-From: Hui Wang <hui.wang@canonical.com>
-Date: Fri, 21 Aug 2020 17:34:25 +0800
-Subject: [PATCH] alsa-card: add dynamic priority bonus base for alsa profiles
-
-After applying the commit 0d50e787 ("alsa-card: improve the profile
-availability logic"), we met an new issue. when system selects the
-initial profile, the profile off is selected instead of a profile with
-a valid output device on it. That is the issue we met:
-
-Profiles:
-  HiFi: Default (sinks: 2, sources: 2, priority: 8000, available: no)
-  off: Off (sinks: 0, sources: 0, priority: 0, available: yes)
-Active Profile: off
-Ports:
-  [Out] Headphones: Headphones (priority: 300, latency offset: 0 usec, not available)
-   Part of profile(s): HiFi
-  [Out] Speaker: Speaker (priority: 100, latency offset: 0 usec)
-   Part of profile(s): HiFi
-...
-
-I know the commit 0d50e787 really fixed something, but we still need
-to fix the new issue, to do so, this patch introduces a priority bonus
-for alsa profiles and separate the alsa profiles to 3 groups:
-group a (will be granted priority bonus dynamically):
-a profile has only output ports and at least one port is not unavailable
-a profile has only input ports and at least one port is not unavailable
-a profile has both input and output ports, and at least one output and
-one input ports are not unavailable
-
-group b (will be marked unavailable)
-a profile has only output ports and all ports are unavailable
-a profile has only input ports and all ports are unavailable
-a profile has both output and input ports, and all ports are unavailable
-
-group c
-the rest profiles, their priority and availability is not changed.
-
-With this change, the profile HiFi will become avaialbe:yes, and will
-not be granted priority bonus if no input port is plugged.
-
-The priority bonus provides a higher priority base to profiles, this
-guarantees this patch doesn't break the fix of 0d50e787.
-
-https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/927
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/355>
---
- src/modules/alsa/module-alsa-card.c | 35 ++++++++++++++++++++++++-----
- 1 file changed, 30 insertions(+), 5 deletions(-)
-
-diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
-index de2fe9cc4..5349314b5 100644
--- a/src/modules/alsa/module-alsa-card.c
-+++ b/src/modules/alsa/module-alsa-card.c
-@@ -104,6 +104,13 @@ static const char* const valid_modargs[] = {
- 
- #define DEFAULT_DEVICE_ID "0"
- 
-+/* dynamic profile priority bonus, for all alsa profiles, the original priority
-+   needs to be less than 0x7fff (32767), then could apply the rule of priority
-+   bonus. So far there are 2 kinds of alsa profiles, one is from alsa ucm, the
-+   other is from mixer profile-sets, their priorities are all far less than 0x7fff
-+*/
-+#define PROFILE_PRIO_BONUS 0x8000
-+
- struct userdata {
-     pa_core *core;
-     pa_module *module;
-@@ -459,9 +466,19 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask) {
-      * as available (well, "unknown" to be precise, but there's little
-      * practical difference).
-      *
-     * When all output ports are unavailable, we know that all sinks are
-     * unavailable, and therefore the profile is marked unavailable as well.
-     * The same applies to input ports as well, of course.
-+     * A profile will be marked unavailable:
-+     * only contains output ports and all ports are unavailable
-+     * only contains input ports and all ports are unavailable
-+     * contains both input and output ports and all ports are unavailable
-+     *
-+     * A profile will be awarded priority bonus:
-+     * only contains output ports and at least one port is available
-+     * only contains input ports and at least one port is available
-+     * contains both output and input ports and at least one output port
-+     * and one input port are available
-+     *
-+     * The rest profiles will not be marked unavailable and will not be
-+     * awarded priority bonus
-      *
-      * If there are no output ports at all, but the profile contains at least
-      * one sink, then the output is considered to be available. */
-@@ -476,6 +493,7 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask) {
-         bool found_available_output_port = false;
-         pa_available_t available = PA_AVAILABLE_UNKNOWN;
- 
-+        profile->priority &= ~PROFILE_PRIO_BONUS;
-         PA_HASHMAP_FOREACH(port, u->card->ports, state2) {
-             if (!pa_hashmap_get(port->profiles, profile->name))
-                 continue;
-@@ -493,8 +511,15 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask) {
-             }
-         }
- 
-        if ((has_input_port && !found_available_input_port) || (has_output_port && !found_available_output_port))
-            available = PA_AVAILABLE_NO;
-+        if ((has_input_port && found_available_input_port && !has_output_port) ||
-+            (has_output_port && found_available_output_port && !has_input_port) ||
-+            (has_input_port && found_available_input_port && has_output_port && found_available_output_port))
-+                profile->priority |= PROFILE_PRIO_BONUS;
-+
-+        if ((has_input_port && !found_available_input_port && has_output_port && !found_available_output_port) ||
-+            (has_input_port && !found_available_input_port && !has_output_port) ||
-+            (has_output_port && !found_available_output_port && !has_input_port))
-+                available = PA_AVAILABLE_NO;
- 
-         /* We want to update the active profile's status last, so logic that
-          * may change the active profile based on profile availability status
-- 
-2.36.1
-
--- a/SOURCES/0001-bluez5-do-NameHasOwner-before-using-org.bluez.patch
+++ b/SOURCES/0001-bluez5-do-NameHasOwner-before-using-org.bluez.patch
@ -1,94 +0,0 @@
-From e50ec0deb7c20d1daa26cc7eab5a1ff75b9f7bf8 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Wed, 17 Nov 2021 12:28:23 +0100
-Subject: [PATCH] bluez5: do NameHasOwner before using org.bluez
-
-We should not be using org.bluez when the bluetooth service is not
-running or else we might try to activate it. The activation of the
-bluetooth service should be done at boot time.
---
- src/modules/bluetooth/bluez5-util.c | 61 ++++++++++++++++++++++++++++-
- 1 file changed, 60 insertions(+), 1 deletion(-)
-
-diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c
-index a21896ede..282886e45 100644
--- a/src/modules/bluetooth/bluez5-util.c
-+++ b/src/modules/bluetooth/bluez5-util.c
-@@ -1095,6 +1095,65 @@ static void get_managed_objects(pa_bluetooth_discovery *y) {
-     send_and_add_to_pending(y, m, get_managed_objects_reply, NULL);
- }
- 
-+static void check_name_owner_reply(DBusPendingCall *pending, void *userdata) {
-+    pa_dbus_pending *p;
-+    pa_bluetooth_discovery *y;
-+    DBusMessage *r;
-+    DBusError err;
-+    bool running;
-+
-+    pa_assert_se(p = userdata);
-+    pa_assert_se(y = p->context_data);
-+    pa_assert_se(r = dbus_pending_call_steal_reply(pending));
-+
-+    if (dbus_message_is_error(r, DBUS_ERROR_UNKNOWN_METHOD)) {
-+        pa_log_warn("BlueZ D-Bus ObjectManager not available");
-+        goto finish;
-+    }
-+
-+    if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) {
-+        pa_log_error("NameHasOwner() failed: %s: %s", dbus_message_get_error_name(r), pa_dbus_get_error_message(r));
-+        goto finish;
-+    }
-+
-+    if (!pa_streq(dbus_message_get_signature(r), "b")) {
-+        pa_log_error("Invalid reply signature for NameHasOwner()");
-+        goto finish;
-+    }
-+
-+    dbus_error_init(&err);
-+    if (!dbus_message_get_args(r, &err, DBUS_TYPE_BOOLEAN, &running, DBUS_TYPE_INVALID)) {
-+        pa_log_error("Could not check bluetooth service: %s", err.message);
-+        dbus_error_free(&err);
-+        goto finish;
-+   }
-+
-+   pa_log_info("bluetooth service running: %s", running ? "yes" : "no");
-+   if (running)
-+       get_managed_objects(y);
-+
-+finish:
-+    dbus_message_unref(r);
-+
-+    PA_LLIST_REMOVE(pa_dbus_pending, y->pending, p);
-+    pa_dbus_pending_free(p);
-+}
-+
-+static void check_name_owner(pa_bluetooth_discovery *y) {
-+    DBusMessage *m;
-+    const char *service = BLUEZ_SERVICE;
-+
-+    pa_assert(y);
-+
-+    pa_assert_se(m = dbus_message_new_method_call("org.freedesktop.DBus",
-+                            "/org/freedesktop/DBus",
-+                            "org.freedesktop.DBus",
-+                            "NameHasOwner"));
-+    dbus_message_append_args(m, DBUS_TYPE_STRING, &service, DBUS_TYPE_INVALID);
-+
-+    send_and_add_to_pending(y, m, check_name_owner_reply, NULL);
-+}
-+
- pa_hook* pa_bluetooth_discovery_hook(pa_bluetooth_discovery *y, pa_bluetooth_hook_t hook) {
-     pa_assert(y);
-     pa_assert(PA_REFCNT_VALUE(y) > 0);
-@@ -1653,7 +1712,7 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c, int headset_backe
-         pa_xfree(endpoint);
-     }
- 
-    get_managed_objects(y);
-+    check_name_owner(y);
- 
-     return y;
- 
-- 
-2.36.1
-
--- a/SOURCES/pulseaudio-14.0.tar.xz.sha256
+++ b/SOURCES/pulseaudio-14.0.tar.xz.sha256
@ -1 +0,0 @@
-a834775d9382b055504e5ee7625dc50768daac29329531deb6597bf05e06c261  pulseaudio-14.0.tar.xz
--- a/SOURCES/pulseaudio-autostart.patch
+++ b/SOURCES/pulseaudio-autostart.patch
@ -1,12 +0,0 @@
--- pulseaudio-13.99.1/src/daemon/start-pulseaudio-x11.in	2020-05-11 17:35:39.857484912 +0200
-+++ pulseaudio-13.99.1.new/src/daemon/start-pulseaudio-x11.in	2020-05-11 17:35:53.041199783 +0200
-@@ -17,6 +17,9 @@
- 
- set -e
- 
-+# probe to test if autospawn works, else resort to starting manually
-+@PACTL_BINARY@ info > /dev/null 2>&1 || @PA_BINARY@ --start "$@"
-+
- if [ x"$DISPLAY" != x ] ; then
- 
-     @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY xauthority=$XAUTHORITY" > /dev/null
--- a/SOURCES/default.pa-for-gdm
+++ b/SOURCES/default.pa-for-gdm
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
--- a/SOURCES/pulseaudio-11.1-autospawn_disable.patch
+++ b/SOURCES/pulseaudio-11.1-autospawn_disable.patch
--- a/pulseaudio-autostart.patch
+++ b/pulseaudio-autostart.patch
@ -0,0 +1,14 @@
+diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in
+index 722a639c0..7cdf14e4d 100755
+--- a/src/daemon/start-pulseaudio-x11.in
+++ b/src/daemon/start-pulseaudio-x11.in
+@@ -17,6 +17,9 @@
+ 
+ set -e
+ 
+# probe to test if autospawn works, else resort to starting manually
+@PACTL_BINARY@ info > /dev/null 2>&1 || /usr/bin/pulseaudio --start "$@"
+
+ if [ -n "$1" ] ; then
+     case $1 in
+     stop)
--- a/SPECS/pulseaudio.spec
+++ b/SPECS/pulseaudio.spec
@ -1,22 +1,32 @@
-%global pa_major   14.0
+%global pa_major   15.0
 #global pa_minor   0

-#global snap       20141103
-#global gitrel     327
-#global gitcommit  aec811798cd883a454b9b5cd82c77831906bbd2d
-#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/
 %undefine _strict_symbol_defs_build
 %global with_webrtc 1

+%if 0%{?fedora}
+%global enable_lirc 1
+%global enable_jack 1
+%endif
+
 # https://bugzilla.redhat.com/983606
 %global _hardened_build 1

 ## support systemd activation
 %global systemd 1

+# gdm-hooks moved to gdm packaging f28+
+%if 0%{?fedora} < 28 && 0%{?rhel} < 8
+%global gdm_hooks 1
+%endif
+
 ## comment to disable tests
 %global tests 1

@ -26,7 +36,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release:        4%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release:        3%{?snap:.%{snap}git%{shortcommit}}%{?dist}
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 %if 0%{?gitrel}
@ -35,7 +45,7 @@ URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 Source0:        pulseaudio-%{version}-%{gitrel}-g%{shortcommit}.tar.xz
 %else
 Source0:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz
-Source1:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz.sha256
+Source1:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz.sha256sum
 %endif

 Source5:        default.pa-for-gdm
@ -50,11 +60,12 @@ Patch201: pulseaudio-autostart.patch
 Patch206: pulseaudio-11.1-autospawn_disable.patch

 ## upstream patches
-Patch301: 0001-alsa-card-add-dynamic-priority-bonus-base-for-alsa-p.patch
-Patch302: 0001-bluez5-do-NameHasOwner-before-using-org.bluez.patch

-BuildRequires:  automake libtool
-BuildRequires:  gcc-c++
+## upstreamable patches
+
+BuildRequires:  meson >= 0.50.0
+BuildRequires:  gcc
+BuildRequires:  g++
 BuildRequires:  pkgconfig(bash-completion)
 %global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '/etc/bash_completion.d')
 BuildRequires:  m4
@ -67,12 +78,7 @@ BuildRequires:  libsndfile-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
-BuildRequires:  GConf2-devel
 BuildRequires:  avahi-devel
-%if 0%{?fedora}
-%global enable_lirc 1
-%global enable_jack 1
-%endif
 BuildRequires:  libatomic_ops-static, libatomic_ops-devel
 BuildRequires:  pkgconfig(bluez) >= 5.0
 BuildRequires:  sbc-devel
@ -106,6 +112,9 @@ BuildRequires:  pkgconfig(webrtc-audio-processing) >= 0.2
 %if 0%{?tests}
 BuildRequires:  pkgconfig(check)
 %endif
+BuildRequires:  pkgconfig(gstreamer-1.0) >= 1.16.0
+BuildRequires:  pkgconfig(gstreamer-app-1.0) >= 1.16.0
+BuildRequires:  pkgconfig(gstreamer-rtp-1.0) >= 1.16.0

 # retired along with -libs-zeroconf, add Obsoletes here for lack of anything better
 Obsoletes:      padevchooser < 1.0
@ -113,11 +122,9 @@ Requires(pre):  shadow-utils
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       rtkit

-%if 0%{?fedora}
 # Virtual Provides to support swapping between PipeWire-PA and PA
 Provides:       pulseaudio-daemon
 Conflicts:      pulseaudio-daemon
-%endif

 %description
 PulseAudio is a sound server for Linux and other Unix like operating
@ -127,18 +134,11 @@ Enlightened Sound Daemon (ESOUND).
 %package qpaeq
 Summary:	Pulseaudio equalizer interface
 Requires: 	%{name}%{?_isa} = %{version}-%{release}
-Requires:	python3-qt5
+Requires:	python3-qt5-base
 Requires:	python3-dbus
 %description qpaeq
 qpaeq is a equalizer interface for pulseaudio's equalizer sinks.

-%package esound-compat
-Summary:        PulseAudio EsounD daemon compatibility script
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-%description esound-compat
-A compatibility script that allows applications to call /usr/bin/esd
-and start PulseAudio with EsounD protocol modules.
-
 %if 0%{?enable_lirc}
 %package module-lirc
 Summary:        LIRC support for the PulseAudio sound server
@ -181,13 +181,6 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 JACK sink and source modules for the PulseAudio sound server.
 %endif

-%package module-gconf
-Summary:        GConf support for the PulseAudio sound server
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-%description module-gconf
-GConf configuration backend for the PulseAudio sound server.
-
 %package module-gsettings
 Summary:        Gsettings support for the PulseAudio sound server
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@ -231,6 +224,19 @@ Obsoletes:      pulseaudio-utils < 3.0-3
 %description utils
 This package contains command line utilities for the PulseAudio sound server.

+%if 0%{?gdm_hooks}
+%package gdm-hooks
+Summary:        PulseAudio GDM integration
+License:        LGPLv2+
+Requires:       gdm >= 1:2.22.0
+# for the gdm user
+Requires(pre):  gdm
+
+%description gdm-hooks
+This package contains GDM integration hooks for the PulseAudio sound server.
+%endif
+
+
 %prep
 %setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}

@ -242,8 +248,6 @@ This package contains command line utilities for the PulseAudio sound server.
 %if 0%{?systemd}
 %patch206 -p1 -b .autospawn_disable
 %endif
-%patch301 -p1 -b .301
-%patch302 -p1 -b .302

 sed -i.no_consolekit -e \
  's/^load-module module-console-kit/#load-module module-console-kit/' \
@ -253,9 +257,6 @@ sed -i.no_consolekit -e \
 # fixup PACKAGE_VERSION that leaks into pkgconfig files and friends
 sed -i.PACKAGE_VERSION -e "s|^PACKAGE_VERSION=.*|PACKAGE_VERSION=\'%{version}\'|" configure
 %else
-## kill rpaths
-# needed for (at least) patch18
-NOCONFIGURE=1 ./bootstrap.sh

 #if "%{_libdir}" != "/usr/lib"
 #sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@ -264,58 +265,44 @@ NOCONFIGURE=1 ./bootstrap.sh


 %build
-%configure \
-  --disable-silent-rules \
-  --disable-static \
-  --disable-rpath \
-  --with-system-user=pulse \
-  --with-system-group=pulse \
-  --with-access-group=pulse-access \
-  --disable-oss-output \
-  %{?enable_jack:--enable-jack}%{!?enable_jack:--disable-jack} \
-  %{?enable_lirc:--enable-lirc}%{!?enable_lirc:--disable-lirc} \
-  --disable-tcpwrap \
-  --disable-bluez4 \
-  --enable-bluez5 \
-  --enable-gconf \
-  --enable-gsettings \
-%ifarch %{arm}
-  --disable-neon-opt \
-%endif
+%meson \
+  -D system_user=pulse \
+  -D system_group=pulse \
+  -D access_group=pulse-access \
+  -D oss-output=disabled \
+  %{?enable_jack:-D jack=enabled}%{!?enable_jack:-D jack=disabled} \
+  %{?enable_lirc:-D lirc=enabled}%{!?enable_lirc:-D lirc=disabled} \
+  -D tcpwrap=disabled \
+  -D bluez5=enabled \
+  -D gstreamer=enabled \
+  -D bluez5-gstreamer=enabled \
+  -D gsettings=enabled \
+  -D elogind=disabled \
+  -D valgrind=disabled \
+  -D gtk=disabled \
+  %{?fedora:-D soxr=enabled}%{!?fedora:-D soxr=disabled} \
 %if 0%{?with_webrtc}
-  --enable-webrtc-aec \
+  -D webrtc-aec=enabled \
 %endif
-  %{!?systemd:--disable-systemd-daemon} \
-  %{?tests:--enable-tests}
+  %{?systemd:-D systemd=enabled}%{!?systemd:-D systemd=disabled} \
+  %{?tests:-D tests=true}%{!?tests:-D tests=false}

 # we really should preopen here --preopen-mods=module-udev-detect.la, --force-preopen
-%make_build V=1
-
-make doxygen
+%meson_build

+%meson_build doxygen

 %install
-%make_install
-
-## padsp multilib hack alert
-%ifarch %{multilib_archs}
-pushd %{buildroot}%{_bindir}
-# make 32 bit version available as padsp-32
-# %%{_libdir} == /usr/lib may be a naive check for 32bit-ness
-# but should be the only case we care about here -- rex
-%if "%{_libdir}" == "/usr/lib"
-ln -s padsp padsp-32
-%else
-cp -a padsp padsp-32
-sed -i -e "s|%{_libdir}/pulseaudio/libpulsedsp.so|/usr/lib/pulseaudio/libpulsedsp.so|g" padsp-32
-%endif
-popd
-%endif
+%meson_install

 # upstream should use udev.pc
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d
 mv -fv $RPM_BUILD_ROOT/lib/udev/rules.d/90-pulseaudio.rules $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d

+%if 0%{?gdm_hooks}
+install -p -m644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse/default.pa
+%endif
+
 ## unpackaged files
 # extraneous libtool crud
 rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
@ -334,11 +321,11 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/pulse-%{pa_major}/modules/module-detect.so
 # FIXME: s390x FAIL: core-util-test
 %global tests_nonfatal 1
 %endif
-%if 0%{?fedora}  || 0%{?rhel} > 7
+%if 0%{?fedora} > 27
 # regression'ish failures on rawhide, not worth failing build (for now) -- rex
 %global tests_nonfatal 1
 %endif
-%make_build check || TESTS_ERROR=$?
+%meson_test || TESTS_ERROR=$?
 if [ "${TESTS_ERROR}" != "" ]; then
 cat src/test-suite.log
 %{!?tests_nonfatal:exit $TESTS_ERROR}
@ -370,14 +357,18 @@ exit 0
 %{?ldconfig}
 %if 0%{?systemd}
 # unsure if we want both .socket and .service here (or only socket)
-# play it safe and do both for now -- rex
+# test socket-only on f31+ -- rex
+%if 0%{?fedora} < 31
 %systemd_user_post pulseaudio.service
+%endif
 %systemd_user_post pulseaudio.socket
 %endif

 %if 0%{?systemd}
 %preun
+%if 0%{?fedora} < 31
 %systemd_user_preun pulseaudio.service
+%endif
 %systemd_user_preun pulseaudio.socket
 %endif

@ -398,7 +389,7 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/pulse/default.pa
 %config(noreplace) %{_sysconfdir}/pulse/system.pa
 %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf
-%{bash_completionsdir}/*
+%{bash_completionsdir}/pulseaudio
 %if 0%{?systemd}
 %{_userunitdir}/pulseaudio.service
 %{_userunitdir}/pulseaudio.socket
@ -411,7 +402,6 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || :
 %{_libdir}/pulse-%{pa_major}/modules/libalsa-util.so
 %{_libdir}/pulse-%{pa_major}/modules/libcli.so
 %{_libdir}/pulse-%{pa_major}/modules/libprotocol-cli.so
-%{_libdir}/pulse-%{pa_major}/modules/libprotocol-esound.so
 %{_libdir}/pulse-%{pa_major}/modules/libprotocol-http.so
 %{_libdir}/pulse-%{pa_major}/modules/libprotocol-native.so
 %{_libdir}/pulse-%{pa_major}/modules/libprotocol-simple.so
@ -433,11 +423,6 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || :
 %{_libdir}/pulse-%{pa_major}/modules/module-filter-heuristics.so
 %{_libdir}/pulse-%{pa_major}/modules/module-device-manager.so
 %{_libdir}/pulse-%{pa_major}/modules/module-loopback.so
-%{_libdir}/pulse-%{pa_major}/modules/module-esound-compat-spawnfd.so
-%{_libdir}/pulse-%{pa_major}/modules/module-esound-compat-spawnpid.so
-%{_libdir}/pulse-%{pa_major}/modules/module-esound-protocol-tcp.so
-%{_libdir}/pulse-%{pa_major}/modules/module-esound-protocol-unix.so
-%{_libdir}/pulse-%{pa_major}/modules/module-esound-sink.so
 %{_libdir}/pulse-%{pa_major}/modules/module-udev-detect.so
 %{_libdir}/pulse-%{pa_major}/modules/module-hal-detect.so
 %{_libdir}/pulse-%{pa_major}/modules/module-http-protocol-tcp.so
@ -506,17 +491,15 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || :
 %{_bindir}/qpaeq
 %{_libdir}/pulse-%{pa_major}/modules/module-equalizer-sink.so

-%files esound-compat
-%{_bindir}/esdcompat
-%{_mandir}/man1/esdcompat.1.gz
-
 %if 0%{?enable_lirc}
 %files module-lirc
 %{_libdir}/pulse-%{pa_major}/modules/module-lirc.so
 %endif

 %files module-x11
-%{_sysconfdir}/xdg/autostart/pulseaudio.desktop
+%config(noreplace) %{_sysconfdir}/xdg/autostart/pulseaudio.desktop
+%config(noreplace) %{_sysconfdir}/xdg/Xwayland-session.d/00-pulseaudio-x11
+%{_userunitdir}/pulseaudio-x11.service
 #{_bindir}/start-pulseaudio-kde
 %{_bindir}/start-pulseaudio-x11
 %{_libdir}/pulse-%{pa_major}/modules/module-x11-bell.so
@ -547,10 +530,6 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || :
 %{_libdir}/pulse-%{pa_major}/modules/module-bluetooth-discover.so
 %{_libdir}/pulse-%{pa_major}/modules/module-bluetooth-policy.so

-%files module-gconf
-%{_libdir}/pulse-%{pa_major}/modules/module-gconf.so
-%{_libexecdir}/pulse/gconf-helper
-
 %files module-gsettings
 %{_libdir}/pulse-%{pa_major}/modules/module-gsettings.so
 %{_libexecdir}/pulse/gsettings-helper
@ -560,14 +539,14 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || :
 %ldconfig_scriptlets libs

 %files libs -f %{name}.lang
-%doc README LICENSE GPL LGPL
+%doc README
+%license LICENSE GPL LGPL
 %dir %{_sysconfdir}/pulse/
 %config(noreplace) %{_sysconfdir}/pulse/client.conf
 %{_libdir}/libpulse.so.0*
 %{_libdir}/libpulse-simple.so.0*
 %dir %{_libdir}/pulseaudio/
 %{_libdir}/pulseaudio/libpulsecommon-%{pa_major}.so
-%{_libdir}/pulseaudio/libpulsedsp.so

 %ldconfig_scriptlets libs-glib2

@ -575,7 +554,7 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || :
 %{_libdir}/libpulse-mainloop-glib.so.0*

 %files libs-devel
-%doc doxygen/html
+%doc %{_vpath_builddir}/doxygen/html
 %{_includedir}/pulse/
 %{_libdir}/libpulse.so
 %{_libdir}/libpulse-mainloop-glib.so
@ -602,63 +581,186 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || :
 %{_bindir}/pamon
 %{_bindir}/parecord
 %{_bindir}/pax11publish
-%{_bindir}/padsp
-%ifarch %{multilib_archs}
-%{_bindir}/padsp-32
-%endif
 %{_bindir}/pasuspender
 %{_mandir}/man1/pacat.1*
 %{_mandir}/man1/pacmd.1*
 %{_mandir}/man1/pactl.1*
-%{_mandir}/man1/padsp.1*
 %{_mandir}/man1/pamon.1*
 %{_mandir}/man1/paplay.1*
 %{_mandir}/man1/parec.1*
 %{_mandir}/man1/parecord.1*
 %{_mandir}/man1/pasuspender.1*
 %{_mandir}/man1/pax11publish.1*
+%{bash_completionsdir}/pacat
+%{bash_completionsdir}/pacmd
+%{bash_completionsdir}/pactl
+%{bash_completionsdir}/padsp
+%{bash_completionsdir}/paplay
+%{bash_completionsdir}/parec
+%{bash_completionsdir}/parecord
+%{bash_completionsdir}/pasuspender
+
+%if 0%{?gdm_hooks}
+%files gdm-hooks
+%attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse
+%attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
+%endif
+

 %changelog
-* Fri Jun 17 2022 Wim Taymans <wtaymans@redhat.com> - 14.0-4
- Add patch to avoid bluez warning.
- Resolves: rhbz#1969944
+* Tue Dec 03 2024 Wim Taymans <wtaymans@redhat.com> - 15.0-3
+- Rebuild for autostart fix
+  Resolves: RHEL-40601

-* Thu May 12 2022 Wim Taymans <wtaymans@redhat.com> - 14.0-3
- Add patch for profile switching
- Resolves: rhbz#2052011. rhbz#2073877
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 15.0-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Wed Feb 03 2021 Wim Taymans <wtaymans@redhat.com> - 14.0-2
- Add pulseaudio-daemon' Provides + Conflicts only on fedora
- Resolves: rhbz#1924094
+* Wed Jul 28 2021 Wim Taymans <wtaymans@redhat.com> - 15.0-1
+- Update to 15.0
+- convert to meson build
+- esound, gconf, oss are no longer supported
+- Resolves: rhbz#1961581

-* Thu Dec 10 2020 Wim Taymans <wtaymans@redhat.com> - 14.0-1
- Update to 14.0
- Add pulseaudio-daemon' Provides + Conflicts to support
-  swapping with PipeWire
- Resolves: rhbz#1906322
+* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 14.2-5
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065

-* Mon May 11 2020 Wim Taymans <wtaymans@redhat.com> - 13.99.1-1
- Update to 13.99.1
- Resolves: rhbz#1817378
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 14.2-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

-* 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
+* Sat Feb 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 14.2-3
+- -utils: move appropriate bash completions here (#1925706)

-* Tue Sep 04 2018 Wim Taymans <wtaymans@redhat.com> - 11.1-22
- Use python3 version of qt5
- Resolves: rhbz#1591134
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 14.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

-* Mon Sep 03 2018 Wim Taymans <wtaymans@redhat.com> - 11.1-21
- Fix port to qt5.
- Resolves: rhbz#1591134
+* Mon Jan 18 2021 Rex Dieter <rdieter@fedoraproject.org> - 14.2-1
+- 14.2

-* Fri Jul 13 2018 Petr Viktorin <pviktori@redhat.com> - 11.1-20
- Fix dbus-python dependency
+* Wed Jan 13 2021 Rex Dieter <rdieter@fedoraproject.org> - 14.1-1
+- 14.1

-* Fri Jun 22 2018 Than Ngo <than@redhat.com> - 11.1-19
- fixed bz#1580853, FTBFS
+* Tue Jan 12 2021 Wim Taymans <wtaymans@redhat.com> - 14.0-3
+- Move enable_ switches next to the other switches on top
+- Only enable gconf on fedora
+
+* Tue Nov 24 2020 Neal Gompa <ngompa13@gmail.com> - 14.0-2
+- Add 'pulseaudio-daemon' Provides + Conflicts to support swapping with PipeWire
+
+* Mon Nov 23 2020 Rex Dieter <rdieter@fedoraproject.org> - 14.0-1
+- 14.0
+
+* Sun Nov 01 2020 Rex Dieter <rdieter@fedoraproject.org> - 13.99.3-1
+- 13.99.3
+
+* Tue Sep 22 2020 Rex Dieter <rdieter@fedoraproject.org> - 13.99.2-1
+-  13.99.2
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 13.99.1-6
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 13.99.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 15 2020 Wim Taymans <wtaymans@redhat.com> - 13.99.1-4
+- Add patch to fix crash with profile name (#1817092)
+
+* Tue Mar 31 2020 Wim Taymans <wtaymans@redhat.com> - 13.99.1-3
+- Add more UCM patches (#1818883)
+
+* Fri Mar 20 2020 Wim Taymans <wtaymans@redhat.com> - 13.99.1-2
+- Add some more UCM patches
+- Fix missing UCM mixers crash (#1815437)
+
+* Fri Feb 14 2020 Rex Dieter <rdieter@fedoraproject.org> - 13.99.1-1
+- 13.99.1
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 13.0-3.20200105gitf5d36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* 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
+
+* Mon Sep 02 2019 Rex Dieter <rdieter@fedoraproject.org> - 12.99.3-1
+- pulseaudio-12.99.3
+
+* Wed Aug 07 2019 Rex Dieter <rdieter@fedoraproject.org> - 12.99.2-2
+- -qpaeq: use python3 (#1738047)
+
+* Tue Aug 06 2019 Rex Dieter <rdieter@fedoraproject.org> - 12.99.2-1
+- pulseaudio-12.99.2
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 12.99.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jul 09 2019 Rex Dieter <rdieter@fedoraproject.org> - 12.99.1-1
+- pulseaudio-12.99.1
+
+* Wed Jul 03 2019 Rex Dieter <rdieter@fedoraproject.org> - 12.2-7
+- alsa-sink: clear pollfd revents before poll
+
+* Mon Jun 17 2019 Rex Dieter <rdieter@fedoraproject.org> - 12.2-6
+- pull in upstream patch for alsa include paths
+
+* Thu May 09 2019 Rex Dieter <rdieter@fedoraproject.org> - 12.2-5
+- Use systemd presets to enable user units
+- conditionals: simplify and support rhel8
+
+* Wed Apr 10 2019 Rex Dieter <rdieter@fedoraproject.org> - 12.2-4
+- test using only socket activation (f31+ only for now)
+
+* Tue Feb 12 2019 Rex Dieter <rdieter@fedoraproject.org> - 12.2-3
+- qpaeq_python2.patch
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 12.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jul 16 2018 Rex Dieter <rdieter@fedoraproject.org> - 12.2-1
+- pulseaudio-12.2
+
+* Sat Jul 14 2018 Rex Dieter <rdieter@fedoraproject.org> - 12.1-1
+- pulseaudio-12.1
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 12.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jul 05 2018 Rex Dieter <rdieter@fedoraproject.org> - 12.0-3
+- ladspa-sink-fix-search-path.patch (#1594568, fdo#107078)
+
+* Sun Jul 01 2018 Rex Dieter <rdieter@fedoraproject.org> - 12.0-2
+- switch-on-port-available-ignore-bluetooth-cards.patch (#1594596, fdo#107044)
+- use upstreamed exit-idle-time.patch
+
+* Thu Jun 21 2018 Rex Dieter <rdieter@fedoraproject.org> - 12.0-1
+- pulseaudio-12.0 is available (#1593489)
+- -libs: use %%license
+
+* Sun May 13 2018 Rex Dieter <rdieter@fedoraproject.org> - 11.99.1-1
+- 11.99.1 (#1577603)
+- use %%ldconfig_scriptlets
+- new pulseaudio--module-gsettings subpkg
+
+* Tue May 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 11.1-21
+- drop unused getaffinity,memfd patches
+- include experimental bluetooth patches only on rawhide
+
+* Mon Apr 23 2018 Hans de Goede <hdegoede@redhat.com> - 11.1-20
+- Fix Intel LPE HDMI problems:
+- Update to upstream gitsnapshot which contains a fix for the crash caused
+  by patch93 (and contains patch93 fixing the Intel LPE HDMI pa crash)
+- Fix-realtime-scheduling-on-byt-cht.patch, Fix-Intel-HDMI-LPE-problems.patch:
+  drop both, both fixes are included in the git snapshot
+
+* Fri Mar 23 2018 Iryna Shcherbina <ishcherb@redhat.com> - 11.1-19
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)

 * Wed Mar 21 2018 Rex Dieter <rdieter@fedoraproject.org> - 11.1-18
 - manually package sockets.target.wants/pulseaudio.socket to help
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+SHA512 (pulseaudio-15.0.tar.xz) = 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
+SHA512 (pulseaudio-15.0.tar.xz.sha256sum) = 72cdf6741eaa5967082503a73feb69a09b131db12f43f57db777b771d3feb66bee7a397b3370cd44251802c23f006846fae97681b0b53f32ec21dd1b0de8c10f
				`@ -1 +0,0 @@`
				`c37a8551993ed045b3fa55176c9d1df4d2ed17a1 SOURCES/pulseaudio-14.0.tar.xz`
				`@ -1 +0,0 @@`
				`a834775d9382b055504e5ee7625dc50768daac29329531deb6597bf05e06c261 pulseaudio-14.0.tar.xz`