media-video/pipewire x11-libs/gtk+: Version bump. media-video/handbrake: remove

Signed-off-by: Martin Väth <martin@mvath.de>

13 files changed, 175 insertions, 390 deletions

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
deleted file mode 100644
index abb9a1f6..00000000
--- a/media-video/handbrake/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
diff --git a/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch
deleted file mode 100644
index 551a64ee..00000000
--- a/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/configure b/configure
-index 5c870e1d7..2f5834083 100755
---- a/configure
-+++ b/configure
-@@ -14,20 +14,8 @@ inpath()
- }
- 
- if ( inpath bash ); then
--    pp=""
--    for p in python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python2 python2.7 python
--    do
--        if ( inpath $p ); then
--            pp="$p"
--            break
--        fi
--    done
--    if [ pp != "" ]; then
--        exec $pp `dirname $0`/make/configure.py "$@"
--        exit 0
--    else
--        echo "ERROR: no suitable version of python found."
--    fi
-+    exec python `dirname $0`/make/configure.py "$@"
-+    exit 0
- else
-     echo "ERROR: bash shell not found."
- fi
diff --git a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
deleted file mode 100644
index 6a146457..00000000
--- a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/test/module.defs	2020-06-13 15:05:35.000000000 +0100
-+++ a/test/module.defs	2020-07-03 11:15:53.951205608 +0100
-@@ -30,6 +30,10 @@ 
- endif
- endif
- 
-+ifeq (1,$(FEATURE.x265))
-+    TEST.GCC.l += x265
-+endif
-+
- ifeq (1,$(FEATURE.flatpak))
-     TEST.GCC.l += glib-2.0
- endif
diff --git a/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch b/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch
deleted file mode 100644
index 7dc1f693..00000000
--- a/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/libhb/dvdnav.c
-+++ b/libhb/dvdnav.c
-@@ -1225,16 +1225,7 @@
-                 {
-                     for (kk = 0; kk < buttons; kk++)
-                     {
--                        dvdnav_t *dvdnav_copy;
--
--                        result = dvdnav_dup( &dvdnav_copy, d->dvdnav );
--                        if (result != DVDNAV_STATUS_OK)
--                        {
--                            hb_log("dvdnav dup failed: %s", dvdnav_err_to_string(d->dvdnav));
--                            goto done;
--                        }
--                        title = try_button( dvdnav_copy, kk, list_title );
--                        dvdnav_free_dup( dvdnav_copy );
-+                        title = try_button( d->dvdnav, kk, list_title );
- 
-                         if ( title >= 0 )
-                         {
diff --git a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
deleted file mode 100644
index 7e8ab997..00000000
--- a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/libhb/common.c
-+++ b/libhb/common.c
-@@ -243,7 +243,6 @@
- {
-     // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
-     { { "",                   "dts",        NULL,                          HB_ACODEC_DCA_PASS,    HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS,   },
--    { { "AAC (faac)",         "faac",       NULL,                          0,                     HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
-     { { "AAC (ffmpeg)",       "ffaac",      NULL,                          HB_ACODEC_FFAAC,       HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
-     { { "AC3 (ffmpeg)",       "ffac3",      NULL,                          HB_ACODEC_AC3,         HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3,        },
-     { { "MP3 (lame)",         "lame",       NULL,                          HB_ACODEC_LAME,        HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3,        },
---- a/scripts/manicure.rb
-+++ b/scripts/manicure.rb
-@@ -349,7 +349,7 @@
-           audioEncoders << "copy:dtshd"
-         when /AAC Pass/
-           audioEncoders << "copy:aac"
--        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+        when "AAC (ffmpeg)", "AAC (avcodec)"
-           audioEncoders << "av_aac"
-         when "AAC (FDK)"
-           audioEncoders << "fdk_aac"
-@@ -466,7 +466,7 @@
-     case hash["AudioEncoderFallback"]
-       when /AC3/
-         audioEncoderFallback << "ac3"
--      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+      when "AAC (ffmpeg)", "AAC (avcodec)"
-         audioEncoderFallback << "av_aac"
-       when "AAC (FDK)"
-         audioEncoderFallback << "fdk_aac"
-@@ -753,7 +753,7 @@
-           audioEncoders << "copy:dtshd"
-         when /AAC Pass/
-           audioEncoders << "copy:aac"
--        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+        when "AAC (ffmpeg)", "AAC (avcodec)"
-           audioEncoders << "av_aac"
-         when "AAC (FDK)"
-           audioEncoders << "fdk_aac"
-@@ -870,7 +870,7 @@
-     case hash["AudioEncoderFallback"]
-       when /AC3/
-         audioEncoderFallback << "ac3"
--      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+      when "AAC (ffmpeg)", "AAC (avcodec)"
-         audioEncoderFallback << "av_aac"
-       when "AAC (FDK)"
-         audioEncoderFallback << "fdk_aac"
-@@ -1163,7 +1163,7 @@
-           audioEncoders << "copy:dtshd"
-         when /AAC Pass/
-           audioEncoders << "copy:aac"
--        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+        when "AAC (ffmpeg)", "AAC (avcodec)"
-           audioEncoders << "av_aac"
-         when "AAC (FDK)"
-           audioEncoders << "fdk_aac"
-@@ -1298,7 +1298,7 @@
-     case hash["AudioEncoderFallback"]
-       when /AC3/
-         audioEncoderFallback << "ac3"
--      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+      when "AAC (ffmpeg)", "AAC (avcodec)"
-         audioEncoderFallback << "av_aac"
-       when "AAC (FDK)"
-         audioEncoderFallback << "fdk_aac"
-@@ -1615,7 +1615,7 @@
-           audioEncoders << "copy:dtshd"
-         when /AAC Pass/
-           audioEncoders << "copy:aac"
--        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+        when "AAC (ffmpeg)", "AAC (avcodec)"
-           audioEncoders << "av_aac"
-         when "AAC (FDK)"
-           audioEncoders << "fdk_aac"
-@@ -1732,7 +1732,7 @@
-     case hash["AudioEncoderFallback"]
-       when /AC3/
-         audioEncoderFallback << "ac3"
--      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+      when "AAC (ffmpeg)", "AAC (avcodec)"
-         audioEncoderFallback << "av_aac"
-       when "AAC (FDK)"
-         audioEncoderFallback << "fdk_aac"
diff --git a/media-video/handbrake/handbrake-1.3.3-r1.ebuild b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
deleted file mode 100644
index a9b5fdb4..00000000
--- a/media-video/handbrake/handbrake-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-else
-	MY_P="HandBrake-${PV}"
-	SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	app-arch/xz-utils
-	media-libs/speex
-	dev-libs/jansson
-	dev-libs/libxml2
-	media-libs/a52dec
-	media-libs/libass:=
-	>=media-libs/libbluray-1.0
-	>=media-libs/dav1d-0.5.1
-	media-libs/libdvdnav
-	media-libs/libdvdread:=
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	>=media-libs/libvpx-1.8
-	nvenc? ( media-libs/nv-codec-headers )
-	media-libs/opus
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-a52dec:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-x264:1.0
-		media-plugins/gst-plugins-gdkpixbuf:1.0
-	)
-	gtk? (
-		>=x11-libs/gtk+-3.10
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		dev-libs/libgudev:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-	)
-	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
-	"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/nasm
-	dev-util/cmake
-	dev-util/intltool
-	dev-util/meson
-	sys-devel/automake"
-
-PATCHES=(
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
-	# Use whichever python is set by portage
-	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
-
-	# Fix x265 linkage... again again #730034
-	"${FILESDIR}/${PN}-1.3.3-x265-link.patch"
-)
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	default
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	# Libav was replaced in 1.2 with ffmpeg by default
-	# but I've elected to not make people change their use flags for AAC
-	# as its the same code anyway
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		--disable-flatpak \
-		--disable-gtk4 \
-		$(use_enable libav-aac ffmpeg-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(usex !gtk --disable-gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable numa) \
-		$(use_enable nvenc) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
-	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
-	einfo "do not use the bundled (and often patched) upstream libraries."
-	einfo ""
-	einfo "Please do not raise bugs with upstream because of these ebuilds,"
-	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
-
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-	if use gtk ; then
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
deleted file mode 100644
index 83b12add..00000000
--- a/media-video/handbrake/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>thev00d00@gentoo.org</email>
-		<name>Ian Whyman</name>
-	</maintainer>
-	<use>
-		<flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
-		<flag name="gtk">Install the GTK UI, ghb.</flag>
-		<flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
-		<flag name="libav-aac">Support for encoding AAC using libav's internal encoder.</flag>
-		<flag name="numa">Adds support for x265's NUMA capabilities.</flag>
-		<flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
-		<flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 316a0c18..26d81a02 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,2 +1,2 @@
-DIST pipewire-0.3.34.tar.gz 1682396 SHA512 cbf8eb410d2cd1923e67ac9ee9eca0e74567bb7e8ea407a536e64b3ec27b5bbb1e7fdd74a5a7cbffbac3f9996d8a08f8c723401fb44cb2920f044a3a2f3a6c18
 DIST pipewire-0.3.36.tar.gz 1708209 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
+DIST pipewire-0.3.43.tar.gz 1713131 SHA512 d3804cdb1d94977bb4e2757e46829e1e51fca52b018007afa3bbfabff4dc33538cedad015c91154e28b879fc2edeb4e1fadf633b0af9a0d3bfd930c53b1bc2c0
diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in b/media-video/pipewire/files/gentoo-pipewire-launcher.in
new file mode 100644
index 00000000..495c47f6
--- /dev/null
+++ b/media-video/pipewire/files/gentoo-pipewire-launcher.in
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# PipeWire launcher script for XDG compliant desktops on OpenRC.
+#
+# systemd users are very _STRONGLY_ advised to use the much
+# more reliable and predictable user units instead.
+
+# WARNING: This script assumes being run inside XDG compliant session,
+# which means D-Bus session instance is expected to be correctly set up
+# prior to this script starting. If that is not true, things may break!
+
+# Best to reap any existing daemons and only then try to start a new set.
+pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
+
+# The core daemon which by itself does probably nothing.
+@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire &
+
+# The so called pipewire-pulse daemon used for PulseAudio compatibility.
+# Commenting this out will stop the PA proxying daemon from starting,
+# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using
+# clients will still have access to audio and may end up clashing with
+# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
+@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf &
+
+# Hack for bug #822498
+sleep 1
+
+# Finally a session manager is required for PipeWire to do anything.
+exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber
diff --git a/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch b/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch
new file mode 100644
index 00000000..93c3ffe3
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch
@@ -0,0 +1,30 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/814d409501aca3e044ad53063eb3f433b8aff6f9.patch
+
+From 814d409501aca3e044ad53063eb3f433b8aff6f9 Mon Sep 17 00:00:00 2001
+From: Timo Gurr <timo.gurr@gmail.com>
+Date: Thu, 6 Jan 2022 12:17:10 +0000
+Subject: [PATCH] systemd: Add systemd-system-unit-dir override
+
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -179,6 +179,9 @@ option('udev',
+ option('udevrulesdir',
+        type : 'string',
+        description : 'Directory for udev rules (defaults to /lib/udev/rules.d)')
++option('systemd-system-unit-dir',
++       type : 'string',
++       description : 'Directory for system systemd units (defaults to /usr/lib/systemd/system)')
+ option('systemd-user-unit-dir',
+        type : 'string',
+        description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)')
+--- a/src/daemon/systemd/system/meson.build
++++ b/src/daemon/systemd/system/meson.build
+@@ -1,4 +1,7 @@
+ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir', pkgconfig_define : [ 'rootprefix', prefix])
++if get_option('systemd-system-unit-dir') != ''
++  systemd_system_services_dir = get_option('systemd-system-unit-dir')
++endif
+ 
+ install_data(sources : 'pipewire.socket',
+              install_dir : systemd_system_services_dir)
+GitLab
diff --git a/media-video/pipewire/files/pipewire.desktop-r1 b/media-video/pipewire/files/pipewire.desktop-r1
new file mode 100644
index 00000000..d9503129
--- /dev/null
+++ b/media-video/pipewire/files/pipewire.desktop-r1
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name[de]=PipeWire Mediensystem
+Name=PipeWire Media System
+Comment[de]=Das PipeWire Mediensystem starten
+Comment=Start the PipeWire Media System
+Exec=/usr/bin/gentoo-pipewire-launcher
+Terminal=false
+Type=Application
+X-GNOME-HiddenUnderSystemd=true
+X-KDE-HiddenUnderSystemd=true
+X-systemd-skip=true
diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml
index 0eeee3aa..ca29532f 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>asturm@gentoo.org</email>
 		<name>Andreas Sturmlechner</name>
 	</maintainer>
@@ -19,11 +23,12 @@
 		<doc>https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/home</doc>
 	</upstream>
 	<use>
-		<flag name="alsa">Whether to depend on pulseaudio plugin for alsa when not using pipewire-alsa</flag>
 		<flag name="echo-cancel">Enable WebRTC-based echo canceller via <pkg>media-libs/webrtc-audio-processing</pkg></flag>
 		<flag name="extra">Build pw-cat/pw-play/pw-record</flag>
 		<flag name="jack-client">Install a plugin for running PipeWire as a JACK client</flag>
 		<flag name="jack-sdk">Use PipeWire as JACK replacement</flag>
+		<flag name="lv2">Allow loading LV2 plugins via <pkg>media-libs/lv2</pkg></flag>
 		<flag name="pipewire-alsa">Replace PulseAudio's ALSA plugin with PipeWire's plugin</flag>
+		<flag name="ssl">Enable raop-sink support (needs <pkg>dev-libs/openssl</pkg>)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/pipewire/pipewire-0.3.34.ebuild b/media-video/pipewire/pipewire-0.3.43-r2.ebuild
index 61dd49ce..40ab72d7 100644
--- a/media-video/pipewire/pipewire-0.3.34.ebuild
+++ b/media-video/pipewire/pipewire-0.3.43-r2.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit meson-multilib optfeature python-any-r1 udev
+inherit 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
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
 HOMEPAGE="https://pipewire.org/"
 
 LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="alsa bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="alsa bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl systemd test v4l zeroconf"
 
 # Once replacing system JACK libraries is possible, it's likely that
 # jack-client IUSE will need blocking to avoid users accidentally
@@ -33,9 +34,10 @@ REQUIRED_USE="jack-sdk? ( !jack-client )"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	app-doc/xmltoman
+	>=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
@@ -45,17 +47,19 @@ RDEPEND="
 	acct-group/audio
 	media-libs/alsa-lib
 	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/readline:=
 	sys-libs/ncurses:=[unicode(+)]
 	virtual/libintl[${MULTILIB_USEDEP}]
 	virtual/libudev[${MULTILIB_USEDEP}]
 	bluetooth? (
 		media-libs/fdk-aac
 		media-libs/libldac
-		media-libs/libopenaptx
+		media-libs/libfreeaptx
 		media-libs/sbc
 		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
 	)
-	echo-cancel? ( media-libs/webrtc-audio-processing )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
 	extra? (
 		>=media-libs/libsndfile-1.0.20
 	)
@@ -69,20 +73,24 @@ RDEPEND="
 		!media-sound/jack-audio-connection-kit
 		!media-sound/jack2
 	)
+	lv2? ( media-libs/lv2 )
 	pipewire-alsa? (
 		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
+		!media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
 	)
 	!pipewire-alsa? ( alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) )
+	ssl? ( dev-libs/openssl:= )
 	systemd? ( sys-apps/systemd )
 	v4l? ( media-libs/libv4l )
+	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"
+
 # 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
@@ -97,23 +105,22 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${PN}-0.3.33-revert-libfreeaptx-switch.patch
-	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
+
+	# Upstream patches/backports
+	"${FILESDIR}"/${P}-systemd-user-unit-dir.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
 
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch
-	fi
-
 	einfo "Generating ${limitsdfile}"
 	cat > ${limitsdfile} <<- EOF || die
 		# Start of ${limitsdfile} from ${P}
@@ -127,20 +134,24 @@ src_prepare() {
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_use_feature zeroconf avahi)
 		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
-		$(meson_native_enabled media-session)
+		$(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)
+
 		-Dsystemd-system-service=disabled # Matches upstream
+		-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 (-Dmedia-session depends on this)
+		-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)
@@ -151,6 +162,7 @@ multilib_src_configure() {
 		$(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
 		-Dcontrol=enabled # Matches upstream
 		-Daudiotestsrc=enabled # Matches upstream
@@ -162,8 +174,10 @@ multilib_src_configure() {
 		-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
@@ -173,13 +187,14 @@ multilib_src_configure() {
 		-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
 	)
 
 	meson_src_configure
 }
 
 multilib_src_install() {
-	# Our customs DOCS do not exist in multilib source directory
+	# Our custom DOCS do not exist in multilib source directory
 	DOCS= meson_src_install
 }
 
@@ -191,7 +206,7 @@ multilib_src_install_all() {
 
 	if use pipewire-alsa; then
 		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# 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.conf /etc/alsa/conf.d/99-pipewire-default.conf
@@ -199,10 +214,11 @@ multilib_src_install_all() {
 
 	if ! use systemd; then
 		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
 
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
 	fi
 }
 
@@ -224,52 +240,74 @@ pkg_postinst() {
 	fi
 
 	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled:"
+		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
 		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
 		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
+		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 disable pulseaudio.service pulseaudio.socket"
+		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 pipewire-media-session:"
+		elog "Both new users and those upgrading need to enable WirePlumber"
+		elog "for relevant users:"
 		elog
-		elog "  systemctl --user enable pipewire-media-session.service"
+		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
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing 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}/etc/pipewire/pipewire.conf by commenting out the relevant"
-		elog "command near the end of the file:"
-		elog
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
+		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 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: ${EROOT}/etc/pulse/client.conf and disable"
+			elog "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, package is no longer installing config"
+		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 "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override sections you want 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 vai D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	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
 }