gentoo resync : 04.01.2022

5 files changed, 55 insertions, 100 deletions

diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index af11c789f197..98377ae5c44c 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -1,11 +1,11 @@
+AUX wireplumber-0.4.5-access-config-add-restricted-access-permissions.patch 1103 BLAKE2B 6015043a5baa391be05c11387fcab418d9cb9fe050f2c1f88fe08d209fc2c813e6b5b8d99a14159d56d2e89db994c13e55e2af6b60001d6d64a0527a33be2319 SHA512 291c6833685e0b8e96b4187dadd1496c747493fd385f572d8f211177d278fc82cf4dd9466da3e1a359e9e2217dee1150cdad394ba0c54019f859fd571f6ea630
 AUX wireplumber-0.4.5-alsa-handle-the-release-requested-signal.patch 1009 BLAKE2B 32d9e359a705db1b60d0ed8c53a6e7c7bab85c73b0e8bce02fac5ee76e090393969a4abe041e585f0b32724f7946540677dd85b5ebdc380e6982823352ecfc75 SHA512 1b9a8aba86969dfb3a0372147596181e34088b42eacd4725df99ec627fa70cbe23d55c56d46f4f1780cb396e40c39720de96ce7fa4893af8e5acf697709614f6
 AUX wireplumber-0.4.5-lib-don-t-read-hidden-files-from-the-config-director.patch 742 BLAKE2B 480dfc48954a13323bc171e3b4672cedad27fdde05d8f28e263eddffd80c51ecdaa5046c30f57cd1a28a08270e59a38a3202fe496e4af84494d3b52614858880 SHA512 5400a2d4d1e61abe8d6c22c6540a83fafb25b6f4555156b66de9ad8350ce176faed00099c7a40b5286c82644ee09b5890da2521078f91e51d5a66fce7ed82a2a
 AUX wireplumber-0.4.5-m-reserve-device-replace-the-hash-table-key-on-new-i.patch 1672 BLAKE2B a5d8911754670c9303e35d15df45ecdd5bb4b2d837dea2000ff5e102bfb789ea678ace39356579f0fc86273ec58a7c5cc6eea701c3b7a274d742cddfaa3575d3 SHA512 8605622ed43fef37e1ca49edaae4812618e5ad83904b682b2b903e9de92060fd9b4a0a025d5716cd16339b94ae67b1ee9622949fae73153df0bbc5b9b3c2ebd9
 AUX wireplumber-0.4.5-policy-node-wait-for-nodes-when-we-become-unlinked.patch 1203 BLAKE2B 12e07a42d99187cba61d5428c235aba9207bd708e9346d53618b92c0ed06893e6295dbb49b9529e198f53c7ce4b573b897c349de8bb688273656de237ab3bca1 SHA512 4a5bb0a79c507945652a5600304fae1c9bf6fe028053a890c1633be2c82491ada487c9943ac29c6ed26f9e86a5d7f76140ec78bbaa394e41e1f082d50a7b56ef
 DIST wireplumber-0.4.5-endianness-fixes.patch.bz2 2341 BLAKE2B 225b164a4624128b50fe8691e3577de9aea35e85ed0527c605a617227d96ad49646b658da120d118ab45fd1ed82ed188ad1073b0a8954632ec6501535d533009 SHA512 d5b64612aad6d462ffbc78a24cf50ebde83b29e183a6d169976f5d8fdb0ec3c72984135ee75d52f7d7e8261716482ca277c49cf5824028bfaf33e596857de97f
 DIST wireplumber-0.4.5.tar.gz 345035 BLAKE2B 177984901790228d8ddeb8ee2a548eb53db07c8077734590c3f964df36cfa47a4099e049ae9a19a136f4147c75b7122359a73b8387a641768f71484b9c4ab119 SHA512 b0d5962e7a83709cc3115fbf0a04b63660085aeea2ebda6d78d692065ccb193cea8b44bb506fa440cf0b88bfae71a4f69a192cd6cba885ebf3c9270bea50c67a
-EBUILD wireplumber-0.4.5-r1.ebuild 2830 BLAKE2B c40cc607cf0ad9e563d6e539514ac1875828c54511202a1ac51e585c576db36d127475533a94f3bb40e028860fc237e4564049ef0d526139892f18155412b75b SHA512 a5278113619ee405d88897e55481e4b985f77793667a8e6d0279123a9fa3e170fa05bcdd0f4b0532187777b679eb66717ca6307c19e3143fecedfe4c2e5fe5f4
 EBUILD wireplumber-0.4.5-r2.ebuild 3056 BLAKE2B 2485dea8d7a93b14231de12023ed023483abe1135a9dfed26779d4e4b14b514c01d0aa8fed279156be9165c60a5907ce01bc621a4f188e572246cba96d1c3a5b SHA512 a10e4d07bf89f035d4b81d6f1162d5dc584a4981dbb106451f6c7d45fbe8b1f71311cbafc2cdaea2d953ede18bb1f7743911ad06d99dd5a1a3b8d5577c027817
-EBUILD wireplumber-0.4.5.ebuild 2487 BLAKE2B f0e2ef02c38c1d37656d38fe42515f9a29b4d205f1d6cc77a89e015ed23ef944c1ffac03f1abd7e95bd7408b25b914cebdffb2a71afdcab9b9f3e4f0c2af90ff SHA512 bf2be2d1c6caae3d3e4a994fcb5ff913b539bbcec96b1fc3729cb8971b2eb83adecc50edd9ccf2f15f35dd94a1aeccc89a599fc0f08546ef4a7cadcc4620f367
-EBUILD wireplumber-9999.ebuild 2494 BLAKE2B 3d1f071adedb4279f81453bf6bf27038d961ccfd6da29c2360b634c733d4155e6bd3ae07f81e89a81c2e1323688819e191601a4c6108a1b54c9fd85256cc911b SHA512 2ce7749ed4d3c6c7e5ede85f1bab00c8152e432595d0802e38eb7ba040e716e0d46157998457fb64c7e15aecc96f003208daf73a6709e20317fbf157fc625297
+EBUILD wireplumber-0.4.5-r3.ebuild 3192 BLAKE2B 2e237888607e6c09236053474dcd1c59618505f31ac97a6f005eb63fbd1383cfd421cbec0f1cf4f478db12669bfa4dc587e9c677d89ef8e4f723c8ee11347d3d SHA512 a96bc09c82a7e6cca8649a4e4a2d59329f46f476ceedeb09784ba6751518c082235f88f80a3075f240b1e345864773e1749e8ce96d6d2f666ac9785964f515c1
+EBUILD wireplumber-9999.ebuild 2556 BLAKE2B d640e9b432b335eb9de2e994070e88fc32eb8136e75f6b29e2109c58c7a050315a539774e7d688efde4ce9cabf5472eeae4b6045c3e6f3ff7cd9e9275371fa51 SHA512 2e76113b6e302af9601b72525e62293b375411dde8beb0f241df2031dca874334afd5dfe0556a811362f3fbf8a3cc3f12d1e8f6dc89008e0e1ff9c9a2fa52369
 MISC metadata.xml 673 BLAKE2B 71a411815b61a970653e39cf33ef56e04268805b98d5d5fbc405f4739b71adee9137e0198bf4ebaad208b4e878ab3087766ee223e1e18aaff90fac14d2c5dc23 SHA512 ba6121c54e9f6208b0b5c471790b005c51105d479a0dd2464563b7320530b3d8c176ff38bdb6c760d3f31a18fb993647244d944a222991110f14508ce63c4a96
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-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.5-r3.ebuild
index 977f3e5b79a7..e39673240df7 100644
--- a/media-video/wireplumber/wireplumber-0.4.5-r1.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,11 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+	# 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"
@@ -40,7 +44,7 @@ BDEPEND="
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.39
+	>=media-video/pipewire-0.3.42:=
 	virtual/libc
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
@@ -55,14 +59,17 @@ RDEPEND="${DEPEND}"
 DOCS=( {NEWS,README}.rst )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.5-m-reserve-device-replace-the-hash-table-key-on-new-i.patch
-	"${FILESDIR}"/${PN}-0.4.5-policy-node-wait-for-nodes-when-we-become-unlinked.patch
-	"${FILESDIR}"/${PN}-0.4.5-lib-don-t-read-hidden-files-from-the-config-director.patch
-	"${FILESDIR}"/${PN}-0.4.5-alsa-handle-the-release-requested-signal.patch
+	"${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=(
+		-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))
diff --git a/media-video/wireplumber/wireplumber-0.4.5.ebuild b/media-video/wireplumber/wireplumber-0.4.5.ebuild
deleted file mode 100644
index 4773af0d6c42..000000000000
--- a/media-video/wireplumber/wireplumber-0.4.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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.39
-	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 )
-
-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
-}
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index ce558e3165e2..43f426dd14b9 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -56,6 +56,7 @@ DOCS=( {NEWS,README}.rst )
 
 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))