gentoo auto-resync : 25:11:2023 - 22:29:52

3 files changed, 142 insertions, 3 deletions

diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 6922b5e46c4a..a347470cc467 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -3,7 +3,9 @@ AUX wireplumber-0.4.14-backport-pr505.patch 1293 BLAKE2B 4ae6c4bcd48c6c4fca9e766
 AUX wireplumber-0.4.15-config-disable-sound-server-parts.patch 783 BLAKE2B ed172805cd263fa0320563eb2440147e83567cad24bbec253a9d6cddedffd969056e2041110b96fd0b1e210cd7a45c25385174031496f6931f0a6c27257d23b2 SHA512 b1838315d3629560a93f4d1c7065419b592a7cffe69e898147e37b9e56ae0f0e5cb45f1ba0b5217af01f711fb0c20f547dc61797276892a593f644c48992ae47
 DIST wireplumber-0.4.14.tar.bz2 323688 BLAKE2B feb6cd4bc4e6617395fc8cc6a6f0c8d61026250f1d4691e60f2778ac6bb92e05a6a4078df95c932931bbf8c57f74c592cacbb2adeb6b2f332514eb50e04746b5 SHA512 51dc830d4dfe000cf6091d728d9ce6248585f5fae729536d611f85a0981722b9ab7f13322b516dc9988cdc15e0859f946aa0b78a35ad13a67e2de8082e6d5549
 DIST wireplumber-0.4.15.tar.bz2 327269 BLAKE2B a733e1e768f31bf6a278df84718d56c86b44a6669144b578e9c9514203eb9967dba008bb3446d293e8362b0be1dc20b0bfbff8d37ae7dc909c49a6438b5527b9 SHA512 53cf2027c69e8f44fc2c0c8910c1371ef8b5020aa1c47ca77f448998e810133821d9aa8de855482308b861f67b3d1cbd039c510460d59c6f9f2a44049577605b
+DIST wireplumber-0.4.16.tar.bz2 329855 BLAKE2B 28bc69f51cbafa9350abeb2a2c417a26afb9546adddd3b638063dca048b607b6fa3e82aea890fbf518b854b0e3e482e65e841d6f055838ea86b7c03f73cac96c SHA512 10bff323403f727b8653c8d287827e2c1e47913f2e3978d5f6e11fd29f30311fc1a11b4893073fa668a70d7dc115002822fa402f98e5b2d0e2eaa81145b727d8
 EBUILD wireplumber-0.4.14.ebuild 4191 BLAKE2B d879640535f28c8297f09a046d2ccb661df357c4d8b1518b11646cf4071abad26fd1a9389f76863c76dcb7aa9407c0b4fab856b51b38ccf7363f6eccd121e30b SHA512 ad988af31159ca47b4caf53103298faa732e6d4cde040042ed66f9f68b18111ecd825ca0460637606c9fbdc8754fb763d26b0fbb40b67eef8e1dc84a64dfbb92
 EBUILD wireplumber-0.4.15.ebuild 4141 BLAKE2B 9b30a04bc705023a0264d7dfe99ba75705820c04b1b785036ce2f359f25a7385316b80942150f2475f8b4567448a9f19416712c0a941ff8d963a42c8746f4d17 SHA512 0fa82f863ba4dbacf8cc03aa1077106f9fb19d54d0c36499226c9e314a2e195b77ce3504376346f689aef5d3fc5d71cea45b9cf2718538e791758ae2e926c878
-EBUILD wireplumber-9999.ebuild 3994 BLAKE2B 82deb69252c88db68a8a14755b0212fc656435b17d712413e5fa3ae900ae26720df38e106faa6e92e3b2bf937e022f8ec9a484db758b783968b94ad48bb1e0bc SHA512 4bb18008f1ab69ebdbd90d7a4eddb04530eb9e9d79e9fb774d8ae853309f5d2ab08184955dbbdd841c7ad51c9f7a2c596b0e4c15c31c3f657900c632fc906d35
+EBUILD wireplumber-0.4.16.ebuild 4138 BLAKE2B 842e10e317d9c0af403c53f911b6e9d11ba1173ce7c832a01d4297af019b157f8e988974266088835529b291a87440ced336b7272e5c04721b20c486e584216d SHA512 ce88d29fe0b049061fa5218bb54a2d8d15e48cd165a7e05f2112ae584359386798e31230e26fe6037eb3f1ecf900c1addc7f8036ce277a35fe071da707aaed14
+EBUILD wireplumber-9999.ebuild 4138 BLAKE2B 842e10e317d9c0af403c53f911b6e9d11ba1173ce7c832a01d4297af019b157f8e988974266088835529b291a87440ced336b7272e5c04721b20c486e584216d SHA512 ce88d29fe0b049061fa5218bb54a2d8d15e48cd165a7e05f2112ae584359386798e31230e26fe6037eb3f1ecf900c1addc7f8036ce277a35fe071da707aaed14
 MISC metadata.xml 719 BLAKE2B 7ad70a19cbc55cb0c399cbc1c8c56a3bab16d2dd477a285a3c142793af3704a8dd6648f6cfa0b9aa6fd8338c9cddd93cc565356a8a2e5031a6874b46ac66c2ee SHA512 a4617e6176a4dab7491103858ed5f663b8dda2a6cd97c348cc274ac959df813a811f70963487ccb670999fd51d107726762d872ce42290d02ea6ed24ea021e55
diff --git a/media-video/wireplumber/wireplumber-0.4.16.ebuild b/media-video/wireplumber/wireplumber-0.4.16.ebuild
new file mode 100644
index 000000000000..02516dabf6eb
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.4.16.ebuild
@@ -0,0 +1,133 @@
+# 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 ~mips ~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.68:=
+	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.15-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
+)
+
+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
+}
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index 8860dc2ce0d4..02516dabf6eb 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"
@@ -50,7 +50,7 @@ BDEPEND="
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.65-r1:=
+	>=media-video/pipewire-0.3.68:=
 	virtual/libintl
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
@@ -69,6 +69,10 @@ RDEPEND="${DEPEND}
 
 DOCS=( {NEWS,README}.rst )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.15-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddaemon=true