commit: ee515becc753986db3bff2de767a7315752906bb Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Feb 2 03:47:39 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 2 03:47:39 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee515bec
media-video/wireplumber: drop 0.4.14 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/wireplumber/Manifest | 1 - ...-0.4.10-config-disable-sound-server-parts.patch | 26 ---- .../files/wireplumber-0.4.14-backport-pr505.patch | 31 ----- media-video/wireplumber/wireplumber-0.4.14.ebuild | 134 --------------------- 4 files changed, 192 deletions(-) diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest index c26c988f4af4..41d841c64527 100644 --- a/media-video/wireplumber/Manifest +++ b/media-video/wireplumber/Manifest @@ -1,2 +1 @@ -DIST wireplumber-0.4.14.tar.bz2 323688 BLAKE2B feb6cd4bc4e6617395fc8cc6a6f0c8d61026250f1d4691e60f2778ac6bb92e05a6a4078df95c932931bbf8c57f74c592cacbb2adeb6b2f332514eb50e04746b5 SHA512 51dc830d4dfe000cf6091d728d9ce6248585f5fae729536d611f85a0981722b9ab7f13322b516dc9988cdc15e0859f946aa0b78a35ad13a67e2de8082e6d5549 DIST wireplumber-0.4.17.tar.bz2 330355 BLAKE2B fec1cf75bec687bff1cb48416cf22503a79609cf11220ab9353d3b8038cae1db63da8aa269aca034c0c0afd474e2ba89b236bb7e778da111516e3b15d5449f02 SHA512 5efb71091f262458bc912f4670249fac3ef858021785fbee9be749564a3fa452b1c4ff75634132f7d44fd06d7fc5ea2debb022b1f4a8d5c9c3afa992fab7ecf8 diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch b/media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch deleted file mode 100644 index a8bf6f106129..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.10-config-disable-sound-server-parts.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 3d86f51d2c43fd76be2450a8c27836fdd8619cfa -Author: Igor V. Kovalenko <[email protected]> -Date: Sun May 15 18:19:03 2022 +0300 - - config: Disable alsa and bluez monitors by default - -diff --git a/src/config/bluetooth.lua.d/50-bluez-config.lua b/src/config/bluetooth.lua.d/50-bluez-config.lua -index d5727d3..938eae0 100644 ---- a/src/config/bluetooth.lua.d/50-bluez-config.lua -+++ b/src/config/bluetooth.lua.d/50-bluez-config.lua -@@ -1,4 +1,4 @@ --bluez_monitor.enabled = true -+bluez_monitor.enabled = false - - bluez_monitor.properties = { - -- These features do not work on all headsets, so they are enabled -diff --git a/src/config/main.lua.d/50-alsa-config.lua b/src/config/main.lua.d/50-alsa-config.lua -index 3468333..d4c065b 100644 ---- a/src/config/main.lua.d/50-alsa-config.lua -+++ b/src/config/main.lua.d/50-alsa-config.lua -@@ -1,4 +1,4 @@ --alsa_monitor.enabled = true -+alsa_monitor.enabled = false - - alsa_monitor.properties = { - -- Create a JACK device. This is not enabled by default because diff --git a/media-video/wireplumber/files/wireplumber-0.4.14-backport-pr505.patch b/media-video/wireplumber/files/wireplumber-0.4.14-backport-pr505.patch deleted file mode 100644 index 35eedb027b0a..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.14-backport-pr505.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=902445 -https://gitlab.freedesktop.org/pipewire/wireplumber/-/merge_requests/505 - -From b7d41ac5bdf08c682c693e91c77d428268a7869e Mon Sep 17 00:00:00 2001 -From: matoro <[email protected]> -Date: Thu, 20 Apr 2023 17:53:35 -0400 -Subject: [PATCH] tests: common: crank up timeout for slower devices - -Timeout of 3 seconds is too slow for test-si-standard-link on slower -devices, crank this up with plenty of extra margin. Does not -practically affect running time on faster devices. ---- - tests/common/base-test-fixture.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/common/base-test-fixture.h b/tests/common/base-test-fixture.h -index b15dd1af2..d1b56ab4b 100644 ---- a/tests/common/base-test-fixture.h -+++ b/tests/common/base-test-fixture.h -@@ -67,7 +67,7 @@ wp_base_test_fixture_setup (WpBaseTestFixture * self, WpBaseTestFlags flags) - g_main_context_push_thread_default (self->context); - - /* watchdog */ -- self->timeout_source = g_timeout_source_new_seconds (3); -+ self->timeout_source = g_timeout_source_new_seconds (8); - g_source_set_callback (self->timeout_source, (GSourceFunc) timeout_callback, - self, NULL); - g_source_attach (self->timeout_source, self->context); --- -GitLab - diff --git a/media-video/wireplumber/wireplumber-0.4.14.ebuild b/media-video/wireplumber/wireplumber-0.4.14.ebuild deleted file mode 100644 index d7df8416b68f..000000000000 --- a/media-video/wireplumber/wireplumber-0.4.14.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# 1. Please regularly check (even at the point of bumping) Fedora's packaging -# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide -# -# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things -# continue to move quickly. It's not uncommon for fixes to be made shortly -# after releases. - -LUA_COMPAT=( lua5-{3,4} ) - -inherit lua-single meson systemd - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"; - EGIT_BRANCH="master" - inherit git-r3 -else - SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2"; - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" -fi - -DESCRIPTION="Replacement for pipewire-media-session" -HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"; - -LICENSE="MIT" -SLOT="0/0.4" -IUSE="elogind system-service systemd test" - -REQUIRED_USE=" - ${LUA_REQUIRED_USE} - ?? ( elogind systemd ) - system-service? ( systemd ) -" - -RESTRICT="!test? ( test )" - -# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building -BDEPEND=" - dev-libs/glib - dev-util/gdbus-codegen - dev-util/glib-utils - sys-devel/gettext - test? ( sys-apps/dbus ) -" - -DEPEND=" - ${LUA_DEPS} - >=dev-libs/glib-2.62 - >=media-video/pipewire-0.3.65-r1:= - virtual/libintl - elogind? ( sys-auth/elogind ) - systemd? ( sys-apps/systemd ) -" - -# Any dev-lua/* deps get declared like this inside RDEPEND: -# $(lua_gen_cond_dep ' -# dev-lua/<NAME>[${LUA_USEDEP}] -# ') -RDEPEND="${DEPEND} - system-service? ( - acct-user/pipewire - acct-group/pipewire - ) -" - -DOCS=( {NEWS,README}.rst ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.4.10-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire - "${FILESDIR}"/${PN}-0.4.14-backport-pr505.patch # bug 902445 -) - -src_configure() { - local emesonargs=( - -Ddaemon=true - -Dtools=true - -Dmodules=true - -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) - -Dintrospection=disabled # Only used for Sphinx doc generation - -Dsystem-lua=true # We always unbundle everything we can - -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) - $(meson_feature elogind) - $(meson_feature systemd) - $(meson_use system-service systemd-system-service) - $(meson_use systemd systemd-user-service) - -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) - -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) - $(meson_use test tests) - $(meson_use test dbus-tests) - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - # We copy the default config, so that Gentoo tools can pick up on any - # updates and /etc does not end up with stale overrides. - # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files - # will not actually get stored twice until modified. - insinto /etc - doins -r "${ED}"/usr/share/wireplumber -} - -pkg_postinst() { - if systemd_is_booted ; then - ewarn "pipewire-media-session.service is no longer installed. You must switch" - ewarn "to wireplumber.service user unit before your next logout/reboot:" - ewarn "systemctl --user disable pipewire-media-session.service" - ewarn "systemctl --user --force enable wireplumber.service" - else - ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" - ewarn "is started (a replacement for directly calling pipewire binary)." - ewarn - ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" - ewarn "or, if it does exist, that any reference to" - ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." - fi - if use system-service; then - ewarn - ewarn "WARNING: you have enabled the system-service USE flag, which installs" - ewarn "the system-wide systemd units that enable WirePlumber to run as a system" - ewarn "service. This is more than likely NOT what you want. You are strongly" - ewarn "advised not to enable this mode and instead stick with systemd user" - ewarn "units. The default configuration files will likely not work out of" - ewarn "box, and you are on your own with configuration." - ewarn - fi -}
