From 911b0cf32f83be7727d35f406e477200e3529493 Mon Sep 17 00:00:00 2001 From: "Igor V. Kovalenko" Date: Thu, 19 Oct 2023 21:00:57 +0300 Subject: media-sound/pulseaudio-daemon: Version bump to 16.99.1 Signed-off-by: Igor V. Kovalenko Closes: https://github.com/gentoo/gentoo/pull/33418 Signed-off-by: Sam James --- media-sound/pulseaudio-daemon/Manifest | 1 + .../files/pulseaudio-16.99.1-bump-c++17.patch | 23 ++ .../pulseaudio-daemon-16.99.1.ebuild | 385 +++++++++++++++++++++ 3 files changed, 409 insertions(+) create mode 100644 media-sound/pulseaudio-daemon/files/pulseaudio-16.99.1-bump-c++17.patch create mode 100644 media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest index 955eec847d0e..97ee1069f0e6 100644 --- a/media-sound/pulseaudio-daemon/Manifest +++ b/media-sound/pulseaudio-daemon/Manifest @@ -1 +1,2 @@ DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f +DIST pulseaudio-16.99.1.tar.xz 1565020 BLAKE2B 02aad918e2b76dcf250bd55e03460206c7781cd1b43aa2efe46b25258626892e07f478b9966fa5027c9ae0a370145f5204dba05d2f5dfbfd3ba956225ccb3cad SHA512 1a3347e4c892ba0e321d39184f8bd52cfd16f59e66e52a753d6f706dfbf3f170f87b7ff27c0a6cdf3e462e6dd531ecde6829d48a374d0be2622688fb85abaac2 diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.99.1-bump-c++17.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.99.1-bump-c++17.patch new file mode 100644 index 000000000000..c7aa9d8aadbe --- /dev/null +++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.99.1-bump-c++17.patch @@ -0,0 +1,23 @@ +commit e2b63d157fcc5ceb67a2f0eaed202d18baa05a11 +Author: Arun Raghavan +Date: Sun Aug 13 07:24:41 2023 -0400 + + build-sys: Bump cpp_std to c++17 + + Match it with webrtc-audio-processing, which is what we care about. + + Part-of: + +diff --git a/meson.build b/meson.build +index daa80b573..ba3d01dac 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,7 +1,7 @@ + project('pulseaudio', 'c', + version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version'), check : false).stdout().strip(), + meson_version : '>= 0.50.0', +- default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ] ++ default_options : [ 'c_std=gnu11', 'cpp_std=c++17' ] + ) + + if not meson.is_subproject() diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild new file mode 100644 index 000000000000..16f45f943abe --- /dev/null +++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild @@ -0,0 +1,385 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +MY_PV="${PV/_pre*}" +MY_P="pulseaudio-${MY_PV}" +inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev + +DESCRIPTION="Daemon component of PulseAudio (networked sound server)" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/" + +if [[ ${PV} = 9999 ]]; then + inherit git-r3 + EGIT_BRANCH="master" + EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio" +else + SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +S="${WORKDIR}/${MY_P}" + +# libpulse-simple and libpulse link to libpulse-core; this is daemon's +# library and can link to gdbm and other GPL-only libraries. In this +# cases, we have a fully GPL-2 package. Leaving the rest of the +# GPL-forcing USE flags for those who use them. +LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )" + +SLOT="0" + +# +alsa-plugin as discussed in bug #519530 +# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec +# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file +IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc +ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf" + +RESTRICT="!test? ( test )" + +# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac +# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon () +# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once +REQUIRED_USE=" + ?? ( elogind systemd ) + alsa-plugin? ( alsa ) + aptx? ( bluetooth ) + bluetooth? ( dbus ) + equalizer? ( dbus ) + ldac? ( bluetooth ) + ofono-headset? ( bluetooth ) + udev? ( || ( alsa oss ) ) + zeroconf? ( dbus ) +" + +# NOTE: +# - libpcre needed in some cases, bug #472228 +# - media-libs/speexdsp is providing echo canceller implementation and used in resampler +# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too +gstreamer_deps=" + media-libs/gst-plugins-base + >=media-libs/gstreamer-1.14 +" +COMMON_DEPEND=" + ~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?] + >=media-libs/libpulse-16.99.1 + dev-libs/libatomic_ops + >=media-libs/libsndfile-1.0.20 + >=media-libs/speexdsp-1.2 + alsa? ( >=media-libs/alsa-lib-1.0.24 ) + aptx? ( ${gstreamer_deps} ) + asyncns? ( >=net-libs/libasyncns-0.1 ) + bluetooth? ( + >=net-wireless/bluez-5 + media-libs/sbc + ) + dev-libs/libltdl + sys-kernel/linux-headers + >=sys-libs/libcap-2.22-r2 + dbus? ( >=sys-apps/dbus-1.4.12 ) + elibc_mingw? ( dev-libs/libpcre:3 ) + elogind? ( sys-auth/elogind ) + equalizer? ( + sci-libs/fftw:3.0= + ) + fftw? ( + sci-libs/fftw:3.0= + ) + gdbm? ( sys-libs/gdbm:= ) + glib? ( >=dev-libs/glib-2.28.0:2 ) + gstreamer? ( + ${gstreamer_deps} + >=dev-libs/glib-2.26.0:2 + ) + jack? ( virtual/jack ) + ldac? ( ${gstreamer_deps} ) + lirc? ( app-misc/lirc ) + ofono-headset? ( >=net-misc/ofono-1.13 ) + orc? ( >=dev-lang/orc-0.4.15 ) + selinux? ( sec-policy/selinux-pulseaudio ) + sox? ( >=media-libs/soxr-0.1.1 ) + ssl? ( dev-libs/openssl:= ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) + udev? ( >=virtual/udev-143[hwdb(+)] ) + valgrind? ( dev-util/valgrind ) + webrtc-aec? ( >=media-libs/webrtc-audio-processing-1.3:1 ) + X? ( + >=x11-libs/libxcb-1.6 + x11-libs/libICE + x11-libs/libSM + >=x11-libs/libX11-1.4.0 + >=x11-libs/libXtst-1.0.99.2 + ) + zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) +" + +# pulseaudio ships a bundle xmltoman, which uses XML::Parser +DEPEND=" + ${COMMON_DEPEND} + test? ( >=dev-libs/check-0.9.10 ) + X? ( x11-base/xorg-proto ) +" + +# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it +# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used +RDEPEND=" + ${COMMON_DEPEND} + system-wide? ( + alsa? ( media-sound/alsa-utils ) + acct-user/pulse + acct-group/audio + acct-group/pulse-access + ) + bluetooth? ( + ldac? ( media-plugins/gst-plugins-ldac ) + aptx? ( media-plugins/gst-plugins-openaptx ) + ) + !media-video/pipewire[sound-server(+)] +" +unset gstreamer_deps + +# This is a PDEPEND to avoid a circular dep +PDEPEND=" + alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) ) +" + +BDEPEND=" + dev-lang/perl + dev-perl/XML-Parser + sys-devel/gettext + sys-devel/m4 + virtual/libiconv + virtual/libintl + virtual/pkgconfig + orc? ( >=dev-lang/orc-0.4.15 ) + system-wide? ( dev-util/unifdef ) +" + +DOCS=( NEWS README ) + +# patches merged upstream, to be removed with 16.99.2 or later bump +PATCHES=( + "${FILESDIR}"/pulseaudio-16.99.1-bump-c++17.patch +) + +src_prepare() { + default + + gnome2_environment_reset +} + +src_configure() { + local enable_bluez5_gstreamer="disabled" + if use aptx || use ldac ; then + enable_bluez5_gstreamer="enabled" + fi + + local enable_fftw="disabled" + if use equalizer || use fftw ; then + enable_fftw="enabled" + fi + + local emesonargs=( + --localstatedir="${EPREFIX}"/var + + -Ddaemon=true + -Dclient=false + -Ddoxygen=false + -Dgcov=false + -Dman=true + # tests involve random modules, so just do them for the native # TODO: tests should run always + $(meson_use test tests) + -Ddatabase=$(usex gdbm gdbm simple) # tdb is also an option but no one cares about it + -Dstream-restore-clear-old-devices=true + -Drunning-from-build-tree=false + + # Paths + -Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P} + -Dsystemduserunitdir=$(systemd_get_userunitdir) + -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" + -Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value + + # Optional features + $(meson_feature alsa) + $(meson_feature asyncns) + $(meson_feature zeroconf avahi) + $(meson_feature bluetooth bluez5) + -Dbluez5-gstreamer=${enable_bluez5_gstreamer} + $(meson_use bluetooth bluez5-native-headset) + $(meson_use ofono-headset bluez5-ofono-headset) + -Dconsolekit=disabled + $(meson_feature dbus) + $(meson_feature elogind) + -Dfftw=${enable_fftw} + $(meson_feature glib) # WARNING: toggling this likely changes ABI + $(meson_feature glib gsettings) # Supposedly correct? + $(meson_feature gstreamer) + -Dgtk=disabled + -Dhal-compat=false + -Dipv6=true + $(meson_feature jack) + $(meson_feature lirc) + $(meson_feature ssl openssl) + $(meson_feature orc) + $(meson_feature oss oss-output) + -Dsamplerate=disabled # Matches upstream + $(meson_feature sox soxr) + -Dspeex=enabled + $(meson_feature systemd) + $(meson_feature tcpd tcpwrap) + $(meson_feature udev) + $(meson_feature valgrind) + $(meson_feature X x11) + + # Echo cancellation + -Dadrian-aec=false # Not packaged? + $(meson_feature webrtc-aec) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + # qpaeq moved to media-sound/qpaeq + if [[ -f "${ED}"/usr/bin/qpaeq ]]; then + rm "${ED}"/usr/bin/qpaeq || die + fi + + # Upstream installs 'pactl' if client is built, with all symlinks except for + # 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built. + # This trips QA warning, workaround: + # - install missing aliases in media-libs/libpulse (client build) + # - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build) + rm "${D}/$(get_bashcompdir)"/pulseaudio || die + rm "${D}/$(get_bashcompdir)"/pacmd || die + rm "${D}/$(get_bashcompdir)"/pasuspender || die + + # Daemon configuration scripts will try to load snippets from corresponding '.d' dirs. + # Install these dirs to silence a warning if they are missing. + keepdir /etc/pulse/default.pa.d + keepdir /etc/pulse/system.pa.d + + if use system-wide; then + newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio + + use_define() { + local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')} + + use "${1}" && echo "-D${define}" || echo "-U${define}" + } + + unifdef -x 1 \ + $(use_define zeroconf AVAHI) \ + $(use_define alsa) \ + $(use_define bluetooth) \ + $(use_define udev) \ + "${FILESDIR}"/pulseaudio.init.d-5 \ + > "${T}"/pulseaudio \ + || die + + doinitd "${T}"/pulseaudio + + systemd_dounit "${FILESDIR}"/pulseaudio.service + + # We need /var/run/pulse, bug 442852 + newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf + else + # Prevent warnings when system-wide is not used, bug 447694 + if use dbus; then + rm "${ED}"/usr/share/dbus-1/system.d/pulseaudio-system.conf || die + fi + fi + + if use zeroconf; then + sed -i \ + -e '/module-zeroconf-publish/s:^#::' \ + "${ED}/etc/pulse/default.pa" \ + || die + fi + + # Only enable autospawning pulseaudio daemon on systems without systemd + if ! use systemd; then + insinto /etc/pulse/client.conf.d + newins "${FILESDIR}/enable-autospawn.conf" "enable-autospawn.conf" + fi + + find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die +} + +pkg_postinst() { + gnome2_schemas_update + + use udev && udev_reload + + if use system-wide; then + tmpfiles_process "pulseaudio.conf" + + elog "You have enabled the 'system-wide' USE flag for pulseaudio." + elog "This mode should only be used on headless servers, embedded systems," + elog "or thin clients. It will usually require manual configuration, and is" + elog "incompatible with many expected pulseaudio features." + elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED." + elog "" + elog "For more information, see" + elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/" + elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/" + elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server" + elog "" + fi + + if use bluetooth; then + elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle" + elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using" + elog "native headset backend by default. This can be selectively disabled" + elog "via runtime configuration arguments to module-bluetooth-discover" + elog "in /etc/pulse/default.pa" + elog "To disable HFP HF append enable_native_hfp_hf=false" + elog "To disable HSP HS append enable_native_hsp_hs=false" + elog "To disable HSP AG append headset=auto or headset=ofono" + elog "(note this does NOT require enabling USE ofono)" + elog "" + fi + + if use ofono-headset; then + elog "You have enabled both native and ofono headset profiles. The runtime decision" + elog "which to use is done via the 'headset' argument of module-bluetooth-discover." + elog "" + fi + + if use gstreamer; then + elog "GStreamer-based RTP implementation modile enabled." + elog "To use OPUS payload install media-plugins/gst-plugins-opus" + elog "and add enable_opus=1 argument to module-rtp-send" + elog "" + fi + + if use systemd; then + elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available." + elog "It's recommended to start pulseaudio via its systemd user units:" + elog "" + elog " systemctl --user enable pulseaudio.service pulseaudio.socket" + elog "" + elog "Root user can change system default configuration for all users:" + elog "" + elog " systemctl --global enable pulseaudio.service pulseaudio.socket" + elog "" + elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:" + elog "" + elog " autospawn = yes" + elog "" + elog "The change from autospawn to user units will take effect after restarting." + elog "" + fi + + optfeature_header "PulseAudio can be enhanced by installing the following:" + use equalizer && optfeature "qpaeq script for equalizer GUI" media-sound/qpaeq + use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit +} + +pkg_postrm() { + gnome2_schemas_update + use udev && udev_reload +} -- cgit v1.2.3-65-gdbad