From 100ce16c6fb75a4911f388aa77f860324607c869 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 31 Jul 2022 09:12:05 +0100 Subject: gentoo auto-resync : 31:07:2022 - 09:12:04 --- media-sound/pulseaudio-daemon/Manifest | 8 +- ...udio-16.0-fix-combine-sink-underrun-crash.patch | 72 ---- ...io-16.0-fix-gstreamer-bluetooth-arm-crash.patch | 43 --- ...pulseaudio-16.0-fix-pacmd-play-file-crash.patch | 42 --- ...lseaudio-16.0-fix-rtp-receiver-sdp-record.patch | 26 -- .../pulseaudio-daemon-16.0-r4.ebuild | 388 -------------------- .../pulseaudio-daemon-16.0-r5.ebuild | 396 --------------------- .../pulseaudio-daemon-16.1.ebuild | 2 +- 8 files changed, 2 insertions(+), 975 deletions(-) delete mode 100644 media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch delete mode 100644 media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch delete mode 100644 media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch delete mode 100644 media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch delete mode 100644 media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild delete mode 100644 media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild (limited to 'media-sound/pulseaudio-daemon') diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest index 88ac881b6238..37224609f392 100644 --- a/media-sound/pulseaudio-daemon/Manifest +++ b/media-sound/pulseaudio-daemon/Manifest @@ -1,8 +1,4 @@ AUX enable-autospawn.conf 65 BLAKE2B 47e57076b19000ca3c57f0368e453198131c41a5a9c2d0cc8632f0a7ed4e5c992cf93e3c7651c4f3b59ceaf177d4d811bd6774676a2b005ec12259e56d99b4d2 SHA512 61f90b0d19e807a672bd39d190c1102db0b8c46284cf09d4a19b4b96d566633e56a60d21a3a1374e447e8e06496a3aef56bf5ae574337c081e7cf18842458e59 -AUX pulseaudio-16.0-fix-combine-sink-underrun-crash.patch 3707 BLAKE2B 798774fd8c290aaea996e3caee0faca591ae7ec691d485ee365b908e45e6ad596277d34d10090be9366b7bf077a51e7e9f7dbeab362853d419a96fd0ab65af07 SHA512 b604cd1e04832c617e1575bddf237abf6896b340f80c0616736d055892b42aa9665ad5bd2796869bc1eedcfc0d632aa4956fcaed4b4e89bee7eeb5ce60ad1cf1 -AUX pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch 1448 BLAKE2B 63ddbc36e3ac2ee553f6f30975886c2488e7d9889c3969b7110a75c24edc92eedf5c8c7be01130546fd67e7d71aaf7cf6b8b3842d2003b968d062fbe12b61f7b SHA512 7ff462e32e3218df28733af1abfab1f38173d48b458c0cab8b1f6aba0b7c5cd8479aaca52f0e25a1e4c71340e378c5a4b8bbd1c6613b979057d3dab035b5708f -AUX pulseaudio-16.0-fix-pacmd-play-file-crash.patch 1625 BLAKE2B 5dbe6d24e0faf0152d6088244571c63d51392ab488e0b2ac47ad9a0a2fdb8f0c342824315b7be0916bde69af0911a6be02ad43e6369b5fcf1ad5cb3cb2fe88f6 SHA512 3cdbf444245229be7cb643c03d555cf7d7d5f8ba3bb608a72f27b660dc90413478681258d6226063c946cc783f48863994cc77709cb0f82b61a27dd01cb15305 -AUX pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch 1025 BLAKE2B 33b8aa51c966a0716fd9c15c51903e74b760bc72eaf511e9a86182155c6e9e5e6e1b8eb9af40cf7da023de25e1f74a2428d74954c230c53bc61c42e53033a9c2 SHA512 9e573806494b0e8d3aa51db205457e5c63326cb81fe5a2801b0e66b2b49c3133b30c85feafd0b58a64b5949cbc9e29e599459b76cbf5f479281ad8aa5c5bbb5e AUX pulseaudio-16.0-optional-module-console-kit.patch 3077 BLAKE2B 3b8abc67478f6c8848a24788bdceeb5bce868bf5214a092c3abbd39a3102679e4b390e56231de0559c8389730a2a75ba21bf4d9f9d942792589c6db66d6eb04d SHA512 bec1a747593d9130bb8cfb05b0894e467c953264879f2a856a420b07ee688640ec2279c136daa825b21e0e7e3bfc3aa1e333487a776d1c7ffb9a6d0293a0502b AUX pulseaudio.conf.d 151 BLAKE2B 99b185b9353259f37f3396c6f2bb56b80cac0159c9c5d06af4b298ad71d9c577dd6b3f0d9097fc95184b14193d0d55252987465ebd93bd0005849a68ce9b428d SHA512 f97ed431e371e43d297b099952bf1e897b243a822183524b8e3ea17e888c08590bb3793e195bc22e3254eae7f2e1fa00204a752638746c4dde825a423f08c24b AUX pulseaudio.init.d-5 2224 BLAKE2B d7710b77b209391016e9f84b574cdf70636904d7f54caf9297357ebee97e8ae10c54119521ecad99fbef5f1ad341128b06816f8c733faa29d9c44fa8c435008b SHA512 a11d02fd1c6672a7f022e6ef3e3ad8e3a7f2bf50257c38573db0823415c990021a7bf29b1e194d3d9c8a59464673958604086ef519313a4e3a6bd79071397f29 @@ -11,7 +7,5 @@ AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f90 DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66ff9fed1e1b0d2d03e238796d9d04bc1fc27215b02fdded37441da1747be23d1e03d5a00b79ee3b91eb35c0f76a470 SHA512 42d4968c2dc88f5e39a5358d124e399e40a5abdf815eff387087141bc9dddd217012acb35649a8e0e24a44e8a402d90eb193ce2eef186f7d59550f757a6cc26d DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f EBUILD pulseaudio-daemon-16.0-r1.ebuild 11997 BLAKE2B 7af693e228ee587a7ffa5120bbd788ebf9b779e7fdc9550b04b6706e200a9bf036834fd7eb7ee461b1a62a2f9ca4ac56abdab78dd3b61d78a609629fcac05e8e SHA512 fb36604ef31b93b4077bd809e4edb2697e511eecd62bb029ffb67bf2f2ed8e14fef6f61cc6356a7d5e816586efdf0d4eac121896808610952c92fd43beac9e5f -EBUILD pulseaudio-daemon-16.0-r4.ebuild 11990 BLAKE2B 96115d8d74d47d52246a81fd965e22ef10d505f1d9276168c193269e27b7b8af53b152a8f3b7bf26ab21c053aaf0d8007568cfc7b48afc24a8c064a1524c7c91 SHA512 a6b10c7fdce24b4857be63dc00b377357927581f01ee7b5a5186036970e3ccaafa6d856f954582c42e9e56d136c6326f43268ebd772b5e5c22c23ab7bc9d9bba -EBUILD pulseaudio-daemon-16.0-r5.ebuild 12411 BLAKE2B 1e8ed59be58201cc876f735827e32ab24141a6c0b2a677bd6c641a125ad9539138fc0b65f47b67928a281e80c0ff90a7b1a766aedadd85a033a34d18eba56db5 SHA512 2cc8cb215a11982feccec978c84d754ae7ad4f3e40e7febc5efacc4660d0e7d58a53c8b8bc4f77efb40223321c2219127fd17a52b5396efde81683dd2660f679 -EBUILD pulseaudio-daemon-16.1.ebuild 12180 BLAKE2B 3b07483a71a89f5d720cfb4a3201462f7bcab2d93a2374829280025f6579d1870a60db7e2ab368a0f36ce82128042584156f57eaeb4fffb2f37b8733d4e10da6 SHA512 f2c5bc031f011d04f57c4c98999b0f740aa2f1c1713b07530c729f2d795b17535b4cad24ae26189fe0782c7d242988774be0191a0b5571229e8a46ff400a73c5 +EBUILD pulseaudio-daemon-16.1.ebuild 12176 BLAKE2B 9191d042a854771890e77a7824365f10c84d4a3fb96d755ec19d4ee63b4074b725712ca4ee48a45453fd59ed931438bf2e88a9b835acbf15bbf5947beade2a51 SHA512 301dad95a0ce492684dddca6d1b4700e1e2dd4a9c607e26fd802cb63f2685748c68848d43aaeaed050897208ad3e83858ffab47a61f90856397fb6d60eabac0e MISC metadata.xml 3570 BLAKE2B 24d7b24a68f5e832708d9879769f55ec4cf146c47a41b5fa0ff33f63a5a9945736e227c6a6afa106f964fd91eb3b0ee441203c92f312ed835ef2197979b6fda9 SHA512 34aa5503ad5483eeff2f7c4713d96322dedbdd56b7d52a17ba0658aba24aef58239d5ee1943a276555c2508fd3d5e18639ec6417044adad512693fa6c673c5df diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch deleted file mode 100644 index d66d75afdfda..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch +++ /dev/null @@ -1,72 +0,0 @@ -https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ee8bfb49adddd271d8a8cafa796c6f9fa84de48a - -From ee8bfb49adddd271d8a8cafa796c6f9fa84de48a Mon Sep 17 00:00:00 2001 -From: Georg Chini -Date: Fri, 17 Jun 2022 13:11:11 +0200 -Subject: [PATCH] combine-sink: Fix threading issue during underrun - -A recent commit added i->origin sink for the sink inputs of the combine sinks. -Therefore pa_sink_process_input_underruns() treated the combine sink like -filter sinks. pa_sink_process_input_underruns() calls itself with the -origin sink, which is only correct for filter sinks because they run in the -thread context of the origin sink. The combine sink however has its own -thread context, so pa_sink_process_input_underruns() was executed in the -wrong context. -This patch fixes the issue by skipping the section for module-combine-sink. - -Part-of: ---- - src/pulsecore/sink.c | 37 +++++++++++++++++++++++-------------- - 1 file changed, 23 insertions(+), 14 deletions(-) - -diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c -index 3108ae765..0f0dc56fc 100644 ---- a/src/pulsecore/sink.c -+++ b/src/pulsecore/sink.c -@@ -1016,20 +1016,29 @@ size_t pa_sink_process_input_underruns(pa_sink *s, size_t left_to_play) { - if (i->origin_sink) { - size_t filter_result, left_to_play_origin; - -- /* The recursive call works in the origin sink domain ... */ -- left_to_play_origin = pa_convert_size(left_to_play, &i->sink->sample_spec, &i->origin_sink->sample_spec); -- -- /* .. and returns the time to sleep before waking up. We need the -- * underrun duration for comparisons, so we undo the subtraction on -- * the return value... */ -- filter_result = left_to_play_origin - pa_sink_process_input_underruns(i->origin_sink, left_to_play_origin); -- -- /* ... and convert it back to the master sink domain */ -- filter_result = pa_convert_size(filter_result, &i->origin_sink->sample_spec, &i->sink->sample_spec); -- -- /* Remember the longest underrun so far */ -- if (filter_result > result) -- result = filter_result; -+ /* The combine sink sets i->origin sink but has a different threading model -+ * than the filter sinks. Therefore the recursion below may not be executed -+ * because pa_sink_process_input_underruns() was not called in the thread -+ * context of the origin sink. -+ * FIXME: It is unclear if some other kind of recursion would be necessary -+ * for the combine sink. */ -+ if (!i->module || !pa_safe_streq(i->module->name, "module-combine-sink")) { -+ -+ /* The recursive call works in the origin sink domain ... */ -+ left_to_play_origin = pa_convert_size(left_to_play, &i->sink->sample_spec, &i->origin_sink->sample_spec); -+ -+ /* .. and returns the time to sleep before waking up. We need the -+ * underrun duration for comparisons, so we undo the subtraction on -+ * the return value... */ -+ filter_result = left_to_play_origin - pa_sink_process_input_underruns(i->origin_sink, left_to_play_origin); -+ -+ /* ... and convert it back to the master sink domain */ -+ filter_result = pa_convert_size(filter_result, &i->origin_sink->sample_spec, &i->sink->sample_spec); -+ -+ /* Remember the longest underrun so far */ -+ if (filter_result > result) -+ result = filter_result; -+ } - } - - if (uf == 0) { --- -GitLab - diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch deleted file mode 100644 index a2efaf37b381..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/dd4dc5e8bce2c03631c3613dbddee1a691bdd17d - -From dd4dc5e8bce2c03631c3613dbddee1a691bdd17d Mon Sep 17 00:00:00 2001 -From: Jan Palus -Date: Fri, 17 Jun 2022 14:36:36 +0200 -Subject: [PATCH] bluetooth/gst: Correct var type for GST_TYPE_BITMASK - -GST_TYPE_BITMASK is 64-bit bit mask while corresponding channel_mask in -pulseaudio is int therefore usually 32-bit. Switch to uint64_t instead -to match internal representation in gstreamer. - -Fixes pulseaudio crash on ARM 32-bit when pulseaudio is compiled with -gstreamer and either LDAC or aptX support is available. - -Part-of: ---- - src/modules/bluetooth/a2dp-codec-gst.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/modules/bluetooth/a2dp-codec-gst.c b/src/modules/bluetooth/a2dp-codec-gst.c -index 8ef74be9c..11839c580 100644 ---- a/src/modules/bluetooth/a2dp-codec-gst.c -+++ b/src/modules/bluetooth/a2dp-codec-gst.c -@@ -22,6 +22,7 @@ - #endif - - #include -+#include - - #include - #include -@@ -82,7 +83,7 @@ fail: - static GstCaps *gst_create_caps_from_sample_spec(const pa_sample_spec *ss) { - gchar *sample_format; - GstCaps *caps; -- int channel_mask; -+ uint64_t channel_mask; - - switch (ss->format) { - case PA_SAMPLE_S16LE: --- -GitLab - diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch deleted file mode 100644 index f9c044dbb2be..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/a8a2a31408c4acf54530d65922d235d3e590ce05 - -From a8a2a31408c4acf54530d65922d235d3e590ce05 Mon Sep 17 00:00:00 2001 -From: Jaechul Lee -Date: Thu, 2 Jun 2022 15:07:09 +0900 -Subject: [PATCH] sound-file-stream: Fix crash when playing a file which is not - aligned - -pulseaudio crash occurred when I play a file using pacmd play-file command. -The file is not aligned with its frame size and the last rendering size -is also not aligned. Thus, an assertion was generated at the end of the -file as the following. - -memblockq.c: Assertion 'uchunk->length % bq->base == 0' failed at -../src/pulsecore/memblockq.c:288, function pa_memblockq_push(). Aborting. - -When I play the file using paplay, it works good. So, I changed to -pa_memblockq_push_align instead of pa_memblockq_push to prevent the -assertion. - -Signed-off-by: Jaechul Lee -Part-of: ---- - src/pulsecore/sound-file-stream.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pulsecore/sound-file-stream.c b/src/pulsecore/sound-file-stream.c -index 147aa2288..255f4b61a 100644 ---- a/src/pulsecore/sound-file-stream.c -+++ b/src/pulsecore/sound-file-stream.c -@@ -185,7 +185,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t length, pa_memchunk *chunk - - tchunk.length = (size_t) n * fs; - -- pa_memblockq_push(u->memblockq, &tchunk); -+ pa_memblockq_push_align(u->memblockq, &tchunk); - pa_memblock_unref(tchunk.memblock); - } - --- -GitLab - diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch deleted file mode 100644 index 3d72b9a009c4..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit d7a633df899dda8738a30df318269e28c902e815 -Author: Igor V. Kovalenko -Date: Mon Jun 13 21:38:08 2022 +0300 - - rtp: Initialize SDP info struct field added for OPUS - - Turned out that pa_sdp_info::enable_opus is never initialized, which seldom - makes module-rtp-recv believe it will be playing OPUS-encoded stream even though - discovered SDP record does not indicate OPUS codec in metadata. - - Fix this by adding missing initializer. - - Part-of: - -diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c -index 4e6a442f8..bf131a27e 100644 ---- a/src/modules/rtp/sdp.c -+++ b/src/modules/rtp/sdp.c -@@ -129,6 +129,7 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) { - i->origin = i->session_name = NULL; - i->salen = 0; - i->payload = 255; -+ i->enable_opus = false; - - if (pa_startswith(t, PA_SDP_HEADER)) { - t += sizeof(PA_SDP_HEADER) - 1; diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild deleted file mode 100644 index 8c47aaf30579..000000000000 --- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r4.ebuild +++ /dev/null @@ -1,388 +0,0 @@ -# Copyright 1999-2022 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="A networked sound server with an advanced plugin system" -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?] - dev-libs/libatomic_ops - >=media-libs/libsndfile-1.0.20 - >=media-libs/speexdsp-1.2 - || ( - elibc_glibc? ( virtual/libc ) - dev-libs/libpcre:3 - ) - 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 ) - 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] ) - ! "${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 equalizer; then - elog "You will need to load some extra modules to make qpaeq work." - elog "You can do that by adding the following two lines in" - elog "/etc/pulse/default.pa and restarting pulseaudio:" - elog "load-module module-equalizer-sink" - elog "load-module module-dbus-protocol" - 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 "using the qpaeq script" dev-python/PyQt5[dbus,widgets] - 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.0-r5.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild deleted file mode 100644 index 66f340cd76f7..000000000000 --- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild +++ /dev/null @@ -1,396 +0,0 @@ -# Copyright 1999-2022 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?] - dev-libs/libatomic_ops - >=media-libs/libsndfile-1.0.20 - >=media-libs/speexdsp-1.2 - || ( - elibc_glibc? ( virtual/libc ) - dev-libs/libpcre:3 - ) - 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 ) - 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] ) - ! "${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 equalizer; then - elog "You will need to load some extra modules to make qpaeq work." - elog "You can do that by adding the following two lines in" - elog "/etc/pulse/default.pa and restarting pulseaudio:" - elog "load-module module-equalizer-sink" - elog "load-module module-dbus-protocol" - 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 "using the qpaeq script" dev-python/PyQt5[dbus,widgets] - 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.1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild index 34f4f0f82566..706fa7f66af7 100644 --- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild +++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" fi S="${WORKDIR}/${MY_P}" -- cgit v1.2.3