mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
media-video/wireplumber: drop 0.4.7-r2, 0.4.8-r2
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -1,3 +1,2 @@
|
||||
DIST wireplumber-0.4.7.tar.gz 358718 BLAKE2B a7e708ccfb9e95b3f3e2ddc5dfc1dc437ac8a2831a7cdaf03f33af65fcce8fc27dd91b2a6f346e60f68873724c2d165616005b485189604863213b5d5565f894 SHA512 8b472e1b3c7a29045326b30989d24224e510f93021c1b5b6aee59859daf594e91a738b8ad9d46d24736b7de29624d9faff40e1061bd3eddc559c95e325bfbf19
|
||||
DIST wireplumber-0.4.8.tar.gz 374824 BLAKE2B 7b5c8492d58be8b40c4c98bc807d031c453904a7df51c9b0d96c353c93018ba8cbd699b2c3c885defe7b5360df4256ad5e175015dc0102e5007853f6e0132cb7 SHA512 cb96b1d55be7e9d1433fc4a4fb4accce63f5f318a9a2b5cffc51a9f052765df777a0ba4ac73579771084295a73e6f05ed3a16a5fb9d0f5da4e183cfd74483c2c
|
||||
DIST wireplumber-0.4.9.tar.gz 376170 BLAKE2B 50f552c730ac543fc2e8b0e054c861bcd22ed281a62f2921fb956f39b917cce6eb53287dfcfc81db240476f82f5cf1d7556fa34be8bf507ff847089536b81f44 SHA512 39b9e9be014489042fe480219b99d7591e0b68dd44b889bd5c6aeee73e771adb807bc21f48d031217f097182827bd2f48b68d52291036d52e95d4fa75e7f9929
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/211f1e6b6cd4898121e4c2b821fae4dea6cc3317
|
||||
https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/163
|
||||
|
||||
From 211f1e6b6cd4898121e4c2b821fae4dea6cc3317 Mon Sep 17 00:00:00 2001
|
||||
From: Wim Taymans <wtaymans@redhat.com>
|
||||
Date: Fri, 14 Jan 2022 16:28:48 +0100
|
||||
Subject: [PATCH] default-nodes: handle nodes without Routes
|
||||
|
||||
When a node has not part of any EnumRoute, we must assume it is
|
||||
available.
|
||||
|
||||
Fixes selection of Pro Audio nodes as default nodes.
|
||||
---
|
||||
modules/module-default-nodes.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/modules/module-default-nodes.c b/modules/module-default-nodes.c
|
||||
index 32b2725b..15aadeaa 100644
|
||||
--- a/modules/module-default-nodes.c
|
||||
+++ b/modules/module-default-nodes.c
|
||||
@@ -108,6 +108,7 @@ node_has_available_routes (WpDefaultNodes * self, WpNode *node)
|
||||
gint dev_id = dev_id_str ? atoi (dev_id_str) : -1;
|
||||
gint cpd = cpd_str ? atoi (cpd_str) : -1;
|
||||
g_autoptr (WpDevice) device = NULL;
|
||||
+ gint found = 0;
|
||||
|
||||
if (dev_id == -1 || cpd == -1)
|
||||
return TRUE;
|
||||
@@ -168,6 +169,7 @@ node_has_available_routes (WpDefaultNodes * self, WpNode *node)
|
||||
for (; wp_iterator_next (it, &v); g_value_unset (&v)) {
|
||||
gint32 *d = (gint32 *)g_value_get_pointer (&v);
|
||||
if (d && *d == cpd) {
|
||||
+ found++;
|
||||
if (route_avail != SPA_PARAM_AVAILABILITY_no)
|
||||
return TRUE;
|
||||
}
|
||||
@@ -175,6 +177,10 @@ node_has_available_routes (WpDefaultNodes * self, WpNode *node)
|
||||
}
|
||||
}
|
||||
}
|
||||
+ /* The node is part of a profile without routes so we assume it
|
||||
+ * is available. This can happen for Pro Audio profiles */
|
||||
+ if (found == 0)
|
||||
+ return TRUE;
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/211f1e6b6cd4898121e4c2b821fae4dea6cc3317
|
||||
@@ -1,120 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
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.gz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~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
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${LUA_DEPS}
|
||||
>=dev-libs/glib-2.62
|
||||
>=media-video/pipewire-0.3.43:=
|
||||
virtual/libc
|
||||
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}"/${P}-default-nodes-handle-nodes-without-Routes.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-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_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
|
||||
}
|
||||
@@ -1,122 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
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.gz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~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
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${LUA_DEPS}
|
||||
>=dev-libs/glib-2.62
|
||||
>=media-video/pipewire-0.3.45:=
|
||||
virtual/libc
|
||||
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}"/${P}-restore-stream-do-not-crash-if-config.properties-is-.patch
|
||||
"${FILESDIR}"/${P}-spa-json-fix-va-list-APIs-for-different-architecture.patch
|
||||
"${FILESDIR}"/${P}-policy-bluetooth-fix-string.find-crash-with-nil-stri.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-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_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
|
||||
}
|
||||
Reference in New Issue
Block a user