* [gentoo-commits] repo/gentoo:master commit in: media-libs/libpulse/files/, media-libs/libpulse/
@ 2022-11-29 7:13 Mart Raudsepp
0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2022-11-29 7:13 UTC (permalink / raw
To: gentoo-commits
commit: 72f37fd76e4295b8cddc76026a9017cee85d5deb
Author: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com>
AuthorDate: Thu Nov 24 22:06:36 2022 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 07:09:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f37fd7
media-libs/libpulse: Clean up memfd on exec
Upstream commit e650c2b33e4fefc0589751b3958bd3b5d3b423ac
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28421
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../files/pulseaudio-16.1-memfd-cleanup.patch | 28 +++
media-libs/libpulse/libpulse-16.1-r2.ebuild | 208 +++++++++++++++++++++
2 files changed, 236 insertions(+)
diff --git a/media-libs/libpulse/files/pulseaudio-16.1-memfd-cleanup.patch b/media-libs/libpulse/files/pulseaudio-16.1-memfd-cleanup.patch
new file mode 100644
index 000000000000..b24ab8943899
--- /dev/null
+++ b/media-libs/libpulse/files/pulseaudio-16.1-memfd-cleanup.patch
@@ -0,0 +1,28 @@
+commit e650c2b33e4fefc0589751b3958bd3b5d3b423ac
+Author: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Thu Nov 3 09:22:48 2022 +1100
+
+ Ensure fds are closed when exec functions are used.
+
+ When usng shm_open, FD_CLOEXEC is set explicitly.
+
+ However when using memfd_create, we must pass the MFD_CLOEXEC flag
+ to ensure the same fcntl value (FD_CLOEXEC) is set.
+
+ Fixes #1394
+
+ Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/751>
+
+diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c
+index e464f6bce..ff54dcb59 100644
+--- a/src/pulsecore/shm.c
++++ b/src/pulsecore/shm.c
+@@ -164,7 +164,7 @@ static int sharedmem_create(pa_shm *m, pa_mem_type_t type, size_t size, mode_t m
+ #endif
+ #ifdef HAVE_MEMFD
+ case PA_MEM_TYPE_SHARED_MEMFD:
+- fd = memfd_create("pulseaudio", MFD_ALLOW_SEALING);
++ fd = memfd_create("pulseaudio", MFD_ALLOW_SEALING|MFD_CLOEXEC);
+ break;
+ #endif
+ default:
diff --git a/media-libs/libpulse/libpulse-16.1-r2.ebuild b/media-libs/libpulse/libpulse-16.1-r2.ebuild
new file mode 100644
index 000000000000..773e74668690
--- /dev/null
+++ b/media-libs/libpulse/libpulse-16.1-r2.ebuild
@@ -0,0 +1,208 @@
+# 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-multilib optfeature systemd udev
+
+DESCRIPTION="Libraries for PulseAudio clients"
+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}"
+
+LICENSE="LGPL-2.1+"
+
+SLOT="0"
+IUSE="+asyncns dbus doc +glib gtk selinux systemd test valgrind X"
+RESTRICT="!test? ( test )"
+
+# NOTE: libpcre needed in some cases, bug #472228
+# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
+RDEPEND="
+ dev-libs/libatomic_ops
+ >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+ virtual/libc
+ asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] )
+ dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] )
+ elibc_mingw? ( dev-libs/libpcre:3 )
+ glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] )
+ gtk? ( x11-libs/gtk+:3 )
+ selinux? ( sec-policy/selinux-pulseaudio )
+ systemd? ( sys-apps/systemd:= )
+ valgrind? ( dev-util/valgrind )
+ X? (
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+ )
+ !<media-sound/pulseaudio-15.0-r100
+"
+
+DEPEND="${RDEPEND}
+ test? ( >=dev-libs/check-0.9.10 )
+ X? ( x11-base/xorg-proto )
+"
+
+# pulseaudio ships a bundled xmltoman, which uses XML::Parser
+BDEPEND="
+ dev-lang/perl
+ dev-perl/XML-Parser
+ sys-devel/gettext
+ sys-devel/m4
+ virtual/libiconv
+ virtual/libintl
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+PDEPEND="
+ || (
+ media-video/pipewire[sound-server(+)]
+ media-sound/pulseaudio-daemon
+ media-sound/pulseaudio[daemon(+)]
+ )
+"
+
+DOCS=( NEWS README )
+
+# patches merged upstream, to be removed with 16.2 or later bump
+PATCHES=(
+ "${FILESDIR}"/pulseaudio-16.1-memfd-cleanup.patch
+)
+
+src_prepare() {
+ default
+
+ # disable autospawn by client
+ sed -i -e 's:; autospawn = yes:autospawn = no:g' src/pulse/client.conf.in || die
+
+ gnome2_environment_reset
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ --localstatedir="${EPREFIX}"/var
+
+ -Ddaemon=false
+ -Dclient=true
+ $(meson_native_use_bool doc doxygen)
+ -Dgcov=false
+ # tests involve random modules, so just do them for the native # TODO: tests should run always
+ $(meson_native_use_bool test tests)
+ -Ddatabase=simple # Not used for non-daemon, simple database avoids external dep checks
+ -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
+ -Dalsa=disabled
+ $(meson_feature asyncns)
+ -Davahi=disabled
+ -Dbluez5=disabled
+ -Dbluez5-gstreamer=disabled
+ -Dbluez5-native-headset=false
+ -Dbluez5-ofono-headset=false
+ $(meson_feature dbus)
+ -Delogind=disabled
+ -Dfftw=disabled
+ $(meson_feature glib) # WARNING: toggling this likely changes ABI
+ -Dgsettings=disabled
+ -Dgstreamer=disabled
+ $(meson_native_use_feature gtk)
+ -Dhal-compat=false
+ -Dipv6=true
+ -Djack=disabled
+ -Dlirc=disabled
+ -Dopenssl=disabled
+ -Dorc=disabled
+ -Doss-output=disabled
+ -Dsamplerate=disabled # Matches upstream
+ -Dsoxr=disabled
+ -Dspeex=disabled
+ $(meson_native_use_feature systemd)
+ -Dtcpwrap=disabled
+ -Dudev=disabled
+ $(meson_native_use_feature valgrind)
+ $(meson_feature X x11)
+
+ # Echo cancellation
+ -Dadrian-aec=false
+ -Dwebrtc-aec=disabled
+ )
+
+ if multilib_is_native_abi; then
+ # Make padsp work for non-native ABI, supposedly only possible with glibc;
+ # this is used by /usr/bin/padsp that comes from native build, thus we need
+ # this argument for native build
+ if use elibc_glibc; then
+ emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
+ fi
+ else
+ emesonargs+=( -Dman=false )
+ if ! use elibc_glibc; then
+ # Non-glibc multilib is probably non-existent but just in case:
+ ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
+ fi
+ fi
+
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+
+ if multilib_is_native_abi; then
+ if use doc; then
+ einfo "Generating documentation ..."
+ meson_src_compile doxygen
+ fi
+ fi
+}
+
+multilib_src_install() {
+ # The files referenced in the DOCS array do not exist in the multilib source directory,
+ # therefore clear the variable when calling the function that will access it.
+ DOCS= meson_src_install
+
+ # 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)
+ bashcomp_alias pactl pulseaudio
+ bashcomp_alias pactl pacmd
+ bashcomp_alias pactl pasuspender
+
+ if multilib_is_native_abi; then
+ if use doc; then
+ einfo "Installing documentation ..."
+ docinto html
+ dodoc -r doxygen/html/.
+ fi
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+ optfeature_header "PulseAudio can be enhanced by installing the following:"
+ use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libpulse/files/, media-libs/libpulse/
@ 2023-10-06 12:09 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-10-06 12:09 UTC (permalink / raw
To: gentoo-commits
commit: cf0e9903a054aff5c703d3c0e465a8e7610c3ca0
Author: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com>
AuthorDate: Fri Oct 6 08:35:12 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=cf0e9903
media-libs/libpulse: Backport smoother fixes to 16.1
Upstream commits:
8fe50bbc31e11abf2f30864f1e2dbdaa16d0e1c3
c3eae5d00cb79bd897049483126e75bb48a69cd1
Closes: https://bugs.gentoo.org/914882
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../pulseaudio-16.1-smoother-start-paused.patch | 26 +++++++++++++++++++++
...pulseaudio-16.1-smoother-time-calculation.patch | 27 ++++++++++++++++++++++
media-libs/libpulse/libpulse-16.1-r3.ebuild | 2 ++
3 files changed, 55 insertions(+)
diff --git a/media-libs/libpulse/files/pulseaudio-16.1-smoother-start-paused.patch b/media-libs/libpulse/files/pulseaudio-16.1-smoother-start-paused.patch
new file mode 100644
index 000000000000..3f0acbc8f95e
--- /dev/null
+++ b/media-libs/libpulse/files/pulseaudio-16.1-smoother-start-paused.patch
@@ -0,0 +1,26 @@
+commit 8fe50bbc31e11abf2f30864f1e2dbdaa16d0e1c3
+Author: Georg Chini <georg@chini.tk>
+Date: Thu Aug 25 08:11:04 2022 +0200
+
+ time-smoother-2: Fix stream time when stream starts paused
+
+ When a stream is started but has not yet called smoother_2_put(), pa_smoother_2_get()
+ returns the time since the start of the stream even if the stream was started paused.
+ When the stream is started paused, pa_smoother_2_get() should return 0 instead. This
+ patch fixes the problem.
+
+ Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/745>
+
+diff --git a/src/pulsecore/time-smoother_2.c b/src/pulsecore/time-smoother_2.c
+index e14b52f72..ea7ec1b36 100644
+--- a/src/pulsecore/time-smoother_2.c
++++ b/src/pulsecore/time-smoother_2.c
+@@ -295,7 +295,7 @@ pa_usec_t pa_smoother_2_get(pa_smoother_2 *s, pa_usec_t time_stamp) {
+
+ /* If the smoother has not started, just return system time since resume */
+ if (!s->start_time) {
+- if (time_stamp >= s->resume_time)
++ if (time_stamp >= s->resume_time && !s->paused)
+ current_time = time_stamp - s->resume_time;
+ else
+ current_time = 0;
diff --git a/media-libs/libpulse/files/pulseaudio-16.1-smoother-time-calculation.patch b/media-libs/libpulse/files/pulseaudio-16.1-smoother-time-calculation.patch
new file mode 100644
index 000000000000..9d976e5be984
--- /dev/null
+++ b/media-libs/libpulse/files/pulseaudio-16.1-smoother-time-calculation.patch
@@ -0,0 +1,27 @@
+commit c3eae5d00cb79bd897049483126e75bb48a69cd1
+Author: flyingOwl <ofenfisch@googlemail.com>
+Date: Fri Dec 30 00:16:03 2022 +0100
+
+ time-smoother-2: Fix time calculation by comparing timestamps
+
+ This fixes the rare case of resume_time being bigger than time_stamp. Which
+ happens sometimes when a gstreamer client is quickly seeking through a
+ media file. The resulting integer underflow then causes a huge value in
+ current_time which will break the playback.
+
+ Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/764>
+
+diff --git a/src/pulsecore/time-smoother_2.c b/src/pulsecore/time-smoother_2.c
+index ea7ec1b36..46cc5e9cc 100644
+--- a/src/pulsecore/time-smoother_2.c
++++ b/src/pulsecore/time-smoother_2.c
+@@ -307,7 +307,8 @@ pa_usec_t pa_smoother_2_get(pa_smoother_2 *s, pa_usec_t time_stamp) {
+ /* If we are initializing, add the time since resume to the card time at pause_time */
+ else if (s->init) {
+ current_time += (s->pause_time - s->start_time - s->time_offset - s->fixup_time) * s->time_factor;
+- current_time += (time_stamp - s->resume_time) * s->time_factor;
++ if (time_stamp > s->resume_time)
++ current_time += (time_stamp - s->resume_time) * s->time_factor;
+
+ /* Smoother is running, calculate current sound card time */
+ } else
diff --git a/media-libs/libpulse/libpulse-16.1-r3.ebuild b/media-libs/libpulse/libpulse-16.1-r3.ebuild
index a924d41221ce..4668093c1a09 100644
--- a/media-libs/libpulse/libpulse-16.1-r3.ebuild
+++ b/media-libs/libpulse/libpulse-16.1-r3.ebuild
@@ -77,6 +77,8 @@ DOCS=( NEWS README )
PATCHES=(
"${FILESDIR}"/pulseaudio-16.1-memfd-cleanup.patch
"${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
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libpulse/files/, media-libs/libpulse/
@ 2024-03-21 2:41 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-03-21 2:41 UTC (permalink / raw
To: gentoo-commits
commit: 684a97aa82b0b228b7faf21dd1c57dcf48757954
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Thu Mar 14 20:25:02 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 02:26:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=684a97aa
media-libs/libpulse: add patch removing catch2 internal test timeouts
No revbump since this is test-only fix. See upstream for justification.
See: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/807
Bug: https://bugs.gentoo.org/918447
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/35755
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/pulseaudio-17.0-backport-pr807.patch | 298 +++++++++++++++++++++
media-libs/libpulse/libpulse-17.0.ebuild | 1 +
2 files changed, 299 insertions(+)
diff --git a/media-libs/libpulse/files/pulseaudio-17.0-backport-pr807.patch b/media-libs/libpulse/files/pulseaudio-17.0-backport-pr807.patch
new file mode 100644
index 000000000000..0506e6b05577
--- /dev/null
+++ b/media-libs/libpulse/files/pulseaudio-17.0-backport-pr807.patch
@@ -0,0 +1,298 @@
+https://bugs.gentoo.org/918447
+https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/807
+
+From 26ccd1167a6188fb28745f3f5c9940657f64343c Mon Sep 17 00:00:00 2001
+From: matoro <75928-matoro1@users.noreply.gitlab.freedesktop.org>
+Date: Wed, 24 Jan 2024 12:08:28 -0500
+Subject: [PATCH] tests: remove check2 timeouts in favor of meson
+
+Meson already handles timeouts, configurable on the command line with
+--timeout-multiplier. They are set to 300s for all tests.
+
+Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/807>
+---
+ src/tests/alsa-mixer-path-test.c | 1 -
+ src/tests/connect-stress.c | 1 -
+ src/tests/cpu-mix-test.c | 1 -
+ src/tests/cpu-remap-test.c | 2 --
+ src/tests/cpu-sconv-test.c | 1 -
+ src/tests/cpu-volume-test.c | 1 -
+ src/tests/extended-test.c | 1 -
+ src/tests/interpol-test.c | 1 -
+ src/tests/lfe-filter-test.c | 1 -
+ src/tests/lo-latency-test.c | 1 -
+ src/tests/lock-autospawn-test.c | 4 ----
+ src/tests/meson.build | 1 +
+ src/tests/mult-s16-test.c | 1 -
+ src/tests/once-test.c | 4 ----
+ src/tests/passthrough-test.c | 1 -
+ src/tests/rtpoll-test.c | 4 ----
+ src/tests/sync-playback.c | 1 -
+ src/tests/thread-mainloop-test.c | 4 ----
+ src/tests/thread-test.c | 1 -
+ src/tests/volume-test.c | 1 -
+ 20 files changed, 1 insertion(+), 32 deletions(-)
+
+diff --git a/src/tests/alsa-mixer-path-test.c b/src/tests/alsa-mixer-path-test.c
+index 63b4a4cacb..208d75d475 100644
+--- a/src/tests/alsa-mixer-path-test.c
++++ b/src/tests/alsa-mixer-path-test.c
+@@ -107,7 +107,6 @@ int main(int argc, char *argv[]) {
+ s = suite_create("Alsa-mixer-path");
+ tc = tcase_create("alsa-mixer-path");
+ tcase_add_test(tc, mixer_path_test);
+- tcase_set_timeout(tc, 30);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/connect-stress.c b/src/tests/connect-stress.c
+index a243df9ea1..35f8ea9c4a 100644
+--- a/src/tests/connect-stress.c
++++ b/src/tests/connect-stress.c
+@@ -223,7 +223,6 @@ int main(int argc, char *argv[]) {
+ s = suite_create("Connect Stress");
+ tc = tcase_create("connectstress");
+ tcase_add_test(tc, connect_stress_test);
+- tcase_set_timeout(tc, 20 * 60);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/cpu-mix-test.c b/src/tests/cpu-mix-test.c
+index 6b5b8e37a6..2190ea4bdf 100644
+--- a/src/tests/cpu-mix-test.c
++++ b/src/tests/cpu-mix-test.c
+@@ -212,7 +212,6 @@ int main(int argc, char *argv[]) {
+ #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+ tcase_add_test(tc, mix_neon_test);
+ #endif
+- tcase_set_timeout(tc, 120);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/cpu-remap-test.c b/src/tests/cpu-remap-test.c
+index 2554688927..21fc5dc9dc 100644
+--- a/src/tests/cpu-remap-test.c
++++ b/src/tests/cpu-remap-test.c
+@@ -524,7 +524,6 @@ int main(int argc, char *argv[]) {
+ #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+ tcase_add_test(tc, remap_neon_test);
+ #endif
+- tcase_set_timeout(tc, 120);
+ suite_add_tcase(s, tc);
+
+ tc = tcase_create("rearrange");
+@@ -532,7 +531,6 @@ int main(int argc, char *argv[]) {
+ #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+ tcase_add_test(tc, rearrange_neon_test);
+ #endif
+- tcase_set_timeout(tc, 120);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/cpu-sconv-test.c b/src/tests/cpu-sconv-test.c
+index 6a84722fd8..5ae939d45b 100644
+--- a/src/tests/cpu-sconv-test.c
++++ b/src/tests/cpu-sconv-test.c
+@@ -251,7 +251,6 @@ int main(int argc, char *argv[]) {
+ #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+ tcase_add_test(tc, sconv_neon_test);
+ #endif
+- tcase_set_timeout(tc, 120);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/cpu-volume-test.c b/src/tests/cpu-volume-test.c
+index 5de8c83045..c7d73be04b 100644
+--- a/src/tests/cpu-volume-test.c
++++ b/src/tests/cpu-volume-test.c
+@@ -235,7 +235,6 @@ int main(int argc, char *argv[]) {
+ tcase_add_test(tc, svolume_arm_test);
+ #endif
+ tcase_add_test(tc, svolume_orc_test);
+- tcase_set_timeout(tc, 120);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/extended-test.c b/src/tests/extended-test.c
+index e855c7746a..33c08eef4c 100644
+--- a/src/tests/extended-test.c
++++ b/src/tests/extended-test.c
+@@ -211,7 +211,6 @@ int main(int argc, char *argv[]) {
+ tc = tcase_create("extended");
+ tcase_add_test(tc, extended_test);
+ /* 4s of audio, 0.5s grace time */
+- tcase_set_timeout(tc, 4.5);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/interpol-test.c b/src/tests/interpol-test.c
+index bb69e52537..e0e467bf53 100644
+--- a/src/tests/interpol-test.c
++++ b/src/tests/interpol-test.c
+@@ -282,7 +282,6 @@ int main(int argc, char *argv[]) {
+ s = suite_create("Interpol");
+ tc = tcase_create("interpol");
+ tcase_add_test(tc, interpol_test);
+- tcase_set_timeout(tc, 5 * 60);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/lfe-filter-test.c b/src/tests/lfe-filter-test.c
+index d779e05a4f..c5fdeb304f 100644
+--- a/src/tests/lfe-filter-test.c
++++ b/src/tests/lfe-filter-test.c
+@@ -184,7 +184,6 @@ int main(int argc, char *argv[]) {
+ s = suite_create("lfe-filter");
+ tc = tcase_create("lfe-filter");
+ tcase_add_test(tc, lfe_filter_test);
+- tcase_set_timeout(tc, 10);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/lo-latency-test.c b/src/tests/lo-latency-test.c
+index 813b337697..3f985a5c63 100644
+--- a/src/tests/lo-latency-test.c
++++ b/src/tests/lo-latency-test.c
+@@ -175,7 +175,6 @@ int main(int argc, char *argv[]) {
+ s = suite_create("Loopback latency");
+ tc = tcase_create("loopback latency");
+ tcase_add_test(tc, loopback_test);
+- tcase_set_timeout(tc, 5 * 60);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/lock-autospawn-test.c b/src/tests/lock-autospawn-test.c
+index d475d2dcd6..13a3e40d01 100644
+--- a/src/tests/lock-autospawn-test.c
++++ b/src/tests/lock-autospawn-test.c
+@@ -114,10 +114,6 @@ int main(int argc, char *argv[]) {
+ s = suite_create("Lock Auto Spawn");
+ tc = tcase_create("lockautospawn");
+ tcase_add_test(tc, lockautospawn_test);
+- /* the default timeout is too small,
+- * set it to a reasonable large one.
+- */
+- tcase_set_timeout(tc, 60 * 60);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/meson.build b/src/tests/meson.build
+index dceca55c7e..bbdd231300 100644
+--- a/src/tests/meson.build
++++ b/src/tests/meson.build
+@@ -208,6 +208,7 @@ endif
+
+ test_env = environment()
+ test_env.set('MAKE_CHECK', '1')
++test_env.set('CK_DEFAULT_TIMEOUT', '0')
+
+ foreach t : default_tests + norun_tests
+ name = t[0]
+diff --git a/src/tests/mult-s16-test.c b/src/tests/mult-s16-test.c
+index 91740c2fe9..b222c18114 100644
+--- a/src/tests/mult-s16-test.c
++++ b/src/tests/mult-s16-test.c
+@@ -102,7 +102,6 @@ int main(int argc, char *argv[]) {
+ s = suite_create("Mult-s16");
+ tc = tcase_create("mult-s16");
+ tcase_add_test(tc, mult_s16_test);
+- tcase_set_timeout(tc, 120);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/once-test.c b/src/tests/once-test.c
+index c4d4b4be6c..f14d2edc6b 100644
+--- a/src/tests/once-test.c
++++ b/src/tests/once-test.c
+@@ -132,10 +132,6 @@ int main(int argc, char *argv[]) {
+ s = suite_create("Once");
+ tc = tcase_create("once");
+ tcase_add_test(tc, once_test);
+- /* the default timeout is too small,
+- * set it to a reasonable large one.
+- */
+- tcase_set_timeout(tc, 60 * 60);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/passthrough-test.c b/src/tests/passthrough-test.c
+index 4a1ef783e9..cbeedd03ab 100644
+--- a/src/tests/passthrough-test.c
++++ b/src/tests/passthrough-test.c
+@@ -335,7 +335,6 @@ int main(int argc, char *argv[]) {
+ tcase_add_test(tc, passthrough_playback_test);
+ sink_num++;
+ tcase_add_test(tc, passthrough_volume_test);
+- tcase_set_timeout(tc, 5);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/rtpoll-test.c b/src/tests/rtpoll-test.c
+index aab637be1d..48dcdd1205 100644
+--- a/src/tests/rtpoll-test.c
++++ b/src/tests/rtpoll-test.c
+@@ -91,10 +91,6 @@ int main(int argc, char *argv[]) {
+ s = suite_create("RT Poll");
+ tc = tcase_create("rtpoll");
+ tcase_add_test(tc, rtpoll_test);
+- /* the default timeout is too small,
+- * set it to a reasonable large one.
+- */
+- tcase_set_timeout(tc, 60 * 60);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/sync-playback.c b/src/tests/sync-playback.c
+index 18afa180b2..3c356a7508 100644
+--- a/src/tests/sync-playback.c
++++ b/src/tests/sync-playback.c
+@@ -208,7 +208,6 @@ int main(int argc, char *argv[]) {
+ tc = tcase_create("syncplayback");
+ tcase_add_test(tc, sync_playback_test);
+ /* 4s of audio, 0.5s grace time */
+- tcase_set_timeout(tc, 4.5);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/thread-mainloop-test.c b/src/tests/thread-mainloop-test.c
+index 5f6952cdec..8ee14da57d 100644
+--- a/src/tests/thread-mainloop-test.c
++++ b/src/tests/thread-mainloop-test.c
+@@ -102,10 +102,6 @@ int main(int argc, char *argv[]) {
+ s = suite_create("Thread MainLoop");
+ tc = tcase_create("threadmainloop");
+ tcase_add_test(tc, thread_mainloop_test);
+- /* the default timeout is too small,
+- * set it to a reasonable large one.
+- */
+- tcase_set_timeout(tc, 60 * 60);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/thread-test.c b/src/tests/thread-test.c
+index 4fcbfd4d3c..0c83e67e07 100644
+--- a/src/tests/thread-test.c
++++ b/src/tests/thread-test.c
+@@ -153,7 +153,6 @@ int main(int argc, char *argv[]) {
+ s = suite_create("Thread");
+ tc = tcase_create("thread");
+ tcase_add_test(tc, thread_test);
+- tcase_set_timeout(tc, 60 * 60);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+diff --git a/src/tests/volume-test.c b/src/tests/volume-test.c
+index 55486f6427..dc5b90d0d7 100644
+--- a/src/tests/volume-test.c
++++ b/src/tests/volume-test.c
+@@ -161,7 +161,6 @@ int main(int argc, char *argv[]) {
+ s = suite_create("Volume");
+ tc = tcase_create("volume");
+ tcase_add_test(tc, volume_test);
+- tcase_set_timeout(tc, 120);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+--
+GitLab
+
diff --git a/media-libs/libpulse/libpulse-17.0.ebuild b/media-libs/libpulse/libpulse-17.0.ebuild
index 1e6c94b43613..43965de41571 100644
--- a/media-libs/libpulse/libpulse-17.0.ebuild
+++ b/media-libs/libpulse/libpulse-17.0.ebuild
@@ -75,6 +75,7 @@ DOCS=( NEWS README )
# patches merged upstream, to be removed with 17.1 or later bump
PATCHES=(
+ "${FILESDIR}/pulseaudio-17.0-backport-pr807.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-21 2:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-21 2:41 [gentoo-commits] repo/gentoo:master commit in: media-libs/libpulse/files/, media-libs/libpulse/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-10-06 12:09 Sam James
2022-11-29 7:13 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox