7 files changed, 142 insertions, 189 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4341678ee057..4ff2e439df3d 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index ed63e7edc844..9282b5c2f5e6 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,8 +1,4 @@
-DIST libva-utils-2.18.2.tar.gz 1279586 BLAKE2B 26ba87ef6973cb9960f9a646da9d6467dceb27ce9527d007e92716b4480d3d21711e23cf37f51236da640f6e6eefb421f167e0f87926e966f2f53a699f4110e5 SHA512 cdbf2d542f2d7a442af017a924dd4835f22e367fab89f08ab2beabc535035ed11cdeb2ce581b178ecdb9fd1545fa8fde57b7bc15c8c591cc9c2b5f9ebf572ee7
-DIST libva-utils-2.19.0.tar.gz 1280543 BLAKE2B dea218b1b0832acab9d4ea71ee0d4b20460ef8dc3d3323b41ead552c6ff5ca3a7b2e6e5873a84dcfe48f4e5ade56ab177b4feb390bed660478483519fe264d5d SHA512 30004680dccbca0d7d9eb32abfc37f595d09293ea7f64fe6dcc7c3b010d754fe21b4e2eef55f54f58014745fd9f389910ebfdc8c9472906dae8967f6f6cedeb8
 DIST libva-utils-2.20.0.tar.gz 1280967 BLAKE2B b4d80eb3301a27b9e9ea31edf77f0f6d0bad8660d350fbc0ce4502a5f09b613b7d71ded94c1ce94697c3d679f9b06c099ebce4bf6c57b0e02f92f14458a12787 SHA512 e0edf08f90fc5b360c0123cd77fcb125be289700e62e3d53c92312175e0ee082f3714af3784f4b087de1379bb384c1cfc0f5f881e5a9b31d4806bc3216eacbf0
-EBUILD libva-utils-2.18.2.ebuild 1892 BLAKE2B 26250ed8f4e5a24654c39b38b048c12e6ece0a8e34ebc5ee1ff7632c597983d70fa49c53812471f177171dac37b1abdcd66b1c0bcb24c11ba453f375caa22b6e SHA512 cb60a6ad4dcb5ba3819920bb2c5c089661661007513dca8c045593eb569f012e621dce6fca0fbdc9795c81c9a76ce0a2fc22c369e49d9dce39c19ad97c50f063
-EBUILD libva-utils-2.19.0.ebuild 1891 BLAKE2B 56031d762b08d5f4808003eba8ca7b62d61ae266805007bead8b85f2379f6b72effc0590f7ceb2013b40a24f7324f50fe70dcc052e1a8a070fd9e97eb2f8edec SHA512 f1aaecbcdf93cd3c91be2fd5716ae63175ceb0144d0cb66cbcb8335ec12d6098f5d841f6893c58ccadeb5155771ddfa5be837741a3f23a49ef9a298f4320da0e
 EBUILD libva-utils-2.20.0.ebuild 1887 BLAKE2B af617d30f0280a3db0acd79210fc4a9a87fac15ab625708c334d283213ffe5f195bdffcca9c3f9ce0aa5ad955d7b14f5aac9126ce2d7e7369583a4553832f5df SHA512 b3747cb360cfd2c1f5a39319e9e286d4673afdc3ec4e39155af3d5fea7d680fd0f6faa1f3a7ce67af4cc15a6306afc89daaa710e71a3c34bc973140d3714a98b
 EBUILD libva-utils-9999.ebuild 1896 BLAKE2B dbdb76027e447b25e28e7661a19e909c1336be2505b1a6260b646076ddca78e68447e85bf042b9a58c20a0c17855e74be22e4ce910e9ca1757e08e5b5c597bb8 SHA512 5813e2b588406000150d3f702faff394894bc9fd3c3d3c0bfd6c0e86d4e9580d5895d215e311ba9b2a502711d136c1474039a6e6e0f6fe94afb0fc7b7bf0b2f4
 MISC metadata.xml 596 BLAKE2B 856d27918d6cd6c983271e4f762f7b1278bd90231d33181b5381dbc425523d637c65902526ed1b48a0df6aadf41d77bd249e886dbc485edf93f5394fa458cd13 SHA512 46e6d1ef1cc966aadb696293fb1b5f86d1f3fe5d0245ca01a2d9be6d1b35f29830cee41d4e04f0c8d557dd20eb41ae927dc60a854ce24862a2b2f7fc8faee766
diff --git a/media-video/libva-utils/libva-utils-2.18.2.ebuild b/media-video/libva-utils/libva-utils-2.18.2.ebuild
deleted file mode 100644
index f5fb22778737..000000000000
--- a/media-video/libva-utils/libva-utils-2.18.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://github.com/intel/libva-utils"
-if [[ ${PV} = *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/intel/libva-utils"
-else
-	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples putsurface test +vainfo wayland X"
-RESTRICT="test" # Tests must be run manually
-
-REQUIRED_USE="
-	putsurface? ( || ( wayland X ) )
-	|| ( examples putsurface test vainfo )
-"
-
-DEPEND="
-	x11-libs/libdrm
-	wayland? ( >=dev-libs/wayland-1.0.6 )
-	X? ( >=x11-libs/libX11-1.6.2 )
-"
-if [[ ${PV} = *9999 ]] ; then
-	DEPEND+="~media-libs/libva-${PV}:=[wayland?,X?]"
-else
-	DEPEND+=">=media-libs/libva-$(ver_cut 1-2).0:=[wayland?,X?]"
-fi
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	local sed_args=()
-
-	if ! use examples ; then
-		sed_args+=(
-			-e "/^  subdir('decode')$/d"
-			-e "/^  subdir('encode')$/d"
-			-e "/^  subdir('videoprocess')$/d"
-			-e "/^  subdir('vendor\/intel')$/d"
-			-e "/^  subdir('vendor\/intel\/sfcsample')$/d"
-		)
-	fi
-
-	if ! use putsurface ; then
-		sed_args+=(-e "/^  subdir('putsurface')$/d")
-	fi
-
-	if ! use vainfo ; then
-		sed_args+=(-e "/^subdir('vainfo')$/d")
-	fi
-
-	if [[ ${#sed_args[@]} -gt 0 ]] ; then
-		sed "${sed_args[@]}" -i meson.build || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddrm=true
-		$(meson_use X x11)
-		$(meson_use wayland)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use test ; then
-		rm -f "${ED}"/usr/bin/test_va_api || die
-	fi
-}
-
-pkg_postinst() {
-	if use test ; then
-		elog "Tests must be run manually with the test_va_api binary"
-	fi
-}
diff --git a/media-video/libva-utils/libva-utils-2.19.0.ebuild b/media-video/libva-utils/libva-utils-2.19.0.ebuild
deleted file mode 100644
index f2d6709a0a66..000000000000
--- a/media-video/libva-utils/libva-utils-2.19.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [[ ${PV} = *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/intel/libva-utils"
-else
-	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples putsurface test +vainfo wayland X"
-RESTRICT="test" # Tests must be run manually
-
-REQUIRED_USE="
-	putsurface? ( || ( wayland X ) )
-	|| ( examples putsurface test vainfo )
-"
-
-DEPEND="
-	x11-libs/libdrm
-	wayland? ( >=dev-libs/wayland-1.0.6 )
-	X? ( >=x11-libs/libX11-1.6.2 )
-"
-if [[ ${PV} = *9999 ]] ; then
-	DEPEND+="~media-libs/libva-${PV}:=[wayland?,X?]"
-else
-	DEPEND+=">=media-libs/libva-$(ver_cut 1-2).0:=[wayland?,X?]"
-fi
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	local sed_args=()
-
-	if ! use examples ; then
-		sed_args+=(
-			-e "/^  subdir('decode')$/d"
-			-e "/^  subdir('encode')$/d"
-			-e "/^  subdir('videoprocess')$/d"
-			-e "/^  subdir('vendor\/intel')$/d"
-			-e "/^  subdir('vendor\/intel\/sfcsample')$/d"
-		)
-	fi
-
-	if ! use putsurface ; then
-		sed_args+=(-e "/^  subdir('putsurface')$/d")
-	fi
-
-	if ! use vainfo ; then
-		sed_args+=(-e "/^subdir('vainfo')$/d")
-	fi
-
-	if [[ ${#sed_args[@]} -gt 0 ]] ; then
-		sed "${sed_args[@]}" -i meson.build || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddrm=true
-		$(meson_use X x11)
-		$(meson_use wayland)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use test ; then
-		rm -f "${ED}"/usr/bin/test_va_api || die
-	fi
-}
-
-pkg_postinst() {
-	if use test ; then
-		elog "Tests must be run manually with the test_va_api binary"
-	fi
-}
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