From 7a1744d8a9edc3608a90ebcf5eb69021c40ada9f Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 28 Jul 2021 13:33:55 +0200 Subject: [PATCH] Update to 15.0 convert to meson build esound, gconf, oss are no longer supported Resolves: rhbz#1961581 --- .gitignore | 1 + pulseaudio-autostart.patch | 8 +-- pulseaudio.spec | 133 ++++++++++++------------------------- sources | 4 +- 4 files changed, 49 insertions(+), 97 deletions(-) diff --git a/.gitignore b/.gitignore index 4bd1ec9..337be90 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /pulseaudio-14.0.tar.xz.sha256 /pulseaudio-14.1.tar.xz.sha256 /pulseaudio-14.2.tar.xz.sha256 +/pulseaudio-15.0.tar.xz.sha256sum diff --git a/pulseaudio-autostart.patch b/pulseaudio-autostart.patch index 856eaa1..5305df4 100644 --- a/pulseaudio-autostart.patch +++ b/pulseaudio-autostart.patch @@ -1,5 +1,5 @@ diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in -index 0e84315c3..6533e125b 100755 +index 722a639c0..7cdf14e4d 100755 --- a/src/daemon/start-pulseaudio-x11.in +++ b/src/daemon/start-pulseaudio-x11.in @@ -17,6 +17,9 @@ @@ -9,6 +9,6 @@ index 0e84315c3..6533e125b 100755 +# 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 + if [ -n "$1" ] ; then + case $1 in + stop) diff --git a/pulseaudio.spec b/pulseaudio.spec index 7ca4416..709171b 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -1,4 +1,4 @@ -%global pa_major 14.2 +%global pa_major 15.0 #global pa_minor 0 #global snap 20200105 @@ -14,7 +14,6 @@ %if 0%{?fedora} %global enable_lirc 1 %global enable_jack 1 -%global enable_gconf 1 %endif # https://bugzilla.redhat.com/983606 @@ -37,7 +36,7 @@ Name: pulseaudio Summary: Improved Linux Sound Server Version: %{pa_major}%{?pa_minor:.%{pa_minor}} -Release: 5%{?snap:.%{snap}git%{shortcommit}}%{?dist} +Release: 1%{?snap:.%{snap}git%{shortcommit}}%{?dist} License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/PulseAudio %if 0%{?gitrel} @@ -46,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 @@ -64,9 +63,9 @@ Patch206: pulseaudio-11.1-autospawn_disable.patch ## upstreamable patches -BuildRequires: make -BuildRequires: automake libtool -BuildRequires: gcc-c++ +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 @@ -113,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 @@ -137,13 +139,6 @@ 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 @@ -186,15 +181,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} JACK sink and source modules for the PulseAudio sound server. %endif -%if 0%{?enable_gconf} -%package module-gconf -Summary: GConf support for the PulseAudio sound server -BuildRequires: GConf2-devel -Requires: %{name}%{?_isa} = %{version}-%{release} -%description module-gconf -GConf configuration backend for the PulseAudio sound server. -%endif - %package module-gsettings Summary: Gsettings support for the PulseAudio sound server Requires: %{name}%{?_isa} = %{version}-%{release} @@ -271,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 @@ -282,53 +265,35 @@ 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-gconf}%{!?enable_gconf:--disable-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 @@ -360,7 +325,7 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/pulse-%{pa_major}/modules/module-detect.so # 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} @@ -437,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 @@ -459,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 @@ -532,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 @@ -573,12 +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 -%if 0%{?enable_gconf} -%files module-gconf -%{_libdir}/pulse-%{pa_major}/modules/module-gconf.so -%{_libexecdir}/pulse/gconf-helper -%endif - %files module-gsettings %{_libdir}/pulse-%{pa_major}/modules/module-gsettings.so %{_libexecdir}/pulse/gsettings-helper @@ -596,7 +547,6 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || : %{_libdir}/libpulse-simple.so.0* %dir %{_libdir}/pulseaudio/ %{_libdir}/pulseaudio/libpulsecommon-%{pa_major}.so -%{_libdir}/pulseaudio/libpulsedsp.so %ldconfig_scriptlets libs-glib2 @@ -604,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 @@ -631,15 +581,10 @@ 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* @@ -663,6 +608,12 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || : %changelog +* Wed Jul 28 2021 Wim Taymans - 15.0-1 +- Update to 15.0 +- convert to meson build +- esound, gconf, oss are no longer supported +- Resolves: rhbz#1961581 + * Wed Jun 16 2021 Mohan Boddu - 14.2-5 - Rebuilt for RHEL 9 BETA for openssl 3.0 Related: rhbz#1971065 diff --git a/sources b/sources index 72485e3..78874f0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pulseaudio-14.2.tar.xz) = 196338cbb26c542301b6d0579070dfbcc42e76dc17405f3e216af70519bec2003089b80c573a32d5f96bdab078631ca09ce89998ab7a0a8ffa26955a9bcb3c4a -SHA512 (pulseaudio-14.2.tar.xz.sha256) = e9e39cea097354fc576127e4f3f7ddc38d34b1d72f4badd1c57b3b6f13a18e9ca1afec82e68cd31569cfe3ee4b5f3981d185886465a9423570847cd27e324f08 +SHA512 (pulseaudio-15.0.tar.xz) = 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833 +SHA512 (pulseaudio-15.0.tar.xz.sha256sum) = 72cdf6741eaa5967082503a73feb69a09b131db12f43f57db777b771d3feb66bee7a397b3370cd44251802c23f006846fae97681b0b53f32ec21dd1b0de8c10f