commit: 54658a5b7647472f798ec8ab53e7be5f3e529bf6 Author: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com> AuthorDate: Fri Oct 6 08:35:25 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 6 12:05:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54658a5b
media-libs/libpulse: Backport memblock alignment fix Memblock alignment fix changes internal ABI, therefore patch and bump media-sound/pulseaudio-daemon together with media-libs/libpulse. Upstream commit 300db779224625144d6279d230c2daa857c967d8 While at it, add similar implementation change for sample rate detection affecting both places. Upstream commit 86c5fbab5778685e19b5a4a9b8eb04ca90dff780 Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> ...eaudio-16.1-add-more-standard-samplerates.patch | 35 ++ .../pulseaudio-16.1-fix-memblock-alignment.patch | 122 +++++++ media-libs/libpulse/libpulse-16.1-r3.ebuild | 4 +- ...eaudio-16.1-add-more-standard-samplerates.patch | 35 ++ .../pulseaudio-16.1-fix-memblock-alignment.patch | 122 +++++++ .../pulseaudio-daemon-16.1-r8.ebuild | 391 +++++++++++++++++++++ 6 files changed, 708 insertions(+), 1 deletion(-) diff --git a/media-libs/libpulse/files/pulseaudio-16.1-add-more-standard-samplerates.patch b/media-libs/libpulse/files/pulseaudio-16.1-add-more-standard-samplerates.patch new file mode 100644 index 000000000000..e1ea200c4c4c --- /dev/null +++ b/media-libs/libpulse/files/pulseaudio-16.1-add-more-standard-samplerates.patch @@ -0,0 +1,35 @@ +commit 86c5fbab5778685e19b5a4a9b8eb04ca90dff780 +Author: Igor V. Kovalenko <[email protected]> +Date: Sun Feb 5 19:49:10 2023 +0300 + + alsa-util: Add more standard sample rates. + + Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/776> + +diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c +index 9f35cb20f..fd30f18bd 100644 +--- a/src/modules/alsa/alsa-util.c ++++ b/src/modules/alsa/alsa-util.c +@@ -1430,7 +1430,8 @@ unsigned int *pa_alsa_get_supported_rates(snd_pcm_t *pcm, unsigned int fallback_ + 32000, 44100, 48000, + 64000, 88200, 96000, + 128000, 176400, 192000, +- 384000 }; ++ 352800, 384000, ++ 705600, 768000 }; + bool supported[PA_ELEMENTSOF(all_rates)] = { false, }; + snd_pcm_hw_params_t *hwparams; + unsigned int i, j, n, *rates = NULL; +diff --git a/src/pulse/sample.h b/src/pulse/sample.h +index 35346a865..65c0c5d6b 100644 +--- a/src/pulse/sample.h ++++ b/src/pulse/sample.h +@@ -128,7 +128,7 @@ PA_C_DECL_BEGIN + #define PA_CHANNELS_MAX 32U + + /** Maximum allowed sample rate */ +-#define PA_RATE_MAX (48000U*8U) ++#define PA_RATE_MAX (48000U*16U) + + /** Sample format */ + typedef enum pa_sample_format { diff --git a/media-libs/libpulse/files/pulseaudio-16.1-fix-memblock-alignment.patch b/media-libs/libpulse/files/pulseaudio-16.1-fix-memblock-alignment.patch new file mode 100644 index 000000000000..b05e530ac89d --- /dev/null +++ b/media-libs/libpulse/files/pulseaudio-16.1-fix-memblock-alignment.patch @@ -0,0 +1,122 @@ +commit 300db779224625144d6279d230c2daa857c967d8 +Author: Igor V. Kovalenko <[email protected]> +Date: Thu Feb 9 13:28:29 2023 +0300 + + pstream: Pass frame size to keep split memblock parts aligned + + `pa_pstream_send_memblock()` would split incoming memblock into parts not + exceeding maximum pool block size. + + To make sure split parts of memblock are still frame-aligned add new `align` arg + to `pa_pstream_send_memblock`, find out required alignment from stream sample + format and pass it there. Bump default alignment to 256 which is good up to + 32bit 64ch frames. + + Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/780> + +diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c +index 61f427bd3..ab094ba4e 100644 +--- a/src/modules/module-tunnel.c ++++ b/src/modules/module-tunnel.c +@@ -676,7 +676,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse + * IO thread context where the rest of the messages are + * dispatched. Yeah, ugly, but I am a lazy bastard. */ + +- pa_pstream_send_memblock(u->pstream, u->channel, 0, PA_SEEK_RELATIVE, chunk); ++ pa_pstream_send_memblock(u->pstream, u->channel, 0, PA_SEEK_RELATIVE, chunk, pa_frame_size(&u->sink->sample_spec)); + + u->receive_counter += chunk->length; + +diff --git a/src/pulse/stream.c b/src/pulse/stream.c +index 0aa627396..3585b27e8 100644 +--- a/src/pulse/stream.c ++++ b/src/pulse/stream.c +@@ -1535,7 +1535,7 @@ int pa_stream_write_ext_free( + s->write_memblock = NULL; + s->write_data = NULL; + +- pa_pstream_send_memblock(s->context->pstream, s->channel, offset, seek, &chunk); ++ pa_pstream_send_memblock(s->context->pstream, s->channel, offset, seek, &chunk, pa_frame_size(&s->sample_spec)); + pa_memblock_unref(chunk.memblock); + + } else { +@@ -1569,7 +1569,7 @@ int pa_stream_write_ext_free( + pa_memblock_release(chunk.memblock); + } + +- pa_pstream_send_memblock(s->context->pstream, s->channel, t_offset, t_seek, &chunk); ++ pa_pstream_send_memblock(s->context->pstream, s->channel, t_offset, t_seek, &chunk, pa_frame_size(&s->sample_spec)); + + t_offset = 0; + t_seek = PA_SEEK_RELATIVE; +diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c +index 672182fbc..1342dee10 100644 +--- a/src/pulsecore/protocol-native.c ++++ b/src/pulsecore/protocol-native.c +@@ -1260,7 +1260,7 @@ static void native_connection_send_memblock(pa_native_connection *c) { + if (schunk.length > r->buffer_attr.fragsize) + schunk.length = r->buffer_attr.fragsize; + +- pa_pstream_send_memblock(c->pstream, r->index, 0, PA_SEEK_RELATIVE, &schunk); ++ pa_pstream_send_memblock(c->pstream, r->index, 0, PA_SEEK_RELATIVE, &schunk, pa_memblockq_get_base(r->memblockq)); + + pa_memblockq_drop(r->memblockq, schunk.length); + pa_memblock_unref(schunk.memblock); +@@ -2535,7 +2535,7 @@ static void setup_srbchannel(pa_native_connection *c, pa_mem_type_t shm_type) { + mc.memblock = srbt.memblock; + mc.index = 0; + mc.length = pa_memblock_get_length(srbt.memblock); +- pa_pstream_send_memblock(c->pstream, 0, 0, 0, &mc); ++ pa_pstream_send_memblock(c->pstream, 0, 0, 0, &mc, 0); + + c->srbpending = srb; + return; +diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c +index 7147b776a..ff62f464b 100644 +--- a/src/pulsecore/pstream.c ++++ b/src/pulsecore/pstream.c +@@ -82,6 +82,10 @@ typedef uint32_t pa_pstream_descriptor[PA_PSTREAM_DESCRIPTOR_MAX]; + */ + #define FRAME_SIZE_MAX_ALLOW (1024*1024*16) + ++/* Default memblock alignment used with pa_pstream_send_memblock() ++ */ ++#define DEFAULT_PSTREAM_MEMBLOCK_ALIGN (256) ++ + PA_STATIC_FLIST_DECLARE(items, 0, pa_xfree); + + struct item_info { +@@ -475,7 +479,7 @@ void pa_pstream_send_packet(pa_pstream*p, pa_packet *packet, pa_cmsg_ancil_data + p->mainloop->defer_enable(p->defer_event, 1); + } + +-void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa_seek_mode_t seek_mode, const pa_memchunk *chunk) { ++void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa_seek_mode_t seek_mode, const pa_memchunk *chunk, size_t align) { + size_t length, idx; + size_t bsm; + +@@ -492,6 +496,11 @@ void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa + + bsm = pa_mempool_block_size_max(p->mempool); + ++ if (align == 0) ++ align = DEFAULT_PSTREAM_MEMBLOCK_ALIGN; ++ ++ bsm = (bsm / align) * align; ++ + while (length > 0) { + struct item_info *i; + size_t n; +diff --git a/src/pulsecore/pstream.h b/src/pulsecore/pstream.h +index 2bff270ad..88bdca4cc 100644 +--- a/src/pulsecore/pstream.h ++++ b/src/pulsecore/pstream.h +@@ -51,7 +51,7 @@ void pa_pstream_unlink(pa_pstream *p); + int pa_pstream_attach_memfd_shmid(pa_pstream *p, unsigned shm_id, int memfd_fd); + + void pa_pstream_send_packet(pa_pstream*p, pa_packet *packet, pa_cmsg_ancil_data *ancil_data); +-void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa_seek_mode_t seek, const pa_memchunk *chunk); ++void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa_seek_mode_t seek, const pa_memchunk *chunk, size_t align); + void pa_pstream_send_release(pa_pstream *p, uint32_t block_id); + void pa_pstream_send_revoke(pa_pstream *p, uint32_t block_id); + diff --git a/media-libs/libpulse/libpulse-16.1-r3.ebuild b/media-libs/libpulse/libpulse-16.1-r3.ebuild index 4668093c1a09..a67865f3948a 100644 --- a/media-libs/libpulse/libpulse-16.1-r3.ebuild +++ b/media-libs/libpulse/libpulse-16.1-r3.ebuild @@ -66,7 +66,7 @@ BDEPEND=" PDEPEND=" || ( media-video/pipewire[sound-server(+)] - media-sound/pulseaudio-daemon + >=media-sound/pulseaudio-daemon-16.1-r8 media-sound/pulseaudio[daemon(+)] ) " @@ -79,6 +79,8 @@ PATCHES=( "${FILESDIR}"/pulseaudio-16.1-proplist-util-without-gdkx.patch "${FILESDIR}"/pulseaudio-16.1-smoother-start-paused.patch "${FILESDIR}"/pulseaudio-16.1-smoother-time-calculation.patch + "${FILESDIR}"/pulseaudio-16.1-fix-memblock-alignment.patch + "${FILESDIR}"/pulseaudio-16.1-add-more-standard-samplerates.patch ) src_prepare() { diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-add-more-standard-samplerates.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-add-more-standard-samplerates.patch new file mode 100644 index 000000000000..e1ea200c4c4c --- /dev/null +++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-add-more-standard-samplerates.patch @@ -0,0 +1,35 @@ +commit 86c5fbab5778685e19b5a4a9b8eb04ca90dff780 +Author: Igor V. Kovalenko <[email protected]> +Date: Sun Feb 5 19:49:10 2023 +0300 + + alsa-util: Add more standard sample rates. + + Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/776> + +diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c +index 9f35cb20f..fd30f18bd 100644 +--- a/src/modules/alsa/alsa-util.c ++++ b/src/modules/alsa/alsa-util.c +@@ -1430,7 +1430,8 @@ unsigned int *pa_alsa_get_supported_rates(snd_pcm_t *pcm, unsigned int fallback_ + 32000, 44100, 48000, + 64000, 88200, 96000, + 128000, 176400, 192000, +- 384000 }; ++ 352800, 384000, ++ 705600, 768000 }; + bool supported[PA_ELEMENTSOF(all_rates)] = { false, }; + snd_pcm_hw_params_t *hwparams; + unsigned int i, j, n, *rates = NULL; +diff --git a/src/pulse/sample.h b/src/pulse/sample.h +index 35346a865..65c0c5d6b 100644 +--- a/src/pulse/sample.h ++++ b/src/pulse/sample.h +@@ -128,7 +128,7 @@ PA_C_DECL_BEGIN + #define PA_CHANNELS_MAX 32U + + /** Maximum allowed sample rate */ +-#define PA_RATE_MAX (48000U*8U) ++#define PA_RATE_MAX (48000U*16U) + + /** Sample format */ + typedef enum pa_sample_format { diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-fix-memblock-alignment.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-fix-memblock-alignment.patch new file mode 100644 index 000000000000..b05e530ac89d --- /dev/null +++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.1-fix-memblock-alignment.patch @@ -0,0 +1,122 @@ +commit 300db779224625144d6279d230c2daa857c967d8 +Author: Igor V. Kovalenko <[email protected]> +Date: Thu Feb 9 13:28:29 2023 +0300 + + pstream: Pass frame size to keep split memblock parts aligned + + `pa_pstream_send_memblock()` would split incoming memblock into parts not + exceeding maximum pool block size. + + To make sure split parts of memblock are still frame-aligned add new `align` arg + to `pa_pstream_send_memblock`, find out required alignment from stream sample + format and pass it there. Bump default alignment to 256 which is good up to + 32bit 64ch frames. + + Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/780> + +diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c +index 61f427bd3..ab094ba4e 100644 +--- a/src/modules/module-tunnel.c ++++ b/src/modules/module-tunnel.c +@@ -676,7 +676,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse + * IO thread context where the rest of the messages are + * dispatched. Yeah, ugly, but I am a lazy bastard. */ + +- pa_pstream_send_memblock(u->pstream, u->channel, 0, PA_SEEK_RELATIVE, chunk); ++ pa_pstream_send_memblock(u->pstream, u->channel, 0, PA_SEEK_RELATIVE, chunk, pa_frame_size(&u->sink->sample_spec)); + + u->receive_counter += chunk->length; + +diff --git a/src/pulse/stream.c b/src/pulse/stream.c +index 0aa627396..3585b27e8 100644 +--- a/src/pulse/stream.c ++++ b/src/pulse/stream.c +@@ -1535,7 +1535,7 @@ int pa_stream_write_ext_free( + s->write_memblock = NULL; + s->write_data = NULL; + +- pa_pstream_send_memblock(s->context->pstream, s->channel, offset, seek, &chunk); ++ pa_pstream_send_memblock(s->context->pstream, s->channel, offset, seek, &chunk, pa_frame_size(&s->sample_spec)); + pa_memblock_unref(chunk.memblock); + + } else { +@@ -1569,7 +1569,7 @@ int pa_stream_write_ext_free( + pa_memblock_release(chunk.memblock); + } + +- pa_pstream_send_memblock(s->context->pstream, s->channel, t_offset, t_seek, &chunk); ++ pa_pstream_send_memblock(s->context->pstream, s->channel, t_offset, t_seek, &chunk, pa_frame_size(&s->sample_spec)); + + t_offset = 0; + t_seek = PA_SEEK_RELATIVE; +diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c +index 672182fbc..1342dee10 100644 +--- a/src/pulsecore/protocol-native.c ++++ b/src/pulsecore/protocol-native.c +@@ -1260,7 +1260,7 @@ static void native_connection_send_memblock(pa_native_connection *c) { + if (schunk.length > r->buffer_attr.fragsize) + schunk.length = r->buffer_attr.fragsize; + +- pa_pstream_send_memblock(c->pstream, r->index, 0, PA_SEEK_RELATIVE, &schunk); ++ pa_pstream_send_memblock(c->pstream, r->index, 0, PA_SEEK_RELATIVE, &schunk, pa_memblockq_get_base(r->memblockq)); + + pa_memblockq_drop(r->memblockq, schunk.length); + pa_memblock_unref(schunk.memblock); +@@ -2535,7 +2535,7 @@ static void setup_srbchannel(pa_native_connection *c, pa_mem_type_t shm_type) { + mc.memblock = srbt.memblock; + mc.index = 0; + mc.length = pa_memblock_get_length(srbt.memblock); +- pa_pstream_send_memblock(c->pstream, 0, 0, 0, &mc); ++ pa_pstream_send_memblock(c->pstream, 0, 0, 0, &mc, 0); + + c->srbpending = srb; + return; +diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c +index 7147b776a..ff62f464b 100644 +--- a/src/pulsecore/pstream.c ++++ b/src/pulsecore/pstream.c +@@ -82,6 +82,10 @@ typedef uint32_t pa_pstream_descriptor[PA_PSTREAM_DESCRIPTOR_MAX]; + */ + #define FRAME_SIZE_MAX_ALLOW (1024*1024*16) + ++/* Default memblock alignment used with pa_pstream_send_memblock() ++ */ ++#define DEFAULT_PSTREAM_MEMBLOCK_ALIGN (256) ++ + PA_STATIC_FLIST_DECLARE(items, 0, pa_xfree); + + struct item_info { +@@ -475,7 +479,7 @@ void pa_pstream_send_packet(pa_pstream*p, pa_packet *packet, pa_cmsg_ancil_data + p->mainloop->defer_enable(p->defer_event, 1); + } + +-void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa_seek_mode_t seek_mode, const pa_memchunk *chunk) { ++void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa_seek_mode_t seek_mode, const pa_memchunk *chunk, size_t align) { + size_t length, idx; + size_t bsm; + +@@ -492,6 +496,11 @@ void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa + + bsm = pa_mempool_block_size_max(p->mempool); + ++ if (align == 0) ++ align = DEFAULT_PSTREAM_MEMBLOCK_ALIGN; ++ ++ bsm = (bsm / align) * align; ++ + while (length > 0) { + struct item_info *i; + size_t n; +diff --git a/src/pulsecore/pstream.h b/src/pulsecore/pstream.h +index 2bff270ad..88bdca4cc 100644 +--- a/src/pulsecore/pstream.h ++++ b/src/pulsecore/pstream.h +@@ -51,7 +51,7 @@ void pa_pstream_unlink(pa_pstream *p); + int pa_pstream_attach_memfd_shmid(pa_pstream *p, unsigned shm_id, int memfd_fd); + + void pa_pstream_send_packet(pa_pstream*p, pa_packet *packet, pa_cmsg_ancil_data *ancil_data); +-void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa_seek_mode_t seek, const pa_memchunk *chunk); ++void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa_seek_mode_t seek, const pa_memchunk *chunk, size_t align); + void pa_pstream_send_release(pa_pstream *p, uint32_t block_id); + void pa_pstream_send_revoke(pa_pstream *p, uint32_t block_id); + diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r8.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r8.ebuild new file mode 100644 index 000000000000..44c1c3c46161 --- /dev/null +++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1-r8.ebuild @@ -0,0 +1,391 @@ +# 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.1-r3 + 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-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 + # alignment fix changes internal abi, added requirement matching >=media-libs/libpulse-16.1-r3 + "${FILESDIR}"/pulseaudio-16.1-fix-memblock-alignment.patch + "${FILESDIR}"/pulseaudio-16.1-add-more-standard-samplerates.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 +}
