commit: 212450d1abadb4d4f50a83cf4bd13e3ab0850c57 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Nov 9 19:38:59 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 10 10:18:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=212450d1
media-sound/pulseaudio-daemon: drop 16.1-r7, 16.99.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/pulseaudio-daemon/Manifest | 2 - ...lseaudio-16.0-optional-module-console-kit.patch | 76 ---- ...audio-16.1-module-combine-sink-load-crash.patch | 26 -- ...dio-16.1-module-combine-sink-unload-crash.patch | 22 -- .../pulseaudio-16.1-move-qpaeq-to-daemon.patch | 36 -- .../files/pulseaudio-16.99.1-bump-c++17.patch | 23 -- .../pulseaudio-daemon-16.1-r7.ebuild | 387 --------------------- .../pulseaudio-daemon-16.99.1.ebuild | 385 -------------------- 8 files changed, 957 deletions(-) diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest index 776caac18a80..42cd89ab8f99 100644 --- a/media-sound/pulseaudio-daemon/Manifest +++ b/media-sound/pulseaudio-daemon/Manifest @@ -1,3 +1 @@ -DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f -DIST pulseaudio-16.99.1.tar.xz 1565020 BLAKE2B 02aad918e2b76dcf250bd55e03460206c7781cd1b43aa2efe46b25258626892e07f478b9966fa5027c9ae0a370145f5204dba05d2f5dfbfd3ba956225ccb3cad SHA512 1a3347e4c892ba0e321d39184f8bd52cfd16f59e66e52a753d6f706dfbf3f170f87b7ff27c0a6cdf3e462e6dd531ecde6829d48a374d0be2622688fb85abaac2 DIST pulseaudio-17.0.tar.xz 1566556 BLAKE2B 781ece3d507916aa681d3b0132689730a621b4d92e45f86570e4d2fdebc4c0025ebe7f7a05046545f9b26caca513e8975f12498fa314524bc67eacaea72842fa SHA512 be0aec46204d9c9188a796fbe41b4cf6f0f5e6b16fa08ce359b8f0f51253f0ade364b89448bbf5faa2af7e59deb6c72194734c3233944250dcfd4f31968a5e97 diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-optional-module-console-kit.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-optional-module-console-kit.patch deleted file mode 100644 index 4ffdb82f4901..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-optional-module-console-kit.patch +++ /dev/null @@ -1,76 +0,0 @@ -commit 823e46fba0742605f557b68cd591f61624b93966 -Author: Igor V. Kovalenko <[email protected]> -Date: Sun Jun 12 21:49:32 2022 +0300 - - build-sys: meson: Make module-console-kit optional - - Default build configuration would fail to run on a system without systemd-logind - (or elogind) and without ConsoleKit daemon responding on dbus interface. Here, - module-console-kit would fail to initialize, preventing daemon from starting. - - Make module-console-kit an optional build feature to allow opt-out. - - Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/719> - -diff --git a/meson.build b/meson.build -index d4cdbd6a5..c6db7e670 100644 ---- a/meson.build -+++ b/meson.build -@@ -732,6 +732,10 @@ if get_option('daemon') - cdata.set('HAVE_SYSTEMD_LOGIN', 1) - endif - -+ if get_option('consolekit').enabled() -+ assert(dbus_dep.found(), 'ConsoleKit requires D-Bus support') -+ endif -+ - tcpwrap_dep = cc.find_library('wrap', required: get_option('tcpwrap')) - if cc.has_header('tcpd.h') and cc.has_function('hosts_access', dependencies : tcpwrap_dep) - cdata.set('HAVE_LIBWRAP', 1) -@@ -1001,6 +1005,7 @@ summary += [ - ' Enable HAL->udev compat: @0@'.format(get_option('hal-compat')), - 'Enable systemd units: @0@'.format(systemd_dep.found()), - 'Enable elogind: @0@'.format(libelogind_dep.found()), -+ 'Enable ConsoleKit: @0@'.format(not get_option('consolekit').disabled() and dbus_dep.found()), - 'Enable TCP Wrappers: @0@'.format(tcpwrap_dep.found()), - 'Enable OpenSSL (for Airtunes): @0@'.format(openssl_dep.found()), - 'Database: @0@'.format(get_option('database')), -diff --git a/meson_options.txt b/meson_options.txt -index b23210072..e7160a3a7 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -99,6 +99,9 @@ option('bluez5-native-headset', - option('bluez5-ofono-headset', - type : 'boolean', - description : 'Optional oFono headset backend support (BlueZ 5)') -+option('consolekit', -+ type : 'feature', value : 'auto', -+ description : 'Optional ConsoleKit support') - option('dbus', - type : 'feature', value : 'auto', - description : 'Optional D-Bus support') -diff --git a/src/modules/meson.build b/src/modules/meson.build -index cdf372c8e..1d8004300 100644 ---- a/src/modules/meson.build -+++ b/src/modules/meson.build -@@ -130,7 +130,6 @@ endif - - if dbus_dep.found() - all_modules += [ -- [ 'module-console-kit', 'module-console-kit.c', [], [], [dbus_dep] ], - [ 'module-dbus-protocol', - [ 'dbus/iface-card.c', 'dbus/iface-card.h', - 'dbus/iface-card-profile.c', 'dbus/iface-card-profile.h', -@@ -147,6 +146,12 @@ if dbus_dep.found() - [], [], [dbus_dep] ], - [ 'module-rygel-media-server', 'module-rygel-media-server.c', [], [], [dbus_dep], libprotocol_http ], - ] -+ -+ if not get_option('consolekit').disabled() -+ all_modules += [ -+ [ 'module-console-kit', 'module-console-kit.c', [], [], [dbus_dep] ], -+ ] -+ endif - endif - - if fftw_dep.found() diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-module-combine-sink-load-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-module-combine-sink-load-crash.patch deleted file mode 100644 index d02c1029f8b0..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-module-combine-sink-load-crash.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 37c72c20720d6f7fefeeb151f5e10c2cd0dda30e -Author: Igor V. Kovalenko <[email protected]> -Date: Sun Nov 27 22:30:45 2022 +0300 - - module-combine-sink: Do not set up rate adjustment timer at load time - - Rate adjustment timer is set up when combine sink is resumed and relased when - combine sink is suspended. Do not create this timer again while module is loaded - to prevent duplicate effort causing assertion in time_callback. - - Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/756> - -diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c -index f98f4820b..4b7690183 100644 ---- a/src/modules/module-combine-sink.c -+++ b/src/modules/module-combine-sink.c -@@ -1711,9 +1711,6 @@ int pa__init(pa_module*m) { - PA_IDXSET_FOREACH(o, u->outputs, idx) - output_verify(o); - -- if (u->adjust_time > 0) -- u->time_event = pa_core_rttime_new(m->core, pa_rtclock_now() + u->adjust_time, time_callback, u); -- - pa_modargs_free(ma); - - return 0; diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-module-combine-sink-unload-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-module-combine-sink-unload-crash.patch deleted file mode 100644 index f0cd82dde16e..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-module-combine-sink-unload-crash.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 0cbbc408aee2b5f2c42280d24dc615405387b5b1 -Author: Igor V. Kovalenko <[email protected]> -Date: Sun Nov 27 19:39:23 2022 +0300 - - module-combine-sink: Suspend while unloading to fix crash moving sinks - - Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/756> - -diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c -index 4b7690183..2ccd9eb13 100644 ---- a/src/modules/module-combine-sink.c -+++ b/src/modules/module-combine-sink.c -@@ -1733,6 +1733,9 @@ void pa__done(pa_module*m) { - if (!(u = m->userdata)) - return; - -+ if (u->sink && PA_SINK_IS_LINKED(u->sink->state)) -+ pa_sink_suspend(u->sink, true, PA_SUSPEND_UNAVAILABLE); -+ - pa_strlist_free(u->unlinked_slaves); - - if (u->sink_put_slot) diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-move-qpaeq-to-daemon.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-move-qpaeq-to-daemon.patch deleted file mode 100644 index d3943bf10a49..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-move-qpaeq-to-daemon.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 07a9fcefbab049d66cb174ca2c9b91fecc444c5b -Author: Igor V. Kovalenko <[email protected]> -Date: Sat Jul 9 09:12:38 2022 +0300 - - build-sys: meson: Move qpaeq to daemon build - - Equalizer control requires server modules only available when daemon is built. - Move qpaeq script to be installed together with daemon. - - Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/734> - -diff --git a/src/utils/meson.build b/src/utils/meson.build -index 28e1fc10a..8496d0bc5 100644 ---- a/src/utils/meson.build -+++ b/src/utils/meson.build -@@ -72,6 +72,10 @@ if get_option('daemon') - c_args : pa_c_args, - ) - endif -+ -+ if dbus_dep.found() and fftw_dep.found() -+ install_data('qpaeq', install_dir : bindir) -+ endif - endif - - if get_option('client') -@@ -117,9 +121,5 @@ if get_option('client') - ) - endif - -- if dbus_dep.found() and fftw_dep.found() -- install_data('qpaeq', install_dir : bindir) -- endif -- - install_data('pa-info', install_dir : bindir) - endif 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 deleted file mode 100644 index c7aa9d8aadbe..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.99.1-bump-c++17.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit e2b63d157fcc5ceb67a2f0eaed202d18baa05a11 -Author: Arun Raghavan <[email protected]> -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: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/795> - -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.1-r7.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r7.ebuild deleted file mode 100644 index 988e1aa60ae4..000000000000 --- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r7.ebuild +++ /dev/null @@ -1,387 +0,0 @@ -# Copyright 1999-2024 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 ~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?] - 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-debug/valgrind ) - webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) - 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.2 or later bump -PATCHES=( - "${FILESDIR}"/pulseaudio-16.0-optional-module-console-kit.patch - "${FILESDIR}"/pulseaudio-16.1-module-combine-sink-load-crash.patch - "${FILESDIR}"/pulseaudio-16.1-module-combine-sink-unload-crash.patch - "${FILESDIR}"/pulseaudio-16.1-move-qpaeq-to-daemon.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}"/etc/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 -} diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild deleted file mode 100644 index 5c11bc944e06..000000000000 --- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild +++ /dev/null @@ -1,385 +0,0 @@ -# Copyright 1999-2024 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 ~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-debug/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 -}
