.gitignore

@@ -1 +1 @@
-SOURCES/pipewire-0.3.40.tar.gz
+SOURCES/pipewire-0.3.6.tar.gz

.pipewire.metadata

@@ -1 +1 @@
-20dbcf8cd6bb7151b3fd2871756ca2ad91f09f77 SOURCES/pipewire-0.3.40.tar.gz
+edbc897685e921dc6add83dee57e74e140294dcb SOURCES/pipewire-0.3.6.tar.gz

SOURCES/0001-conf-disable-bluez5.patch

@@ -0,0 +1,24 @@
+From 13945e27434951366960dd3a0461c58487df82a2 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Mon, 30 Mar 2020 15:32:04 +0200
+Subject: [PATCH] conf: disable bluez5
+
+Disable bluetooth handling by default to avoid causing
+conflicts with pulseaudio.
+---
+ src/daemon/pipewire.conf.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
+index 574cba4f..4ecec24f 100644
+--- a/src/daemon/pipewire.conf.in
++++ b/src/daemon/pipewire.conf.in
+@@ -71,4 +71,4 @@ create-object spa-node-factory factory.name=support.node.driver node.name=Dummy
+ # Execute the given program. This is usually used to start the
+ # session manager. run the session manager with -h for options
+ #
+-exec pipewire-media-session # -d alsa-seq,alsa-pcm,bluez5,metadata
++exec pipewire-media-session -d bluez5 # -d alsa-seq,alsa-pcm,metadata
+-- 
+2.26.2
+

SOURCES/pipewire-jack-allow-old-meson.patch

@@ -1,58 +0,0 @@
-From dda2edc0641b57cd0315806a746c787e2c40cefb Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Mon, 15 Nov 2021 10:57:22 +0100
-Subject: [PATCH] jack: allow build on old meson of jack.pc
-
-Warn about reduced functionality.
----
- pipewire-jack/src/meson.build | 31 +++++++++++++++++++------------
- 1 file changed, 19 insertions(+), 12 deletions(-)
-
-diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build
-index cdc147ba4..3709070e1 100644
---- a/pipewire-jack/src/meson.build
-+++ b/pipewire-jack/src/meson.build
-@@ -71,21 +71,28 @@ pipewire_jackserver = shared_library('jacknet',
- 
- if get_option('jack-devel') == true
-   if meson.version().version_compare('<0.59.0')
--    error(
-+    warning(
-           '''
--          Before version 0.59.0 Meson creates a wrong jack pkg-config file.
--          For that reason this is now an error. Please update Meson,
--          if you want to have JACK development files.
-+          Before version 0.59.0 Meson creates a wrong jack pkg-config file
-+	  for server development. Please update Meson, if you want to have
-+	  JACK development files for server.
-           ''')
-+    pkgconfig.generate(filebase : 'jack',
-+    libraries : [pipewire_jack, pipewire_jackserver],
-+    name : 'jack',
-+    description : 'PipeWire JACK API',
-+    version : '1.9.17',
-+    extra_cflags : '-D_REENTRANT',
-+    variables: ['server_libs=-L${libdir} -ljackserver'])
-+  else
-+    pkgconfig.generate(filebase : 'jack',
-+    libraries : [pipewire_jack, pipewire_jackserver],
-+    name : 'jack',
-+    description : 'PipeWire JACK API',
-+    version : '1.9.17',
-+    extra_cflags : '-D_REENTRANT',
-+    unescaped_variables: ['server_libs=-L${libdir} -ljackserver'])
-   endif
--
--  pkgconfig.generate(filebase : 'jack',
--  libraries : [pipewire_jack, pipewire_jackserver],
--  name : 'jack',
--  description : 'PipeWire JACK API',
--  version : '1.9.17',
--  extra_cflags : '-D_REENTRANT',
--  unescaped_variables: ['server_libs=-L${libdir} -ljackserver'])
- endif
- 
- if sdl_dep.found()
--- 
-GitLab
-

SPECS/pipewire.spec

@@ -1,18 +1,10 @@
-%global majorversion 0
-%global minorversion 3
-%global microversion 40
-
 %global apiversion   0.3
 %global spaversion   0.2
-%global soversion    0
-%global libversion   %{soversion}.%(bash -c '((intversion = (%{minorversion} * 100) + %{microversion})); echo ${intversion}').0
 
-# For rpmdev-bumpspec and releng automation
+#global snap       20141103
-%global baserelease 1
+#global gitrel     327
-
+#global gitcommit  aec811798cd883a454b9b5cd82c77831906bbd2d
-#global snapdate   20210107
+#global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
-#global gitcommit  b17db2cebc1a5ab2c01851d29c05f79cd2f262bb
-#global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
 
 # https://bugzilla.redhat.com/983606
 %global _hardened_build 1
@@ -20,44 +12,36 @@
 # where/how to apply multilib hacks
 %global multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9 ppc64le
 
-# Build conditions for various features
+%global enable_alsa 1
-%bcond_without alsa
-%bcond_without vulkan
-%bcond_without v4l2
 
-# Features disabled for RHEL 8
+%if 0%{?fedora}
-%if 0%{?rhel} && 0%{?rhel} < 9
+%global enable_jack 1
-%bcond_with pulse
+%global enable_pulse 1
-%bcond_with jack
+%global enable_vulkan 1
-%else
-%bcond_without pulse
-%bcond_without jack
 %endif
 
-# Features disabled for RHEL
+# libpulse and libjack subpackages shouldn't have library provides
-%if 0%{?rhel}
+# as the files they ship are not in the linker path. We also have
-%bcond_with jackserver_plugin
+# to exclude requires or else the subpackages wind up requiring the
-%else
+# libs they're no longer providing
-%bcond_without jackserver_plugin
+# FIXME: the jack-audio-connection-kit and pulseaudio subpackages
-%endif
+# should get the auto-generated Provides: instead, but they do not,
-
+# either with or without the lines below, not sure how to fix that
-# Disabled for RHEL < 10 and Fedora < 36
+%global __provides_exclude_from ^%{_libdir}/pipewire-%{apiversion}/.*$
-%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?fedora} && 0%{?fedora} < 36)
+%global __requires_exclude_from ^%{_libdir}/pipewire-%{apiversion}/.*$
-%bcond_with libcamera_plugin
-%else
-%bcond_without libcamera_plugin
-%endif
 
 Name:           pipewire
 Summary:        Media Sharing Server
-Version:        %{majorversion}.%{minorversion}.%{microversion}
+Version:        0.3.6
-Release:        %{baserelease}%{?snapdate:.%{snapdate}git%{shortcommit}}%{?dist}
+Release:        1%{?snap:.%{snap}git%{shortcommit}}%{?dist}
 License:        MIT
 URL:            https://pipewire.org/
-%if 0%{?snapdate}
+%if 0%{?gitrel}
-Source0:        https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{gitcommit}/pipewire-%{shortcommit}.tar.gz
+# git clone git://anongit.freedesktop.org/gstreamer/pipewire
+# cd pipewire; git reset --hard %{gitcommit}; ./autogen.sh; make; make distcheck
+Source0:        pipewire-%{version}-%{gitrel}-g%{shortcommit}.tar.gz
 %else
-Source0:        https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/pipewire-%{version}.tar.gz
+Source0:	https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/pipewire-%{version}.tar.gz
 %endif
 
 ## upstream patches
@@ -65,16 +49,10 @@ Source0:        https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{ver
 ## upstreamable patches
 
 ## fedora patches
+Patch0:		0001-conf-disable-bluez5.patch
 
-## rhel patches
-### Allow Meson < 0.59.0 to work for pipewire-jack
-### N.B.: Remove this patch once Meson is upgraded in RHEL
-Patch50001:     pipewire-jack-allow-old-meson.patch
-
-BuildRequires:  gettext
 BuildRequires:  meson >= 0.49.0
 BuildRequires:  gcc
-BuildRequires:  g++
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(dbus-1)
@@ -85,39 +63,29 @@ BuildRequires:  pkgconfig(gstreamer-base-1.0) >= 1.10.0
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0) >= 1.10.0
 BuildRequires:  pkgconfig(gstreamer-net-1.0) >= 1.10.0
 BuildRequires:  pkgconfig(gstreamer-allocators-1.0) >= 1.10.0
-# libldac is not built on x390x, see rhbz#1677491
+%if 0%{?enable_vulkan}
-%ifnarch s390x
-BuildRequires:  pkgconfig(ldacBT-enc)
-BuildRequires:  pkgconfig(ldacBT-abr)
-%endif
-BuildRequires:  pkgconfig(fdk-aac)
-%if %{with vulkan}
 BuildRequires:  pkgconfig(vulkan)
 %endif
 BuildRequires:  pkgconfig(bluez)
-BuildRequires:  systemd-devel
+BuildRequires:  systemd-devel >= 184
 BuildRequires:  alsa-lib-devel
 BuildRequires:  libv4l-devel
 BuildRequires:  doxygen
-BuildRequires:  python-docutils
+BuildRequires:  xmltoman
 BuildRequires:  graphviz
 BuildRequires:  sbc-devel
 BuildRequires:  libsndfile-devel
-BuildRequires:  ncurses-devel
-BuildRequires:  pulseaudio-libs-devel
-BuildRequires:  avahi-devel
-BuildRequires:  pkgconfig(webrtc-audio-processing) >= 0.2
-BuildRequires:  libusb-devel
-BuildRequires:  readline-devel
 
 Requires(pre):  shadow-utils
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-Requires:       systemd
+Requires:       systemd >= 184
 Requires:       rtkit
-# A virtual Provides so we can swap session managers
+
-Requires:       pipewire-session-manager
+# https://bugzilla.redhat.com/983606
-# Prefer WirePlumber for session manager
+%global _hardened_build 1
-Suggests:       wireplumber
+
+## enable systemd activation
+%global systemd 1
 
 %description
 PipeWire is a multimedia server for Linux and other Unix like operating
@@ -127,7 +95,6 @@ systems.
 Summary:        Libraries for PipeWire clients
 License:        MIT
 Recommends:     %{name}%{?_isa} = %{version}-%{release}
-Obsoletes:      %{name}-libpulse < %{version}-%{release}
 
 %description libs
 This package contains the runtime libraries for any application that wishes
@@ -137,7 +104,6 @@ to interface with a PipeWire media server.
 Summary:        GStreamer elements for PipeWire
 License:        MIT
 Recommends:     %{name}%{?_isa} = %{version}-%{release}
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description gstreamer
 This package contains GStreamer elements to interface with a
@@ -167,64 +133,44 @@ Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 %description utils
 This package contains command line utilities for the PipeWire media server.
 
-%if %{with alsa}
+%if 0%{?enable_alsa}
 %package alsa
 Summary:        PipeWire media server ALSA support
 License:        MIT
 Recommends:     %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-%if ! (0%{?fedora} && 0%{?fedora} < 34)
-# Ensure this is provided by default to route all audio
-Supplements:    %{name} = %{version}-%{release}
-# Replace PulseAudio and JACK ALSA plugins with PipeWire
-## N.B.: If alsa-plugins gets updated in F33, this will need to be bumped
-Obsoletes:      alsa-plugins-jack < 1.2.2-5
-Obsoletes:      alsa-plugins-pulseaudio < 1.2.2-5
-%endif
 
 %description alsa
 This package contains an ALSA plugin for the PipeWire media server.
 %endif
 
-%if %{with jack}
+%if 0%{?enable_jack}
+%package libjack
+Summary:        PipeWire libjack library
+License:        MIT
+Recommends:     %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+BuildRequires:  jack-audio-connection-kit-devel >= 1.9.10
+# Renamed in F32
+Obsoletes:      pipewire-jack < 0.2.96-2
+
+%description libjack
+This package contains a PipeWire replacement for JACK audio connection kit
+"libjack" library.
+
 %package jack-audio-connection-kit
 Summary:        PipeWire JACK implementation
 License:        MIT
 Recommends:     %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libjack%{?_isa} = %{version}-%{release}
+BuildRequires:  jack-audio-connection-kit-devel >= 1.9.10
 Conflicts:      jack-audio-connection-kit
 Conflicts:      jack-audio-connection-kit-dbus
-# Fixed jack subpackages
+Provides:       jack-audio-connection-kit
-Conflicts:      %{name}-libjack < 0.3.13-6
-Conflicts:      %{name}-jack-audio-connection-kit < 0.3.13-6
-# Replaces libjack subpackage
-Obsoletes:      %{name}-libjack < 0.3.19-2
-Provides:       %{name}-libjack = %{version}-%{release}
-Provides:       %{name}-libjack%{?_isa} = %{version}-%{release}
-%if ! (0%{?fedora} && 0%{?fedora} < 34)
-# Ensure this is provided by default to route all audio
-Supplements:    %{name} = %{version}-%{release}
-# Replace JACK with PipeWire-JACK
-## N.B.: If jack gets updated in F33, this will need to be bumped
-Obsoletes:      jack-audio-connection-kit < 1.9.16-2
-%endif
 
 %description jack-audio-connection-kit
 This package provides a JACK implementation based on PipeWire
 
-%package jack-audio-connection-kit-devel
-Summary:        Development files for %{name}-jack-audio-connection-kit
-License:        MIT
-Requires:       %{name}-jack-audio-connection-kit%{?_isa} = %{version}-%{release}
-Conflicts:      jack-audio-connection-kit-devel
-Enhances:       %{name}-jack-audio-connection-kit
-
-%description jack-audio-connection-kit-devel
-This package provides development files for building JACK applications
-using PipeWire's JACK library.
-%endif
-
-%if %{with jackserver_plugin}
 %package plugin-jack
 Summary:        PipeWire media server JACK support
 License:        MIT
@@ -237,104 +183,69 @@ Requires:       jack-audio-connection-kit
 This package contains the PipeWire spa plugin to connect to a JACK server.
 %endif
 
-%if %{with libcamera_plugin}
+%if 0%{?enable_pulse}
-%package plugin-libcamera
+%package libpulse
-Summary:        PipeWire media server libcamera support
+Summary:        PipeWire libpulse library
 License:        MIT
-BuildRequires:  libcamera-devel
-BuildRequires:  libdrm-devel
 Recommends:     %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-Requires:       libcamera
+BuildRequires:  pulseaudio-libs-devel
-Requires:       libdrm
+# Renamed in F32
+Obsoletes:      pipewire-pulseaudio < 0.2.96-2
 
-%description plugin-libcamera
+%description libpulse
-This package contains the PipeWire spa plugin to access cameras through libcamera.
+This package contains a PipeWire replacement for PulseAudio "libpulse" library.
-%endif
 
-%if %{with pulse}
 %package pulseaudio
 Summary:        PipeWire PulseAudio implementation
 License:        MIT
 Recommends:     %{name}%{?_isa} = %{version}-%{release}
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libpulse%{?_isa} = %{version}-%{release}
-BuildRequires:  pulseaudio-libs
+BuildRequires:  pulseaudio-libs-devel
-Conflicts:      pulseaudio
+Conflicts:      pulseaudio-libs
-# Fixed pulseaudio subpackages
+Conflicts:      pulseaudio-libs-glib2
-Conflicts:      %{name}-libpulse < 0.3.13-6
+Provides:       pulseaudio-libs
-Conflicts:      %{name}-pulseaudio < 0.3.13-6
+Provides:       pulseaudio-libs-glib2
-%if ! (0%{?fedora} && 0%{?fedora} < 34)
-# Ensure this is provided by default to route all audio
-Supplements:    %{name} = %{version}-%{release}
-# Replace PulseAudio with PipeWire-PulseAudio
-## N.B.: If pulseaudio gets updated in F33, this will need to be bumped
-Obsoletes:      pulseaudio < 14.2-3
-Obsoletes:      pulseaudio-esound-compat < 14.2-3
-Obsoletes:      pulseaudio-module-bluetooth < 14.2-3
-Obsoletes:      pulseaudio-module-gconf < 14.2-3
-Obsoletes:      pulseaudio-module-gsettings < 14.2-3
-Obsoletes:      pulseaudio-module-jack < 14.2-3
-Obsoletes:      pulseaudio-module-lirc < 14.2-3
-Obsoletes:      pulseaudio-module-x11 < 14.2-3
-Obsoletes:      pulseaudio-module-zeroconf < 14.2-3
-Obsoletes:      pulseaudio-qpaeq < 14.2-3
-%endif
-
-# Virtual Provides to support swapping between PipeWire-PA and PA
-Provides:       pulseaudio-daemon
-Conflicts:      pulseaudio-daemon
-Provides:       pulseaudio-module-bluetooth
-Provides:       pulseaudio-module-jack
 
 %description pulseaudio
 This package provides a PulseAudio implementation based on PipeWire
 %endif
 
-%if %{with v4l2}
-%package v4l2
-Summary:        PipeWire media server v4l2 LD_PRELOAD support
-License:        MIT
-Recommends:     %{name}%{?_isa} = %{version}-%{release}
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-
-%description v4l2
-This package contains an LD_PRELOAD library that redirects v4l2 applications to
-PipeWire.
-%endif
-
 %prep
-%autosetup -p1 %{?snapdate:-n %{name}-%{gitcommit}}
+%setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
+
+%patch0 -p1 -b .0000
 
 %build
 %meson \
-    -D docs=enabled -D man=enabled -D gstreamer=enabled -D systemd=enabled	\
+    -D docs=true -D man=true -D gstreamer=true -D systemd=true 		\
-    -D gstreamer-device-provider=disabled -D sdl2=disabled 			\
+    %{!?enable_jack:-D jack=false -D pipewire-jack=false} 		\
-    -D audiotestsrc=disabled -D videotestsrc=disabled				\
+    %{!?enable_pulse:-D pipewire-pulseaudio=false}			\
-    -D volume=disabled -D bluez5-codec-aptx=disabled -D roc=disabled 		\
+    %{!?enable_alsa:-D pipewire-alsa=false}				\
-%ifarch s390x
+    %{!?enable_vulkan:-D vulkan=false}
-    -D bluez5-codec-ldac=disabled						\
-%endif
-    %{!?with_media_session:-D session-managers=[]} 				\
-    %{!?with_jack:-D pipewire-jack=disabled} 					\
-    %{!?with_jackserver_plugin:-D jack=disabled} 				\
-    %{!?with_libcamera_plugin:-D libcamera=disabled} 				\
-    %{?with_jack:-D jack-devel=true} 						\
-    %{!?with_alsa:-D pipewire-alsa=disabled}					\
-    %{?with_vulkan:-D vulkan=enabled}
-%meson_build
 
 %install
 %meson_install
 
-%if %{with jack}
+mkdir %{buildroot}%{_userunitdir}/sockets.target.wants
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
+ln -s ../pipewire.socket %{buildroot}%{_userunitdir}/sockets.target.wants/pipewire.socket
-echo %{_libdir}/pipewire-%{apiversion}/jack/ > %{buildroot}%{_sysconfdir}/ld.so.conf.d/pipewire-jack-%{_arch}.conf
-%else
-rm %{buildroot}%{_datadir}/pipewire/jack.conf
 
+%if 0%{?enable_jack}
+ln -s pipewire-%{apiversion}/jack/libjack.so.0 %{buildroot}%{_libdir}/libjack.so.0.1.0
+ln -s libjack.so.0.1.0 %{buildroot}%{_libdir}/libjack.so.0
+ln -s pipewire-%{apiversion}/jack/libjackserver.so.0 %{buildroot}%{_libdir}/libjackserver.so.0.1.0
+ln -s libjackserver.so.0.1.0 %{buildroot}%{_libdir}/libjackserver.so.0
+ln -s pipewire-%{apiversion}/jack/libjacknet.so.0 %{buildroot}%{_libdir}/libjacknet.so.0.1.0
+ln -s libjacknet.so.0.1.0 %{buildroot}%{_libdir}/libjacknet.so.0
 %endif
 
-%if %{with alsa}
+%if 0%{?enable_pulse}
+ln -s pipewire-%{apiversion}/pulse/libpulse.so.0 %{buildroot}%{_libdir}/libpulse.so.0
+ln -s pipewire-%{apiversion}/pulse/libpulse-simple.so.0 %{buildroot}%{_libdir}/libpulse-simple.so.0
+ln -s pipewire-%{apiversion}/pulse/libpulse-mainloop-glib.so.0 %{buildroot}%{_libdir}/libpulse-mainloop-glib.so.0
+%endif
+
+%if 0%{?enable_alsa}
 mkdir -p %{buildroot}%{_sysconfdir}/alsa/conf.d/
 cp %{buildroot}%{_datadir}/alsa/alsa.conf.d/50-pipewire.conf \
         %{buildroot}%{_sysconfdir}/alsa/conf.d/50-pipewire.conf
@@ -342,21 +253,11 @@ cp %{buildroot}%{_datadir}/alsa/alsa.conf.d/99-pipewire-default.conf \
         %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pipewire-default.conf
 %endif
 
-%if ! %{with pulse}
-# If the PulseAudio replacement isn't being offered, delete the files
-rm %{buildroot}%{_bindir}/pipewire-pulse
-rm %{buildroot}%{_userunitdir}/pipewire-pulse.*
-rm %{buildroot}%{_datadir}/pipewire/pipewire-pulse.conf
-%endif
-
-%find_lang %{name}
-
-# upstream should use udev.pc
-mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d
-mv -fv %{buildroot}/lib/udev/rules.d/90-pipewire-alsa.rules %{buildroot}%{_prefix}/lib/udev/rules.d
-
-
 %check
+%ifarch s390x
+# FIXME: s390x FAIL: pw-test-stream, pw-test-endpoint
+%global tests_nonfatal 1
+%endif
 %meson_test || TESTS_ERROR=$?
 if [ "${TESTS_ERROR}" != "" ]; then
 echo "test failed"
@@ -369,45 +270,27 @@ getent passwd pipewire >/dev/null || \
     useradd -r -g pipewire -d %{_localstatedir}/run/pipewire -s /sbin/nologin -c "PipeWire System Daemon" pipewire
 exit 0
 
-%post
+%ldconfig_scriptlets libs
-%systemd_user_post pipewire.service
-%systemd_user_post pipewire.socket
-
-%triggerun -- %{name} < 0.3.6-2
-# This is for upgrades from previous versions which had a static symlink.
-# The %%post scriptlet above only does anything on initial package installation.
-# Remove before F33.
-systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
-
-%if %{with pulse}
-%post pulseaudio
-%systemd_user_post pipewire-pulse.service
-%systemd_user_post pipewire-pulse.socket
-%endif
 
 %files
 %license LICENSE COPYING
 %doc README.md
+%if 0%{?systemd}
 %{_userunitdir}/pipewire.*
+%{_userunitdir}/sockets.target.wants/pipewire.socket
+%endif
 %{_bindir}/pipewire
+%{_bindir}/pipewire-media-session
 %{_mandir}/man1/pipewire.1*
-%dir %{_datadir}/pipewire/
+%dir %{_sysconfdir}/pipewire/
-%{_datadir}/pipewire/pipewire.conf
+%config(noreplace) %{_sysconfdir}/pipewire/pipewire.conf
-%{_datadir}/pipewire/filter-chain/*.conf
 %{_mandir}/man5/pipewire.conf.5*
 
-%files libs -f %{name}.lang
+%files libs
 %license LICENSE COPYING
 %doc README.md
 %{_libdir}/libpipewire-%{apiversion}.so.*
 %{_libdir}/pipewire-%{apiversion}/libpipewire-*.so
-%dir %{_datadir}/alsa-card-profile/
-%dir %{_datadir}/alsa-card-profile/mixer/
-%{_datadir}/alsa-card-profile/mixer/paths/
-%{_datadir}/alsa-card-profile/mixer/profile-sets/
-%dir %{_datadir}/spa-0.2/
-%{_datadir}/spa-0.2/bluez5/bluez-hardware.conf
-%{_prefix}/lib/udev/rules.d/90-pipewire-alsa.rules
 %dir %{_libdir}/spa-%{spaversion}
 %{_libdir}/spa-%{spaversion}/alsa/
 %{_libdir}/spa-%{spaversion}/audioconvert/
@@ -417,11 +300,9 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
 %{_libdir}/spa-%{spaversion}/support/
 %{_libdir}/spa-%{spaversion}/v4l2/
 %{_libdir}/spa-%{spaversion}/videoconvert/
-%if %{with vulkan}
+%if 0%{?enable_vulkan}
 %{_libdir}/spa-%{spaversion}/vulkan/
 %endif
-%{_datadir}/pipewire/client.conf
-%{_datadir}/pipewire/client-rt.conf
 
 %files gstreamer
 %{_libdir}/gstreamer-1.0/libgstpipewire.*
@@ -439,21 +320,15 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
 %files utils
 %{_bindir}/pw-mon
 %{_bindir}/pw-metadata
-%{_bindir}/pw-dsdplay
 %{_bindir}/pw-mididump
 %{_bindir}/pw-midiplay
 %{_bindir}/pw-midirecord
 %{_bindir}/pw-cli
 %{_bindir}/pw-dot
 %{_bindir}/pw-cat
-%{_bindir}/pw-dump
-%{_bindir}/pw-link
-%{_bindir}/pw-loopback
 %{_bindir}/pw-play
 %{_bindir}/pw-profiler
 %{_bindir}/pw-record
-%{_bindir}/pw-reserve
-%{_bindir}/pw-top
 %{_mandir}/man1/pw-mon.1*
 %{_mandir}/man1/pw-cli.1*
 %{_mandir}/man1/pw-cat.1*
@@ -462,380 +337,95 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
 %{_mandir}/man1/pw-mididump.1*
 %{_mandir}/man1/pw-profiler.1*
 
-%{_bindir}/spa-acp-tool
-%{_bindir}/spa-inspect
-%{_bindir}/spa-json-dump
 %{_bindir}/spa-monitor
-%{_bindir}/spa-resample
+%{_bindir}/spa-inspect
 
-%if %{with alsa}
+%if 0%{?enable_alsa}
 %files alsa
 %{_libdir}/alsa-lib/libasound_module_pcm_pipewire.so
-%{_libdir}/alsa-lib/libasound_module_ctl_pipewire.so
 %{_datadir}/alsa/alsa.conf.d/50-pipewire.conf
 %{_datadir}/alsa/alsa.conf.d/99-pipewire-default.conf
 %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-pipewire.conf
 %config(noreplace) %{_sysconfdir}/alsa/conf.d/99-pipewire-default.conf
 %endif
 
-%if %{with jack}
+%if 0%{?enable_jack}
-%files jack-audio-connection-kit
+%files libjack
+%{_libdir}/pipewire-%{apiversion}/jack/libjack.so*
+%{_libdir}/pipewire-%{apiversion}/jack/libjacknet.so*
+%{_libdir}/pipewire-%{apiversion}/jack/libjackserver.so*
 %{_bindir}/pw-jack
 %{_mandir}/man1/pw-jack.1*
-%{_libdir}/pipewire-%{apiversion}/jack/libjack.so.*
-%{_libdir}/pipewire-%{apiversion}/jack/libjacknet.so.*
-%{_libdir}/pipewire-%{apiversion}/jack/libjackserver.so.*
-%{_datadir}/pipewire/jack.conf
-%{_sysconfdir}/ld.so.conf.d/pipewire-jack-%{_arch}.conf
 
-%files jack-audio-connection-kit-devel
+%files jack-audio-connection-kit
-%{_includedir}/jack/
+%{_libdir}/libjack.so.*
-%{_libdir}/pipewire-%{apiversion}/jack/libjack.so
+%{_libdir}/libjackserver.so.*
-%{_libdir}/pipewire-%{apiversion}/jack/libjacknet.so
+%{_libdir}/libjacknet.so.*
-%{_libdir}/pipewire-%{apiversion}/jack/libjackserver.so
-%{_libdir}/pkgconfig/jack.pc
-%endif
 
-%if %{with jackserver_plugin}
 %files plugin-jack
 %{_libdir}/spa-%{spaversion}/jack/
 %endif
 
-%if %{with libcamera_plugin}
+%if 0%{?enable_pulse}
-%files plugin-libcamera
+%files libpulse
-%{_libdir}/spa-%{spaversion}/libcamera/
+%{_libdir}/pipewire-%{apiversion}/pulse/libpulse.so*
-%endif
+%{_libdir}/pipewire-%{apiversion}/pulse/libpulse-simple.so*
+%{_libdir}/pipewire-%{apiversion}/pulse/libpulse-mainloop-glib.so*
+%{_bindir}/pw-pulse
+%{_mandir}/man1/pw-pulse.1*
 
-%if %{with pulse}
 %files pulseaudio
-%{_bindir}/pipewire-pulse
+%{_libdir}/libpulse.so.0
-%{_mandir}/man1/pipewire-pulse.1*
+%{_libdir}/libpulse-simple.so.0
-%{_userunitdir}/pipewire-pulse.*
+%{_libdir}/libpulse-mainloop-glib.so.0
-%{_datadir}/pipewire/pipewire-pulse.conf
-%endif
-
-%if %{with v4l2}
-%files v4l2
-%{_bindir}/pw-v4l2
-%{_libdir}/pipewire-%{apiversion}/v4l2/libpw-v4l2.so
 %endif
 
 %changelog
-* Mon Nov 15 2021 Neal Gompa <ngompa@centosproject.org> - 0.3.40-1
+* Tue Jun 23 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.6-1
-- Update to version 0.3.40 which drops media-session service for WirePlumber
-  Resolves: rhbz#2022694
-
-* Thu Sep 16 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.32-3
-- Perform default systemd actions for media-session service.
-  Resolves: rhbz#1992712
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.32-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jul 21 2021 Neal Gompa <ngompa@centosproject.org> - 0.3.32-1
-- Update to 0.3.32
-  Resolves: rhbz#1956854
-
-* Sat Apr 24 2021 Neal Gompa <ngompa13@gmail.com> - 0.3.26-1
-- Update to 0.3.26
-- Add jack-devel subpackage, enable JACK support on RHEL 9+ (#1945951)
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.24-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Thu Mar 25 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.24-4
-- Apply some critical upstream patches
-
-* Thu Mar 25 2021 Kalev Lember <klember@redhat.com> - 0.3.24-3
-- Fix RHEL build
-
-* Thu Mar 25 2021 Kalev Lember <klember@redhat.com> - 0.3.24-2
-- Move individual config files to the subpackages that make use of them
-
-* Thu Mar 18 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.24-1
-- Update to 0.3.24
-
-* Tue Mar 09 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.23-2
-- Add patch to enable UCM Microphones
-
-* Thu Mar 04 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.23-1
-- Update to 0.3.23
-
-* Wed Feb 24 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.22-7
-- Add patch to sample destroy use after free
-
-* Wed Feb 24 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.22-6
-- Add patch for jack names
-
-* Mon Feb 22 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.22-5
-- Add some critical patches
-
-* Fri Feb 19 2021 Neal Gompa <ngompa13@gmail.com> - 0.3.22-4
-- Replace more PulseAudio modules on upgrade in F34+
-
-* Fri Feb 19 2021 Neal Gompa <ngompa13@gmail.com> - 0.3.22-3
-- Replace ALSA plugins and PulseAudio modules on upgrade in F34+
-
-* Fri Feb 19 2021 Neal Gompa <ngompa13@gmail.com> - 0.3.22-2
-- Replace JACK and PulseAudio on upgrade in F34+
-  Reference: https://fedoraproject.org/wiki/Changes/DefaultPipeWire
-
-* Thu Feb 18 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.22-1
-- Update to 0.3.22
-- disable sdl2 examples
-
-* Thu Feb 04 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.21-2
-- Add some upstream patches
-- Fixes rhbz#1925138
-
-* Wed Feb 03 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.21-1
-- Update to 0.3.21
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.20-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 20 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.20-1
-- Update to 0.3.20
-- Fix baseversion
-- Add gettext dependency
-
-* Tue Jan 12 2021 Neal Gompa <ngompa13@gmail.com> - 0.3.19-4
-- Rework conditional build to fix ELN builds
-
-* Sat Jan  9 2021 Evan Anderson <evan@eaanderson.com> - 0.3.19-3
-- Add LDAC and AAC dependency to enhance Bluetooth support
-
-* Thu Jan  7 2021 Neal Gompa <ngompa13@gmail.com> - 0.3.19-2
-- Obsolete useless libjack subpackage with jack-audio-connection-kit subpackage
-
-* Tue Jan 5 2021 Wim Taymans <wtaymans@redhat.com> - 0.3.19-1
-- Update to 0.3.19
-- Add ncurses-devel BR
-
-* Tue Dec 15 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.18-1
-- Update to 0.3.18
-
-* Fri Nov 27 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.17-2
-- Add some more Provides: for pulseaudio
-
-* Thu Nov 26 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.17-1
-- Update to 0.3.17
-
-* Tue Nov 24 2020 Neal Gompa <ngompa13@gmail.com> - 0.3.16-4
-- Add 'pulseaudio-daemon' Provides + Conflicts to pipewire-pulseaudio
-- Remove useless ldconfig macros that expand to nothing
-
-* Fri Nov 20 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.16-3
-- Fix Requires for pipewire-pulseaudio
-- Fixes rhbz#1899945
-
-* Fri Nov 20 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.16-2
-- Add patch to fix crash in kwin, Fixes rhbz#1899826
-
-* Thu Nov 19 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.16-1
-- Update to 0.3.16
-
-* Wed Nov 4 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.15-2
-- Add patch to fix screen sharing for old clients
-
-* Wed Nov 4 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.15-1
-- Update to 0.3.15
-
-* Sun Nov 1 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.14-2
-- Add some pulse server patches
-
-* Fri Oct 30 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.14-1
-- Update to 0.3.14
-
-* Sun Oct 18 2020 Neal Gompa <ngompa13@gmail.com> - 0.3.13-6
-- Fix jack and pulseaudio subpackages to generate dependencies properly
-
-* Tue Oct 13 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.13-5
-- Disable device provider for now
-- Fixes rhbz#1884260
-
-* Thu Oct 1 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.13-4
-- Add patches for some crasher bugs
-- Fixes rhbz#1884177
-
-* Tue Sep 29 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.13-3
-- Add patch to improve pulse compatibility
-
-* Mon Sep 28 2020 Jeff Law <law@redhat.com> - 0.3.13-2
-- Re-enable LTO as upstream GCC target/96939 has been fixed
-
-* Mon Sep 28 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.13-1
-- Update to 0.3.13
-
-* Fri Sep 18 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.12-1
-- Update to 0.3.12
-
-* Fri Sep 11 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.11-2
-- Add some patches to improve pulse compatibility
-
-* Thu Sep 10 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.11-1
-- Update to 0.3.11
-
-* Mon Aug 17 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.10-1
-- Update to 0.3.10
-
-* Tue Aug 04 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.9-1
-- Update to 0.3.9
-
-* Tue Aug 04 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.8-3
-- Add patch to avoid segfault when iterating ports.
-- Fixes #1865827
-
-* Wed Jul 29 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.8-2
-- Add patch for fix chrome audio hicups
-- Add patch for infinite loop in device add/remove
-- Disable LTO on armv7
-
-* Tue Jul 28 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.8-1
-- Update to 0.3.8
-
-* Tue Jul 21 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.7-2
-- Add patch to avoid crash when clearing metadata
-
-* Tue Jul 21 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.7-1
-- Update to 0.3.7
-
-* Wed Jun 10 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.6-2
-- Use systemd presets to enable pipewire.socket
-- Remove duplicate hardened_build flags
-- Add meson build again
-- Fix -gstreamer subpackage Requires:
-
-* Wed Jun 10 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.6-1
 - Update to 0.3.6
-- Add new man pages
+- Resolves: rhbz#1832347
-- Only build vulkan/pulse/jack in Fedora.
 
-* Mon May 11 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.5-1
+* Mon Jun 15 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.5-3
+- Rebuild
+- Resolves: rhbz#1832347
+
+* Tue May 19 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.5-2
+- Disable vulkan
+- Resolves: rhbz#1832347
+
+* Tue May 19 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.5-1
 - Update to 0.3.5
+- Disable pulse and jack
+- Add patch to work with meson 0.49
+- Add patch to fix neon compilation
+- Resolves: rhbz#1832347
 
-* Fri May 01 2020 Adam Williamson <awilliam@redhat.com> - 0.3.4-2
+* Fri Oct 18 2019 David King <dking@redhat.com> - 0.2.7-1
-- Suppress library provides from pipewire-lib{pulse,jack}
+- Rebase to 0.2.7 (#1748331)
 
-* Thu Apr 30 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.4-1
+* Fri Jan 11 2019 Wim Taymans <wtaymans@redhat.com> - 0.2.5-1
-- Update to 0.3.4
-- Add 2 more packages that replace libjack and libpulse
-
-* Tue Mar 31 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.2-3
-- Add patch to unsubscribe unused sequencer ports
-- Change config to only disable bluez5 handling by default.
-
-* Mon Mar 30 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.2-2
-- Add config to disable alsa and bluez5 handling by default.
-
-* Thu Mar 26 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.2-1
-- Update to 0.3.2
-
-* Fri Mar 06 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.1-1
-- Update to 0.3.1
-
-* Thu Feb 20 2020 Wim Taymans <wtaymans@redhat.com> - 0.3.0-1
-- Update to 0.3.0
-- Add libpulse-simple-pw.so
-
-* Wed Feb 19 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.97-1
-- Update to 0.2.97
-- Change download link
-
-* Tue Feb 18 2020 Kalev Lember <klember@redhat.com> - 0.2.96-2
-- Rename subpackages so that libjack-pw is in -libjack
-  and libpulse-pw is in -libpulse
-- Split libspa-jack.so out to -plugin-jack subpackage
-- Avoid hard-requiring the daemon from any of the library subpackages
-
-* Tue Feb 11 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.96-1
-- Update to 0.2.96
-- Split -gstreamer package
-- Enable aarch64 tests again
-
-* Fri Feb 07 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.95-1
-- Update to 0.2.95
-- Disable test on aarch64 for now
-
-* Wed Feb 05 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.94-1
-- Update to 0.2.94
-- Move pipewire modules to -libs
-- Add pw-profiler
-- Add libsndfile-devel as a BR
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.92-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 28 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.93-1
-- Update to 0.2.93
-
-* Wed Jan 15 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.92-1
-- Update to 0.2.92
-
-* Wed Jan 15 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.91-1
-- Update to 0.2.91
-- Add some more BR
-- Fix some unit tests
-
-* Mon Jan 13 2020 Wim Taymans <wtaymans@redhat.com> - 0.2.90-1
-- Update to 0.2.90
-
-* Thu Nov 28 2019 Kalev Lember <klember@redhat.com> - 0.2.7-2
-- Move spa plugins to -libs subpackage
-
-* Thu Sep 26 2019 Wim Taymans <wtaymans@redhat.com> - 0.2.7-1
-- Update to 0.2.7
-
-* Mon Sep 16 2019 Kalev Lember <klember@redhat.com> - 0.2.6-5
-- Don't require the daemon package for -devel subpackage
-- Move pipewire.conf man page to the daemon package
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jun 19 2019 Wim Taymans <wtaymans@redhat.com> - 0.2.6-3
-- Add patch to reuse fd in pipewiresrc
-- Add patch for device provider
-- Add patch to disable extra security checks until portal is fixed.
-
-* Tue Jun 04 2019 Kalev Lember <klember@redhat.com> - 0.2.6-2
-- Split libpipewire and the gstreamer plugin out to -libs subpackage
-
-* Wed May 22 2019 Wim Taymans <wtaymans@redhat.com> - 0.2.6-1
-- Update to 0.2.6
-- Add patch for alsa-lib 1.1.9 include path
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jan 04 2019 Wim Taymans <wtaymans@redhat.com> - 0.2.5-2
-- Add patch to avoid invalid conversion error with C++ compilers
-
-* Thu Nov 22 2018 Wim Taymans <wtaymans@redhat.com> - 0.2.5-1
 - Update to 0.2.5
+- Revert patch that requires too new meson
+- Add patch to avoid invalid conversion error with C++ compilers
+- Resolves: #1664569
 
-* Thu Nov 22 2018 Wim Taymans <wtaymans@redhat.com> - 0.2.4-1
+* Fri Nov 30 2018 Wim Taymans <wtaymans@redhat.com> - 0.2.4-1
 - Update to 0.2.4
+- Add defines for cursor and bitmap metadata
+- Revert patch that requires too new meson
+- Resolves: #1655028
 
 * Thu Oct 18 2018 Wim Taymans <wtaymans@redhat.com> - 0.2.3-2
 - Add systemd socket activation
+- Resolves: #1639871
 
-* Thu Aug 30 2018 Wim Taymans <wtaymans@redhat.com> - 0.2.3-1
+* Fri Oct 12 2018 Wim Taymans <wtaymans@redhat.com> - 0.2.3-1
 - Update to 0.2.3
+- Resolves: #1638046
 
-* Tue Jul 31 2018 Wim Taymans <wtaymans@redhat.com> - 0.2.2-1
+* Wed Aug 01 2018 Wim Taymans <wtaymans@redhat.com> - 0.2.2-1
 - Update to 0.2.2
 
-* Fri Jul 20 2018 Wim Taymans <wtaymans@redhat.com> - 0.2.1-1
-- Update to 0.2.1
-
-* Tue Jul 17 2018 Wim Taymans <wtaymans@redhat.com> - 0.2.0-1
-- Update to 0.2.0
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Tue Feb 27 2018 Wim Taymans <wtaymans@redhat.com> - 0.1.9-1
 - Update to 0.1.9