updated 3 packages

alsa-plugins-1.2.2-2

pipewire-0.3.24-1

pulseaudio-14.2-2

a/alsa-plugins/alsa-plugins-vl.spec

@@ -1,8 +1,8 @@
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 Name:           alsa-plugins
 Version:        1.2.2
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
-Group:          system
+Group:          system,multimedia
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -34,7 +34,7 @@ This package includes plugins for ALSA.
 
 %package jack
 Summary:        Jack PCM output plugin for ALSA
-Group:          system
+Group:          system,multimedia
 License:        LGPLv2+
 Requires:       alsa-lib
 Requires:       jack-audio-connection-kit
@@ -52,8 +52,8 @@ This plugin provides the PCM type "jack"
 
 %package oss
 Summary:        Oss PCM output plugin for ALSA
-Group:          system
+Group:          system,multimedia
-License:        LGPLv2+ 
+License:        LGPLv2+
 Requires:       alsa-lib
 %description oss
 This plugin converts the ALSA API over OSS API.  With this plugin,
@@ -64,11 +64,11 @@ This plugin provides the PCM type "oss".
 
 %package pulseaudio
 Summary:        Alsa to PulseAudio backend
-Group:          system
+Group:          system,multimedia
 License:        LGPLv2+
 BuildRequires:  pulseaudio-lib-devel
 Requires:       alsa-lib
-Requires:       pulseaudio
+Requires:       pulseaudio-daemon
 %description pulseaudio
 This plugin allows any program that uses the ALSA API to access a PulseAudio
 sound daemon. In other words, native ALSA applications can play and record
@@ -78,7 +78,7 @@ one for mixer control.
 
 %package samplerate
 Summary:        External rate converter plugin for ALSA
-Group:          system
+Group:          system,multimedia
 License:        GPLv2+
 Requires:       alsa-lib
 BuildRequires:  libsamplerate-devel
@@ -89,7 +89,7 @@ Castro Lopo.
 
 %package upmix
 Summary:        Upmixer channel expander plugin for ALSA
-Group:          system
+Group:          system,multimedia
 License:        LGPLv2+
 Requires:       alsa-lib
 BuildRequires:  libsamplerate-devel
@@ -101,7 +101,7 @@ by the slave PCM or explicitly via channel option.
 
 %package vdownmix
 Summary:        Downmixer to stereo plugin for ALSA
-Group:          system
+Group:          system,multimedia
 License:        LGPLv2+
 Requires:       alsa-lib
 BuildRequires:  libsamplerate-devel
@@ -114,7 +114,7 @@ surround".
 
 %package usbstream
 Summary:        USB stream plugin for ALSA
-Group:          system
+Group:          system,multimedia
 License:        LGPLv2+
 Requires:       alsa-lib
 %description usbstream
@@ -124,7 +124,7 @@ stream to USB specific stream.
 
 %package arcamav
 Summary:        Arcam AV amplifier plugin for ALSA
-Group:          system
+Group:          system,multimedia
 License:        LGPLv2+
 Requires:       alsa-lib
 %description arcamav
@@ -134,7 +134,7 @@ This plugin exposes the controls for an Arcam AV amplifier
 
 %package speex
 Summary:        Rate Converter Plugin Using Speex Resampler
-Group:          system
+Group:          system,multimedia
 License:        LGPLv2+
 Requires:       alsa-lib
 Requires:       speex
@@ -148,7 +148,7 @@ pre-processing of a mono stream like denoise using libspeex DSP API.
 
 %package maemo
 Summary:        Maemo plugin for ALSA
-Group:          system
+Group:          system,multimedia
 License:        LGPLv2+
 Requires:       alsa-lib
 BuildRequires:  dbus-devel
@@ -187,14 +187,6 @@ install -m 644 %SOURCE1 %SOURCE2 %SOURCE3 \
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-
 %files jack
 %defattr(-,root,root,-)
 %license COPYING COPYING.GPL
@@ -296,6 +288,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.2-2
+- R:pulseaudio -> R:pulseaudio-daemon.
+- dropped ldconfig scriptlets.
+
 * Fri Oct 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.2-1
 - new upstream release.
 

p/pipewire/pipewire-vl.spec

@@ -18,8 +18,9 @@
 
 Name:           pipewire
 Summary:        Media Sharing Server
-Version:        0.3.8
+Version:        0.3.24
 Release:        1%{?snap:.%{snap}git%{shortcommit}}%{?_dist_release}%{?with_systemd:.systemd}
+Group:          multimedia
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -30,7 +31,7 @@ URL:            https://pipewire.org/
 # cd pipewire; git reset --hard %{gitcommit}; ./autogen.sh; make; make distcheck
 Source0:        pipewire-%{version}-%{gitrel}-g%{shortcommit}.tar.gz
 %else
-Source0:	https://github.com/PipeWire/pipewire/archive/%{version}.tar.gz
+Source0:        https://github.com/PipeWire/pipewire/archive/%{version}.tar.gz
 %endif
 
 ## upstream patches
@@ -38,7 +39,7 @@ Source0:	https://github.com/PipeWire/pipewire/archive/%{version}.tar.gz
 ## upstreamable patches
 
 ## fedora patches
-Patch0:         0001-conf-disable-bluez5.patch
+Patch0:         0001-conf-start-media-session-through-pipewire.patch
 
 BuildRequires:  meson >= 0.35.0
 BuildRequires:  gcc
@@ -92,6 +93,7 @@ systems.
 
 %package libs
 Summary:        Libraries for PipeWire clients
+Group:          system
 License:        LGPLv2+
 Recommends:     %{name}%{?_isa} = %{version}-%{release}
 
@@ -100,8 +102,21 @@ This package contains the runtime libraries for any application that wishes
 to interface with a PipeWire media server.
 
 
+%package gstreamer
+Summary:        GStreamer elements for PipeWire
+Group:          multimedia
+License:        MIT
+Recommends:     %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description gstreamer
+This package contains GStreamer elements to interface with a
+PipeWire media server.
+
+
 %package devel
 Summary:        Headers and libraries for PipeWire client development
+Group:          programming
 License:        LGPLv2+
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -112,6 +127,7 @@ a PipeWire media server.
 
 %package doc
 Summary:        PipeWire media server documentation
+Group:          documentation
 License:        LGPLv2+
 
 %description doc
@@ -120,6 +136,7 @@ This package contains documentation for the PipeWire media server.
 
 %package utils
 Summary:        PipeWire media server utilities
+Group:          multimedia
 License:        LGPLv2+
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
@@ -128,6 +145,107 @@ Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 This package contains command line utilities for the PipeWire media server.
 
 
+%package alsa
+Summary:        PipeWire media server ALSA support
+Group:          multimedia
+License:        MIT
+Recommends:     %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+%if 0
+# 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.
+
+
+%package jack-audio-connection-kit
+Summary:        PipeWire JACK implementation
+Group:          multimedia
+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
+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
+# 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 plugin-jack
+Summary:        PipeWire media server JACK support
+Group:          multimedia
+License:        MIT
+BuildRequires:  jack-audio-connection-kit-devel
+Recommends:     %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       jack-audio-connection-kit
+
+%description plugin-jack
+This package contains the PipeWire spa plugin to connect to a JACK server.
+
+
+%package pulseaudio
+Summary:        PipeWire PulseAudio implementation
+Group:          multimedia
+License:        MIT
+Recommends:     %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+BuildRequires:  pulseaudio-libs
+Conflicts:      pulseaudio
+# Fixed pulseaudio subpackages
+Conflicts:      %{name}-libpulse < 0.3.13-6
+Conflicts:      %{name}-pulseaudio < 0.3.13-6
+%if 0
+# 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
+
+
+%debug_package
+
+
 %prep
 %setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
 %autopatch -p1
@@ -135,16 +253,30 @@ This package contains command line utilities for the PipeWire media server.
 
 %build
 %meson \
-	-D docs=true \
+	-D docs=enabled \
-	-D man=true \
+%if %{with man}
-	-D gstreamer=true \
+	-D man=enabled \
-	-D jack=false \
+%else
-	-D pipewire-jack=false \
+	-D man=disabled \
-	-D pipewire-pulseaudio=false \
+%endif
+	-D gstreamer=enabled \
+	-D jack=enabled \
+	-D pipewire-jack=enabled \
+	-D pipewire-pulseaudio=enabled \
+	-D vulkan=enabled \
+	-D gstreamer-device-provider=disabled \
+	-D sdl2=disabled \
+	-D libcamera=disabled \
+	-D audiotestsrc=disabled \
+	-D videotestsrc=disabled \
+	-D volume=disabled \
+	-D bluez5-codec-aptx=disabled \
+	-D bluez5-codec-ldac=disabled \
+	-D bluez5-codec-aac=disabled \
 %if %{with systemd}
-	-D systemd=true
+	-D systemd=enabled
 %else
-	-D systemd=false
+	-D systemd=disabled
 %endif
 %meson_build
 
@@ -152,11 +284,22 @@ This package contains command line utilities for the PipeWire media server.
 %install
 %meson_install
 
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
+echo %{_libdir}/pipewire-%{apiversion}/jack/ > %{buildroot}%{_sysconfdir}/ld.so.conf.d/pipewire-jack-%{_arch}.conf
+
 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
 cp %{buildroot}%{_datadir}/alsa/alsa.conf.d/99-pipewire-default.conf \
         %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pipewire-default.conf
+touch %{buildroot}%{_sysconfdir}/pipewire/media-session.d/with-alsa
+
+%if %{with systemd}
+# We don't start the media session with systemd yet
+rm %{buildroot}%{_userunitdir}/pipewire-media-session.*
+%endif
+
+%find_lang %{name}
 
 
 %check
@@ -173,10 +316,11 @@ exit 0
 %post
 %systemd_user_post pipewire.service
 %systemd_user_post pipewire.socket
-%endif
 
-%post libs -p /sbin/ldconfig
+%post pulseaudio
-%postun libs -p /sbin/ldconfig
+%systemd_user_post pipewire-pulse.service
+%systemd_user_post pipewire-pulse.socket
+%endif
 
 
 %files
@@ -188,13 +332,20 @@ exit 0
 %{_bindir}/pipewire
 %{_bindir}/pipewire-media-session
 %dir %{_sysconfdir}/pipewire/
+%config(noreplace) %{_sysconfdir}/pipewire/client.conf
+%config(noreplace) %{_sysconfdir}/pipewire/client-rt.conf
+%config(noreplace) %{_sysconfdir}/pipewire/jack.conf
 %config(noreplace) %{_sysconfdir}/pipewire/pipewire.conf
+%config(noreplace) %{_sysconfdir}/pipewire/pipewire-pulse.conf
+%config(noreplace) %{_sysconfdir}/pipewire/media-session.d/alsa-monitor.conf
+%config(noreplace) %{_sysconfdir}/pipewire/media-session.d/bluez-monitor.conf
+%config(noreplace) %{_sysconfdir}/pipewire/media-session.d/media-session.conf
+%config(noreplace) %{_sysconfdir}/pipewire/media-session.d/v4l2-monitor.conf
 %if %{with man}
-%{_mandir}/man1/pipewire.1*
 %{_mandir}/man5/pipewire.conf.5*
 %endif
 
-%files libs
+%files libs -f %{name}.lang
 %license COPYING LICENSE
 %doc README.md
 %{_libdir}/libpipewire-%{apiversion}.so.*
@@ -214,6 +365,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-pipewire.conf
 %config(noreplace) %{_sysconfdir}/alsa/conf.d/99-pipewire-default.conf
 
+%files gstreamer
+%{_libdir}/gstreamer-1.0/libgstpipewire.*
+
 %files devel
 %{_libdir}/libpipewire-%{apiversion}.so
 %{_includedir}/pipewire-%{apiversion}/
@@ -226,12 +380,47 @@ exit 0
 
 %files utils
 %{_bindir}/pw-*
+%{_bindir}/spa-*
 
-%{_bindir}/spa-monitor
+%files alsa
-%{_bindir}/spa-inspect
+%{_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
+%config(noreplace) %{_sysconfdir}/pipewire/media-session.d/with-alsa
+
+%files jack-audio-connection-kit
+%{_bindir}/pw-jack
+%if %{with man}
+%{_mandir}/man1/pw-jack.1*
+%endif
+%{_libdir}/pipewire-%{apiversion}/jack/libjack.so*
+%{_libdir}/pipewire-%{apiversion}/jack/libjacknet.so*
+%{_libdir}/pipewire-%{apiversion}/jack/libjackserver.so*
+%config(noreplace) %{_sysconfdir}/pipewire/media-session.d/with-jack
+%{_sysconfdir}/ld.so.conf.d/pipewire-jack-%{_arch}.conf
+
+%files plugin-jack
+%{_libdir}/spa-%{spaversion}/jack/
+
+%files pulseaudio
+%{_bindir}/pipewire-pulse
+%if %{with systemd}
+%{_userunitdir}/pipewire-pulse.*
+%endif
+%config(noreplace) %{_sysconfdir}/pipewire/media-session.d/with-pulseaudio
 
 
 %changelog
+* Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.3.24-1
+- new upstream release.
+- dropped Patch0.
+- imported Patch0 from rawhide.
+- dropped ldconfig scriptlets.
+- enabled gstreamer, pulseaudio and jack.
+
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.3.8-1
 - new upstream release.
 - dropped Patch1 and 2: fixed in upstream.

p/pulseaudio/pulseaudio-vl.spec

@@ -9,7 +9,7 @@ Name:		pulseaudio
 Summary: 	PulseAudio sound server
 Summary(ja): 	PulseAudio サウンドサーバ
 Version:	14.2
-Release:	1%{?_dist_release}%{?with_systemd:.systemd}
+Release:	2%{?_dist_release}%{?with_systemd:.systemd}
 Group:		servers,multimedia
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -62,6 +62,10 @@ BuildRequires: elogind-devel
 %endif
 Requires:      %{name}-core-libs = %{version}-%{release}
 
+# Virtual Provides to support swapping between PipeWire-PA and PA
+Provides:       pulseaudio-daemon
+Conflicts:      pulseaudio-daemon
+
 %description
 PulseAudio is a sound server for Linux and other Unix like operating 
 systems. It is intended to be an improved drop-in replacement for the 
@@ -384,24 +388,6 @@ if [ $1 -eq 0 ]; then
     groupdel pulse-access &>/dev/null || :
 fi
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%post core-libs -p /sbin/ldconfig
-%postun core-libs -p /sbin/ldconfig
-
-%post libs-glib2 -p /sbin/ldconfig
-%postun libs-glib2 -p /sbin/ldconfig
-
-%post -n compat32-%{name}-libs -p /sbin/ldconfig
-%postun -n compat32-%{name}-libs -p /sbin/ldconfig
-
-%post -n compat32-%{name}-core-libs -p /sbin/ldconfig
-%postun -n compat32-%{name}-core-libs -p /sbin/ldconfig
-
-%post -n compat32-%{name}-libs-glib2 -p /sbin/ldconfig
-%postun -n compat32-%{name}-libs-glib2 -p /sbin/ldconfig
-
 
 %files
 %defattr(-,root,root)
@@ -633,7 +619,6 @@ fi
 %attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
-
 # compat32
 %if %{build_compat32}
 %files -n compat32-%{name}-libs
@@ -657,7 +642,12 @@ fi
 %{_libdir}/libpulse-simple.so
 %endif
 
+
 %changelog
+* Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 14.2-2
+- added virtual provides to switch to pipewire.
+- dropped ldconfig scriptlets.
+
 * Sat Feb 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 14.2-1
 - updated to 14.2.