gentoo auto-resync : 20:07:2022 - 02:40:19

11 files changed, 574 insertions, 9 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 116a53e1beec..9038b45f4dc3 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 62b10d28de44..78fdc56faa1a 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -4,5 +4,5 @@ DIST mediainfo_22.03.tar.xz 2005340 BLAKE2B 232f077a1e202271de8c0d07f1f2a27efac3
 EBUILD mediainfo-20.09-r1.ebuild 1613 BLAKE2B d2cbc44406a1b9f1389b636a236fd2c1961e4c50494d14268e851db3cdb591ace48adf6021cd620d63f010a262180b14a98fae92b8fa85d1fab57d99a5585775 SHA512 42d2fcdd06b6d5bc0e9d02ab779a300085e60093cb47690a0713ddb7f08d9ce92239f4dd40bb5ddd9cbb2eaa10ff10bdb788905ba6c6d6921bb669782fab198d
 EBUILD mediainfo-20.09.ebuild 1603 BLAKE2B 5c0dc5cd5992ce35df04b60e0f870a1203cd60bc67e923f20b7575827695d01f092785149fab5e2aad3297215d1128599b9177590bad13ad28226a1b05b4dd7f SHA512 d0779a099600b1478d234fa61f2696961266d2137c904e648ca77d52433588fe7015e929f2ced4eb5444fa4ee63fb05461f5f26a7cd86c7b7da6203a58ff2804
 EBUILD mediainfo-21.09.ebuild 1657 BLAKE2B f93738fb8db95a76c3fe44cc9b3c86a52fcb979b33f89588abaa8c4acc91efe94de9d5ba26d12d4cee0c4abae47a680a493f7bcacd0f68a11b28f8d9c927b3b6 SHA512 2f69e14296cd8c95a5abbd9fe24288fe2e763de32e8b710294c9ee27fdb03e23922cacf7fa3f3026e4bd128255aa408454af6702d249396294c1c9399f8284e2
-EBUILD mediainfo-22.03.ebuild 1671 BLAKE2B e7da8fa6aaf087da05e690087bfda6a7de73ae6603620bf15cec2e4339a3d922fa8310d159aa15d09da16f9dad6b2fd9a90e2880004ef1990de2e7413035b06e SHA512 b580188ece24fff4f38bb2047e5b26ec5f76131942ce5c170f5880642d19a64c3999b864651a347742c491af386a0bd55c322829f8ca407942291962427b1777
+EBUILD mediainfo-22.03.ebuild 1683 BLAKE2B e71352f48a9d441a21352f91383b95702a30465c7f60cca4a63da25ad1cd0026667a0b30631df3a2cf03d33d15d79bd6cad012c62c4f3f1c325c5bd4e9f92c5b SHA512 6d125744ba358b3bbf4c6f373b71709bab5c7c815a48baee7bd659cd2a76190c4513ae1f750e105deec31bc0bbe515fbf2124e9cd58a9daad4dd76d1048950ca
 MISC metadata.xml 344 BLAKE2B c70240ab3644a4c1d2367d1eb094a01b60198549456dfae21604c03bb30298f0abde2afda7dfdcf16425ca90856e98f57869481b85358e1724595454c8fdb308 SHA512 cdf31d4cd6185e0fdf604b611ee54b0bb90ffd369119cfd0bcc759e1e3d63a0d5ce673f508d3963b06c0c6152cdc1ef7d369ad2e84327ebd91c1e4a196e75d2e
diff --git a/media-video/mediainfo/mediainfo-22.03.ebuild b/media-video/mediainfo/mediainfo-22.03.ebuild
index 16d4d9e530e3..c2e67b8d3dde 100644
--- a/media-video/mediainfo/mediainfo-22.03.ebuild
+++ b/media-video/mediainfo/mediainfo-22.03.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/MediaInfo"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="~media-libs/libmediainfo-${PV}[curl=,mms=]
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 050e0aa28b69..81c3230910b8 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,6 +3,7 @@ AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
 AUX pipewire-0.3.52-pulse-path.patch 2586 BLAKE2B 2569452967f54ac531f07852fcd78070e61f5972c95eed8d8690461f215330e92aad6eca8c5ac393b0903e6d0c26e8a69fac51b445c39aa428cfd47f0ad4d659 SHA512 0ec2d9ceb5acfdf0ecedb7683db52d0d2ddbee52f318a77720134ec51e920d0f76621b4b44c531b7b1c857d161979351eccb08734e6cb80d0c7a8925399d58b3
 AUX pipewire-0.3.55-jack-mix.patch 715 BLAKE2B 2e07e0cc5350f62bc5e3ff3c65cb30438c9b2085b744c6ea2a813408116575213738a8c1afdd693710ed99378d413d32dae0a887cfb491181850333551cbc160 SHA512 5873b788aa9716c1065cc79ea4a07ffe9feb9bfffad95d35fd7719da9eec8974b3725a6b31b90f02d895ed9e49c963c543edc030f6ae68b9afb6cc7fc87bdb61
+AUX pipewire-0.3.56-big-endian.patch 1632 BLAKE2B b47b5ca888de71c9ee71ba35d5a490074e39219777345f4bf55252c0e9de65b97cc995c894b27c43945c8b32d70304e46610b3b641732170dc8f1ad97ea6549b SHA512 84bda8d747b91f04a40da6e55f186991b679b124e2571d64cd18368d5d4e1e2273565e3eee0a7b4b1a20a731429c240f168b970b02f88534375131b24c358cc1
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
@@ -10,9 +11,11 @@ DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 8538eb9f2178efa26365f30b324b707826e5
 DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef SHA512 30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a
 DIST pipewire-0.3.53_p20220705.tar.bz2 1358645 BLAKE2B 365e81ab114fb9b4abbd5351145d0558c7c00bdbccefc2f7bacb965018c1e7009b7b26b8e95baf35534b74cf9ce49483604841aa7ba949d6a94e720e8ec4233c SHA512 631e737e3517cb4d4c3f84e9540acde2cf94bde472626c61e0223ff4ac5cc2118a35dae79d009558384e24b955cf002d209db1bcf1465056757234725213f152
 DIST pipewire-0.3.55.tar.gz 1801857 BLAKE2B ee8d75bffba5f6b2e6ccd4da518339aa8e00e6afd8a4e8b6839bc0e4422b587f7543916ef161c9995bb7bfdf20032af984ac2fe9238ac9ad6160ab5d5942f700 SHA512 a139e51bc0d4144ae3bd3511962e541ae5c8a76d344d472805819e5bda6e62ec9807489c2a9e9f42bd9a25eff243f8a794b71d629438bf732a5cd92b85eaa9fc
+DIST pipewire-0.3.56.tar.gz 1856321 BLAKE2B 62fb5d5a83b3cfc0555f09da42c8d4fbe69f34432add57f91a9c001535340a84f54572af4a5ba138251888cba9be0c038317dfe929d2e2ef36ff62f4679c6ea0 SHA512 a1ba598c56130a30e573d3ce3ac5879d800d3005a47075c45353d968c97c12f74d85802cd171b61558c06c474a03bbe4885396ca430a0af6c5672ed00f43d108
 EBUILD pipewire-0.3.51-r2.ebuild 13194 BLAKE2B 8be112d99c48d5699dc51efe5bb3cff9509d4787f42f97df4ae4c14c254699e13750d2bbf3abf87a4102e763ffec7cd3a49103d29909284d4e94b35a04c0e965 SHA512 3504398ade620b89890c85c18aafa61707068e488ef2c1d1bfda8d9d429cadbf3cfbe333c42b2229201bf778c96e71e333e0d4a08fff59286149ccb1fa7634eb
 EBUILD pipewire-0.3.52-r1.ebuild 13293 BLAKE2B 17049f576d95cacf15f9e2ba4e0e11c61ecb36cf9cf6cad87b847ffdb5873b3b61607f727af6c3c6c6fd8cbbf3620da6ecb0bf8f77329ae79b34cd7af248dbd2 SHA512 ccaa19700ef8aec87ecb0e1c3a537cf15e7a08a3b603241d3a095e6ba22127d897662ddd3f495b923534f2889714129862c9dec14d3ee59262558d6c7faae9f8
 EBUILD pipewire-0.3.53_p20220705-r1.ebuild 15132 BLAKE2B c384019726ec2652d2032cf09f31bf8b6ef8d1453ceb111921f4a437148f5c66808f6d8a13196d211fb88c7ed7fd46703d89a7341047bb8e1787f3d1661c1fb5 SHA512 184e710cc6d91b4c648f0bbf29bf04523c23936bfb259791a6db47ed61263a4ba135e29c80049553c32e03540fe67f409084919906b09a1b8f2ac1f562263ba3
 EBUILD pipewire-0.3.55-r1.ebuild 15643 BLAKE2B 9c31eb4776aac969f9764cc32a20b2e0b4ef7cef8114bd6767e4ea73e22ca44e8c0a43fc754db642de15d2f9dc93e27e2d5d519980b43c94e9e2f0ac27081da3 SHA512 84a6d10c3352981e7488a5beec0213247f7ef4520b5b323075096d7a1e0379ab77861c0a78b67afad1856c116061b1bc57d727bfef0cfda991b466785776903f
+EBUILD pipewire-0.3.56.ebuild 15645 BLAKE2B 2e09336e3188936dfceefa149f44e3cee7158b0825163145323876233440c05f5c13ac62566791c7a4c254477a8e61cf5363edba16be5cfe3af726cd6cfc165b SHA512 fe885475dabb58d0bb26a5b84beab3efab380a96d8fe27848a4e8468e9b968b9dbf1c44fad5e368c5e4214af8c61a2bed8bc2401a27114d5033127a6ee6aa5fb
 EBUILD pipewire-9999.ebuild 15608 BLAKE2B cfe907ce58142207c01a9c36c529cb6cfcdf03298160e9c24e896aab41126cdaaa93b8db5b84a2abc3bd478600cdecb8b89ccc2007338b965cd376e106460090 SHA512 a1fa3c11fe7f2b355bf50bd0cc170246f89b4e2d0487a59e3cfe85958b396df2463dc15326085b45a44a48da690fbac173dc835e31bccdc33d0551950a65a6e5
 MISC metadata.xml 1480 BLAKE2B e70d9f3751b05ecfe3f2b550c031023c2904d50cb2e181147847b56100c17390a79b8467dc564d6549e5096e50a60d37f1f53279b3e2cfbf394808a0556283f1 SHA512 052a52c3a277654d29f8cb01a0d6b34440782e279aad78ab610775098dd376b04d8b67bc138614d6c8bc43f0e4a99d4a1617bdfda7ba9709370a7d8ee6df1398
diff --git a/media-video/pipewire/files/pipewire-0.3.56-big-endian.patch b/media-video/pipewire/files/pipewire-0.3.56-big-endian.patch
new file mode 100644
index 000000000000..d7742d26cead
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.56-big-endian.patch
@@ -0,0 +1,55 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/aaa015d0c0c66b64c7198a34ad3c4b43445667d2
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1a5ec4452fa21592eaeeb823ad95a1db6eb60376
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/f857fd46262b1a90ad94f86e34216a1a886d9463
+
+From aaa015d0c0c66b64c7198a34ad3c4b43445667d2 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 19 Jul 2022 13:06:52 +0200
+Subject: [PATCH] avb: fix compilation on big endian
+
+--- a/spa/plugins/avb/avbtp/packets.h
++++ b/spa/plugins/avb/avbtp/packets.h
+@@ -116,7 +116,7 @@ struct spa_avbtp_packet_aaf {
+ 	unsigned gv:1;
+ 	unsigned tv:1;
+ 
+-	uint8_t seq_number;
++	uint8_t seq_num;
+ 
+ 	unsigned _r2:7;
+ 	unsigned tu:1;
+GitLab
+From 1a5ec4452fa21592eaeeb823ad95a1db6eb60376 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 19 Jul 2022 13:49:42 +0200
+Subject: [PATCH] avb: fix compilation on big endian
+
+--- a/src/modules/module-avb/aaf.h
++++ b/src/modules/module-avb/aaf.h
+@@ -35,7 +35,7 @@ struct avb_packet_aaf {
+ 	unsigned gv:1;
+ 	unsigned tv:1;
+ 
+-	uint8_t seq_number;
++	uint8_t seq_num;
+ 
+ 	unsigned _r2:7;
+ 	unsigned tu:1;
+GitLab
+From f857fd46262b1a90ad94f86e34216a1a886d9463 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Tue, 19 Jul 2022 14:07:16 +0200
+Subject: [PATCH] avb: fix compilation on big endian
+
+--- a/src/modules/module-avb/iec61883.h
++++ b/src/modules/module-avb/iec61883.h
+@@ -37,7 +37,7 @@ struct avb_packet_iec61883 {
+ 	unsigned gv:1;
+ 	unsigned tv:1;
+ 
+-	uint8_t seq_number;
++	uint8_t seq_num;
+ 
+ 	unsigned _r2:7;
+ 	unsigned tu:1;
+GitLab
diff --git a/media-video/pipewire/pipewire-0.3.56.ebuild b/media-video/pipewire/pipewire-0.3.56.ebuild
new file mode 100644
index 000000000000..c5e583a53c24
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.56.ebuild
@@ -0,0 +1,424 @@
+# Copyright 1999-2022 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/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to mention
+# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. 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.
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		MY_COMMIT=""
+		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${MY_COMMIT}
+	else
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2
+pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
+# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
+# which provides adequate guarantee that alsa-lib will be able to provide audio services.
+# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
+# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
+REQUIRED_USE="
+	jack-sdk? ( !jack-client )
+	system-service? ( systemd )
+	!sound-server? ( !pipewire-alsa )
+	jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-libs/readline:=
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	lv2? ( media-libs/lilv )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+	)
+	sound-server? (
+		!media-sound/pulseaudio[daemon(+)]
+		!media-sound/pulseaudio-daemon
+	)
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l )
+	X? (
+		media-libs/libcanberra
+		x11-libs/libX11
+		x11-libs/libXfixes
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${P}-big-endian.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		$(use system-service && {
+			echo @pipewire - rtprio 95
+			echo @pipewire - nice -19
+			echo @pipewire - memlock 4194304
+		})
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_feature dbus)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+
+		$(meson_native_use_feature system-service systemd-system-service)
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		# Not yet packaged.
+		-Dbluez5-codec-lc3plus=disabled
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature ssl raop)
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		$(meson_feature udev)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+		# Just for bell sounds in X11 right now.
+		$(meson_native_use_feature X x11)
+		$(meson_native_use_feature X x11-xfixes)
+		$(meson_native_use_feature X libcanberra)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+	fi
+
+	# Enable required wireplumber alsa and bluez monitors
+	if use sound-server; then
+		dodir /etc/wireplumber/main.lua.d
+		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
+
+		dodir /etc/wireplumber/bluetooth.lua.d
+		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+
+		# Disable pipewire-pulse if sound-server is disabled.
+		if ! use sound-server ; then
+			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
+		fi
+
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postrm() {
+	use udev && udev_reload
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+
+			break
+		fi
+	done
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "To use PipeWire, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both new users and those upgrading need to enable WirePlumber"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user disable pipewire-media-session.service"
+		elog "  systemctl --user --force enable wireplumber.service"
+		elog
+		elog "Root user may replace --user with --global to change system default"
+		elog "configuration for all of the above commands."
+	else
+		ewarn "PipeWire daemon startup has been moved to a launcher script!"
+		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+		ewarn
+		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+		ewarn "advised that a D-Bus user session is set up before starting the script."
+		ewarn
+
+		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+			elog "are recommended to edit pulseaudio client configuration files:"
+			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+			elog "if it exists, and disable autospawning of the original daemon by setting:"
+			elog
+			elog "  autospawn = no"
+			elog
+			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog
+			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+			elog "command:"
+			elog
+			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog
+		fi
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override the sections you want to change."
+	fi
+	elog
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
+
+	if has_version 'net-misc/ofono' ; then
+		ewarn "Native backend has become default. Please disable oFono via:"
+		if systemd_is_booted ; then
+			ewarn "systemctl disable ofono"
+		else
+			ewarn "rc-update delete ofono"
+		fi
+		ewarn
+	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 PipeWire 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/popcorntime-bin/Manifest b/media-video/popcorntime-bin/Manifest
index e526504b069d..2a7dd86c3d39 100644
--- a/media-video/popcorntime-bin/Manifest
+++ b/media-video/popcorntime-bin/Manifest
@@ -1,4 +1,4 @@
-DIST Popcorn-Time-0.4.7-amd64.deb 101720792 BLAKE2B d437bbc67e7520a59ba1b37dcf17e69e860fc47e2b492c7b3d3df4f1fe0fd848af3fed3962668c296509db5aaca168b48669a6765694195378d47e884d028668 SHA512 9d29bc7a541379b248abc7d4ac4711fa3e6ac2e9645f566d5fba24430b30f1b4c55a7a0ae652f2e57b56f547eda6564a8c0696432ac4cdd099828e0fd3ff010d
-DIST Popcorn-Time-0.4.7-i386.deb 104588216 BLAKE2B 83ce8dc4d64b03a3918cafca380904ce60078ee1ba317b09884bf1d32fa46ab5b00383d1c15d5d4b6e040609a996d8a4743ae94220209c47ae4ce9e300bf1ad2 SHA512 60270178d343870707ab6d6247321cc983e19e896e09a05d412189d4c22c449768f01d612029b23f2dc449819066fcc6f5cb176a78e08e57450088b8130fd963
-EBUILD popcorntime-bin-0.4.7.ebuild 1377 BLAKE2B 7d1b04387c2d3bbf35c7f18c1a11ff4dd1ba3d68c8bee2594337ee415ea535ebabfac504b1a412af34cbc199d10bc68454b542df27fcb175ed1ca1be20caee38 SHA512 711903b79ac3286779177a2ddaf51991fd02701d7b0ee4513e1615dec93ac98d74f2862807b260941e36cd87096d95b68bf44696a3009df51e5ce5f9158f2f12
+DIST Popcorn-Time-0.4.8-amd64.deb 101235940 BLAKE2B a967efc4805e14f4292cf6b4652f2c6d9e3050c55789499b055b8cdac39d25d7e3f875f1e2dab79a9eb7199d93bcdf50507ff1eee5e065495d644945a1ac73e5 SHA512 a2f5be372908ae383e23b8f11c49d43865c8b1e3cd6acff1191809fd96e7f8fc8062cffa7b33bde4a8c91436acce75ad89461fb185d23bc0d96d3c81699f1bbd
+DIST Popcorn-Time-0.4.8-i386.deb 104249328 BLAKE2B 46e8b8f34d5d18e6106f0fb32cf5a70a8b0e1f8583838af81a5fd731caf04648e82516152ec4f346f2251b8d23c5c0aeed18b88e6fd7e9fc2f9ff766a19cfd18 SHA512 1719527b038bc170d3fa4659e11ca095753410a5ddc2922e2ebd78dacc1a252522e37be8d9916b95232f175ac9e50ea04eb83bda5e63ec7ca21433282d75501a
+EBUILD popcorntime-bin-0.4.8.ebuild 2125 BLAKE2B 9cf5b628d2bc3b70562ac4b7fc9a311cd0c626426f462dd578f9d405b4e2cee74df56d5891827ab06b3ecbfd15aabcd50e047224c0f706c6d0b6ecba08044714 SHA512 629058224e66dccb5201b2b9f9b32c5f1e1858ea4fd7904da1fc23203f8f2d60ad8d8d46751cad4d9bb3bca876797a05219bacb5f9ed02790a7d1cf2419e3f46
 MISC metadata.xml 436 BLAKE2B da1f7867d1f3a3b6a04a0975899b592976adb0299e2c370fa613d025993aeed81f719d1bde50565f3e8da15cfdd4ed6cd7f1bf4abb77c3d9371fdcfe7f4e9d13 SHA512 fec3c45b96ed58c61fb5454edc2351384b67bb52e156542bd0d71ce51f36b5943c1bee083a05c5c99917630da6ca5ffe0b87cfacde3a07d521a3c2032e42985e
diff --git a/media-video/popcorntime-bin/popcorntime-bin-0.4.7.ebuild b/media-video/popcorntime-bin/popcorntime-bin-0.4.8.ebuild
index cdea8a6ab56f..194dd26d3375 100644
--- a/media-video/popcorntime-bin/popcorntime-bin-0.4.7.ebuild
+++ b/media-video/popcorntime-bin/popcorntime-bin-0.4.8.ebuild
@@ -3,7 +3,13 @@
 
 EAPI=8
 
-inherit unpacker xdg
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
 
 DESCRIPTION="BitTorrent client that includes an integrated media player"
 HOMEPAGE="https://github.com/popcorn-official/popcorn-desktop"
@@ -20,6 +26,7 @@ LICENSE="
 	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
 "
 SLOT="0"
+RESTRICT="bindist mirror"
 
 RDEPEND="
 	app-accessibility/at-spi2-core:2
@@ -51,7 +58,35 @@ RDEPEND="
 
 QA_PREBUILT="opt/Popcorn-Time/*"
 
+pkg_pretend() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	default
+	# cleanup languages
+	pushd "opt/Popcorn-Time/locales" || die
+	chromium_remove_language_paks
+	popd || die
+}
+
+src_configure() {
+	chromium_suid_sandbox_check_kernel_config
+	default
+}
+
 src_install() {
-	mv "${S}"/* "${ED}" || die
-	dosym ../Popcorn-Time/Popcorn-Time /opt/bin/popcorntime
+	doicon -s 256 "usr/share/icons/butter.png"
+
+	domenu usr/share/applications/Popcorn-Time.desktop
+
+	local DESTDIR="/opt/Popcorn-Time"
+	pushd "opt/Popcorn-Time" || die
+
+	# Copy all the things in
+	dodir "${DESTDIR}"
+	mv * "${ED}/${DESTDIR}" || die
+
+	dosym "${DESTDIR}"/Popcorn-Time /opt/bin/Popcorn-Time
+	popd || die
 }
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index d9ed0f7fe30e..ce7cbbe8d010 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -5,11 +5,12 @@ AUX wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch
 AUX wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch 1256 BLAKE2B 0e3148edf9811b2a090c1127afee5c8c9094e1b80fb2186980b38faf08b3eedc11d394261676a1416b7d22a9f21b45c5b1522a60a1a2383474cd5d7c4bf93da3 SHA512 2e9b94dcb5daa8e85a56222d2570c5085d322c4bfe251edad1792e8fe870686473bb52a4ef43be034bccb68093e01b5c0bf1e035778edb985568d9f01b45afbb
 AUX wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch 1200 BLAKE2B ee73f3555418dad6a5c20e401e6f77ec22673b7079d04babe517617771c3d3b29e69ec37a933b1993fc5cfaa0200ee0a70178b7383b4086d9a63765a0d986301 SHA512 fa9fb26868b96742c972574eb2e82e91f54a3a3fe3911136b0c4886ff6324fcf35683059801113a0cc409f9a79383155e7cac1f4b18e0566da724c1fd3679d3d
 AUX wireplumber-0.4.11-alsa-lua-crash.patch 1256 BLAKE2B ae5787294e405e37f01d0d4ef3f6031e5df9f60b04f02a682ceeaf2311cd2d525cdbb913d4997d63d18513225bd35d5e6375e33f34931e412ef681df134fa514 SHA512 536e39e4863ca2e002b20f8fca6164a60e280f56d7c5c2c96f9684e75b6e8f7138884fca88a214b4830e2a9fb252ead3ba75dc7f6ad491716f3e2fc595ddefed
+AUX wireplumber-0.4.11-dbus-reconnect-crash.patch 1553 BLAKE2B 1792743e726f22ff26f751196f620905122545bb8921dcb2398e627ef6756d786497e84cb899dcadac5417207cba7f1d5bc7f0a018156c89393712eafba5b54b SHA512 1603f928867f8ccf83132fb3b09b4d43995bd97a62689917274b01eb75526237ab86b1e58292e7f3b5b296e094995d284be31dfdd13d1c26ca5a41f2d121c71d
 DIST wireplumber-0.4.10.tar.gz 395588 BLAKE2B 6df1af17d1e53ab1449a2f6f9af5a0c4f7b1cd981e07556e5ea3c6b4d5d624e66b97ce4f945f7ccccebbf72b75d35d10990fac11b5228275f27e5320885ff1ec SHA512 342e8bba2cf00faab71ef39bb361b5ada66ff3a68ccf7a756ea1ca402da6e94784eece277ca02992bc7573c51cb8b1bad33aa9c593b3d1bfe0bb0286e2f4506f
 DIST wireplumber-0.4.11.tar.gz 403931 BLAKE2B 77ef2540081420d4255dcb54165d0aceb08d97c60d19b9eb7606e90cf95e305e690794a1f46234b53b13765452fea0d23ae6acae9deea672db67e21c31d2307d SHA512 73a5120cd0c55b5fe5248cc22497efd23e40bb91961553639d9cf1bbf138d273db65153fa3c1bb0d2794f869e077e011156d323832534f62651d66f8cc87dca4
 EBUILD wireplumber-0.4.10-r4.ebuild 3933 BLAKE2B bccd391fc42848f7f57d5403ae481c554862f4bbc6b11b4f8fc55019044b3b9150ac3704370242a39992c65d88928f2f64d441a19cddd61721c82cd887b9e1ce SHA512 2c5c1977655178717c6ad1158b0af18267cafed7ace937e28dfc08d466efe227c6a4ad7f276a27ded906cf8439ecb0ae7579ebf64b90ccc4bf67fa8eeed08bca
 EBUILD wireplumber-0.4.10-r6.ebuild 4062 BLAKE2B 5706c5fe1a0f68900c9b2eb9131de0aa68ed5b1c51923bab01d557283452f6bc8e9d092f3aa0b182e3c9163a18061cd07fd821f61754ffd9c8355dcd5149d688 SHA512 8a74fc5f82c40ae63660c941d2b6d59189f852b7594a3eaf9f7539eae68917297168ebbd5f5a9c32acca6a10d2ab4b0351812dd7c39dac6da752c619bbbc08da
 EBUILD wireplumber-0.4.11-r1.ebuild 4071 BLAKE2B 724bb567cf077985bcd0e9d58649c6e6c8c75f04babb56c503c05416fde901bef4330930e735b6b9e3658ea66369cc8829a30be6ec780a41f8eca33b26454a21 SHA512 7e8e40f7f3d727776881004e01a109e7a7711668a3a8738a960cb2326edb55fe854f0932ca07ff31255bbdc200013e6498933443eb115661052122b517e0dcf5
-EBUILD wireplumber-0.4.11.ebuild 4030 BLAKE2B e93cabeffc20578ba0d3c70e02db1d7b1108e76229bad1dfefd48c887d6d60dc704cbb7a323ba04e42f8674d0d48d70926c24adeecc724bc28c647bb9c9e30dc SHA512 c4deb8102d90102f2c66430e178b7cde7bac734243b94e17497ee8b64159879b17a9d59edca0558c9df928f51b52105b8970c1cf6e1f490603b17173342f754e
+EBUILD wireplumber-0.4.11-r2.ebuild 4118 BLAKE2B 207d6de2619b6fc0616edf677216b5bc845101a6f54ebf90df5b82b37465a86065b29b1ed1c6b47e8cab6773209958984b44bd4e9d7a5f831e87fc69a3259204 SHA512 206b96449d12a367a1637f1682ffd775089d88b6a23fa4d0966f03a6713b86462edd48d28ccc3d24832efdd46319934df8313a3817e99d84933c61941001f5c2
 EBUILD wireplumber-9999.ebuild 3889 BLAKE2B d44e25f12dc2e6b0d8884b2a670b7fd3c7f1d42b67e6899cff3dd709d8b02d9c9497d4b95beca6f3973e76f54809b042ff6e66058c3de41f39332a022909083d SHA512 07ad0521fbd48382287d6d6f3b62906fa8a29fae84a5a0fb94cdcf8e87da01e6af0ba81f61c8675efb69c038a4fdf62fdde9b9e25b17d4a76b0148de32e457ae
 MISC metadata.xml 647 BLAKE2B 0370f3c897d7fcab0bd95fe1f97208f911de022e533ac795817289c554cc75d4de686223cbfd255ecb6e930ff0aee6c9419327ab51b3c65b1c4d8ed7597a1f3e SHA512 9708a52cf340caf359c300116b6ec687fba08a3c0fe33895eb10cda08517583ad36b5ff539142d8ba5f625ad34e5b7228f55fc7b85e7a162cf775f8780899f0e
diff --git a/media-video/wireplumber/files/wireplumber-0.4.11-dbus-reconnect-crash.patch b/media-video/wireplumber/files/wireplumber-0.4.11-dbus-reconnect-crash.patch
new file mode 100644
index 000000000000..6098ed11c302
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.11-dbus-reconnect-crash.patch
@@ -0,0 +1,45 @@
+https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/eb406bdb2cbbcd49c55c71285f8f2eddb624d24b
+
+From eb406bdb2cbbcd49c55c71285f8f2eddb624d24b Mon Sep 17 00:00:00 2001
+From: George Kiagiadakis <george.kiagiadakis@collabora.com>
+Date: Wed, 13 Jul 2022 13:38:14 +0300
+Subject: [PATCH] dbus: fix crash when trying to reconnect
+
+When coming from on_sync_reconnect, data points to the WpDBus object
+instead of the activation transition.
+
+Fixes: #305
+--- a/lib/wp/dbus.c
++++ b/lib/wp/dbus.c
+@@ -58,14 +58,26 @@ wp_dbus_set_state (WpDbus *self, WpDBusState new_state)
+ static void
+ on_got_bus (GObject * obj, GAsyncResult * res, gpointer data)
+ {
+-  WpTransition *transition = WP_TRANSITION (data);
+-  WpDbus *self = wp_transition_get_source_object (transition);
++  WpTransition *transition;
++  WpDbus *self;
+   g_autoptr (GError) error = NULL;
+ 
++  if (WP_IS_TRANSITION (data)) {
++    // coming from wp_dbus_enable
++    transition = WP_TRANSITION (data);
++    self = wp_transition_get_source_object (transition);
++  } else {
++    // coming from on_sync_reconnect
++    transition = NULL;
++    self = WP_DBUS (data);
++  }
++
+   self->connection = g_dbus_connection_new_for_address_finish (res, &error);
+   if (!self->connection) {
+-    g_prefix_error (&error, "Failed to connect to bus: ");
+-    wp_transition_return_error (transition, g_steal_pointer (&error));
++    if (transition) {
++      g_prefix_error (&error, "Failed to connect to bus: ");
++      wp_transition_return_error (transition, g_steal_pointer (&error));
++    }
+     return;
+   }
+ 
+GitLab
diff --git a/media-video/wireplumber/wireplumber-0.4.11.ebuild b/media-video/wireplumber/wireplumber-0.4.11-r2.ebuild
index ac3004d7449f..804d3273b583 100644
--- a/media-video/wireplumber/wireplumber-0.4.11.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.11-r2.ebuild
@@ -70,6 +70,8 @@ DOCS=( {NEWS,README}.rst )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.10-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
+	"${FILESDIR}"/${P}-alsa-lua-crash.patch
+	"${FILESDIR}"/${P}-dbus-reconnect-crash.patch
 )
 
 src_configure() {