gentoo auto-resync : 10:12:2023 - 05:20:21

4 files changed, 124 insertions, 12 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 3ebac7af80a2..89cf93f4c16e 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index bf9f8b0ebd29..5c364b5fad17 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -8,6 +8,7 @@ DIST wireplumber-0.4.17.tar.bz2 330355 BLAKE2B fec1cf75bec687bff1cb48416cf22503a
 EBUILD wireplumber-0.4.14.ebuild 4191 BLAKE2B d879640535f28c8297f09a046d2ccb661df357c4d8b1518b11646cf4071abad26fd1a9389f76863c76dcb7aa9407c0b4fab856b51b38ccf7363f6eccd121e30b SHA512 ad988af31159ca47b4caf53103298faa732e6d4cde040042ed66f9f68b18111ecd825ca0460637606c9fbdc8754fb763d26b0fbb40b67eef8e1dc84a64dfbb92
 EBUILD wireplumber-0.4.15.ebuild 4141 BLAKE2B 9b30a04bc705023a0264d7dfe99ba75705820c04b1b785036ce2f359f25a7385316b80942150f2475f8b4567448a9f19416712c0a941ff8d963a42c8746f4d17 SHA512 0fa82f863ba4dbacf8cc03aa1077106f9fb19d54d0c36499226c9e314a2e195b77ce3504376346f689aef5d3fc5d71cea45b9cf2718538e791758ae2e926c878
 EBUILD wireplumber-0.4.16.ebuild 4138 BLAKE2B 842e10e317d9c0af403c53f911b6e9d11ba1173ce7c832a01d4297af019b157f8e988974266088835529b291a87440ced336b7272e5c04721b20c486e584216d SHA512 ce88d29fe0b049061fa5218bb54a2d8d15e48cd165a7e05f2112ae584359386798e31230e26fe6037eb3f1ecf900c1addc7f8036ce277a35fe071da707aaed14
+EBUILD wireplumber-0.4.17-r1.ebuild 3791 BLAKE2B fb8838a0b6619863e37006e41b6ff1a6bcb98b72ee626a4a5ea3e8720b6886a4e53168b0792d9c79bf5b2e3070970a466d76c114200db8d32c35b875c1c26e0c SHA512 2b2d596efdd76e0119bb0254dde61d31a004d785f8c8309a8db8e63472af108661558d86a3a0ba2ba381e0179a51f559485898a2f13b2da18c70251e372d81a2
 EBUILD wireplumber-0.4.17.ebuild 4138 BLAKE2B 842e10e317d9c0af403c53f911b6e9d11ba1173ce7c832a01d4297af019b157f8e988974266088835529b291a87440ced336b7272e5c04721b20c486e584216d SHA512 ce88d29fe0b049061fa5218bb54a2d8d15e48cd165a7e05f2112ae584359386798e31230e26fe6037eb3f1ecf900c1addc7f8036ce277a35fe071da707aaed14
-EBUILD wireplumber-9999.ebuild 4138 BLAKE2B 842e10e317d9c0af403c53f911b6e9d11ba1173ce7c832a01d4297af019b157f8e988974266088835529b291a87440ced336b7272e5c04721b20c486e584216d SHA512 ce88d29fe0b049061fa5218bb54a2d8d15e48cd165a7e05f2112ae584359386798e31230e26fe6037eb3f1ecf900c1addc7f8036ce277a35fe071da707aaed14
+EBUILD wireplumber-9999.ebuild 3791 BLAKE2B fb8838a0b6619863e37006e41b6ff1a6bcb98b72ee626a4a5ea3e8720b6886a4e53168b0792d9c79bf5b2e3070970a466d76c114200db8d32c35b875c1c26e0c SHA512 2b2d596efdd76e0119bb0254dde61d31a004d785f8c8309a8db8e63472af108661558d86a3a0ba2ba381e0179a51f559485898a2f13b2da18c70251e372d81a2
 MISC metadata.xml 719 BLAKE2B 7ad70a19cbc55cb0c399cbc1c8c56a3bab16d2dd477a285a3c142793af3704a8dd6648f6cfa0b9aa6fd8338c9cddd93cc565356a8a2e5031a6874b46ac66c2ee SHA512 a4617e6176a4dab7491103858ed5f663b8dda2a6cd97c348cc274ac959df813a811f70963487ccb670999fd51d107726762d872ce42290d02ea6ed24ea021e55
diff --git a/media-video/wireplumber/wireplumber-0.4.17-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.17-r1.ebuild
new file mode 100644
index 000000000000..42e484bf9447
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.4.17-r1.ebuild
@@ -0,0 +1,122 @@
+# 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
+}
+
+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 02516dabf6eb..42e484bf9447 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -95,17 +95,6 @@ src_configure() {
 	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"