diff options
author | Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com> | 2021-12-31 10:04:58 +0200 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2022-01-01 03:47:27 +0000 |
commit | 3961737db6b965b7ba0ca927c91c41f8f2becfe0 (patch) | |
tree | aabd5c14080fef844b737b18f0f808a5eca7227b /media-video/wireplumber | |
parent | profiles/package.mask: drop mask for net-vpn/badvpn for lastrites (diff) | |
download | gentoo-3961737db6b965b7ba0ca927c91c41f8f2becfe0.tar.gz gentoo-3961737db6b965b7ba0ca927c91c41f8f2becfe0.tar.bz2 gentoo-3961737db6b965b7ba0ca927c91c41f8f2becfe0.zip |
media-video/wireplumber: add patch that should fix remote clients
Two Gentoo users have reported issues with getting networked protocols
working. The patch added in this wireplumber-0.4.5-r3 revbump should
fix their issues, as reported by one of them.
Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video/wireplumber')
-rw-r--r-- | media-video/wireplumber/files/wireplumber-0.4.5-access-config-add-restricted-access-permissions.patch | 36 | ||||
-rw-r--r-- | media-video/wireplumber/wireplumber-0.4.5-r3.ebuild | 102 |
2 files changed, 138 insertions, 0 deletions
diff --git a/media-video/wireplumber/files/wireplumber-0.4.5-access-config-add-restricted-access-permissions.patch b/media-video/wireplumber/files/wireplumber-0.4.5-access-config-add-restricted-access-permissions.patch new file mode 100644 index 000000000000..213283131e0b --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.5-access-config-add-restricted-access-permissions.patch @@ -0,0 +1,36 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/703c35cfd44265e81595db29eed081c8785cda87 + +From 703c35cfd44265e81595db29eed081c8785cda87 Mon Sep 17 00:00:00 2001 +From: Wim Taymans <wtaymans@redhat.com> +Date: Mon, 29 Nov 2021 09:25:18 +0100 +Subject: [PATCH] access-config: add restricted access permissions + +When a pulse client connects with TCP, it is given the 'restricted' +access policy. Assign 'rx' permissions for those clients instead of +blocking forever. + +See pipewire#1863 +--- + src/config/main.lua.d/50-default-access-config.lua | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/config/main.lua.d/50-default-access-config.lua b/src/config/main.lua.d/50-default-access-config.lua +index 0282d4aa..6cf18bed 100644 +--- a/src/config/main.lua.d/50-default-access-config.lua ++++ b/src/config/main.lua.d/50-default-access-config.lua +@@ -20,4 +20,12 @@ default_access.rules = { + }, + default_permissions = "rx", + }, ++ { ++ matches = { ++ { ++ { "pipewire.access", "=", "restricted" }, ++ }, ++ }, ++ default_permissions = "rx", ++ }, + } +-- +GitLab + diff --git a/media-video/wireplumber/wireplumber-0.4.5-r3.ebuild b/media-video/wireplumber/wireplumber-0.4.5-r3.ebuild new file mode 100644 index 000000000000..599aed0c155c --- /dev/null +++ b/media-video/wireplumber/wireplumber-0.4.5-r3.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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" + + # One commit is in git, the rest are in a PR which should be merged soon + # bug #817881 + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.4.5-endianness-fixes.patch.bz2" + 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 systemd test" + +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + ?? ( elogind 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.42:= + 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}" + +DOCS=( {NEWS,README}.rst ) + +PATCHES=( + "${FILESDIR}"/${P}-m-reserve-device-replace-the-hash-table-key-on-new-i.patch + "${FILESDIR}"/${P}-policy-node-wait-for-nodes-when-we-become-unlinked.patch + "${FILESDIR}"/${P}-lib-don-t-read-hidden-files-from-the-config-director.patch + "${FILESDIR}"/${P}-alsa-handle-the-release-requested-signal.patch + "${FILESDIR}"/${P}-access-config-add-restricted-access-permissions.patch + "${WORKDIR}"/${P}-endianness-fixes.patch +) + +src_configure() { + local emesonargs=( + -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) + -Dsystemd-system-service=false # Matches upstream + $(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 +} + +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 + ewarn +} |