gentoo auto-resync : 02:07:2024 - 08:01:06

8 files changed, 287 insertions, 5 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 6ce283956e06..4d34db06b288 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 6208b48cfedb..8438a5cc03c2 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,6 +3,9 @@ AUX gentoo-pipewire-launcher.1 1633 BLAKE2B 36c8888693bd0389dc9b1e49d0501d267995
 AUX gentoo-pipewire-launcher.in-r3 2848 BLAKE2B 5e6b8ca2df88cef240ca1ff4de28cc8ed3590fabd29b903b37880baf9cf52c35ca01be25b031898d4ee06f4600a5f0c61025a244778577a562f4a4bfa14e2aca SHA512 43cf3e07058e86bf6651106f7f192022c05c5640ba8e101b88e98a83efcc5614f9474107b6d0daf3d5234a51ebcc0a3a7ae5b359d9ba36b648c125813f4e1334
 AUX gentoo-sound-server-enable-audio-bluetooth.conf 106 BLAKE2B 79945d2dac9671d9b85f6334afb43ff3f35db555d460e82bccee0f1f8ec4a8bf5e6de3b340698a4e9db80a5dc181c4824b9265bf0fce43bef61afd50177ef70a SHA512 fede2c9dc6256894aa29cf72ede8ba42874cf0706d81031d724ca5b43fa424d09009ec6eb685737623f3c5eadb9b095060b0ce48b7325d68d4b07225b07aa2fe
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
+AUX pipewire-1.0.7-automagic-gsettings.patch 3429 BLAKE2B b6184a1edc18396c3fde3b020d2c0222df1086a261d2da18a2d8345f7ef7f813144df0948e8863180afbd5b56b797e5eed2fdf324e9cf2b2b637a4685641a932 SHA512 7a9d71bf631974d88fdc5adb9f4d7ea7d46c589812c3d9b0a4767ed5d9e117ed88db456f723176acc7abe73a59591a57bcffd0384d2d5822e94656a5d9efc293
+AUX pipewire-1.0.7-automagic-webrtc-audio-processing.patch 3745 BLAKE2B 65978f89fb1dd9e4aa56d7e116fd650efb36d9730d9eae2ead02c77f6b9e567c8b881314ed1ca71af45f7ba0f23b482f14036eefdb87d298e0c90eacfecf3ce3 SHA512 d8dcb1eb0234dff76a9a48b54c57e73505d81f29b043d5ef7ad6974fbe976b7ab8480f622c0664e112375875e2b9dc7d78dde5e481376b7cfa488e54119c5bf2
+AUX pipewire-1.2.0-automagic-gsettings.patch 3635 BLAKE2B 4d04dc3a14f24c446868fa6a336309963c23800b79e4095db3de15bf59832bc5788999c97c75627dbadcbae1c21372a3d4ca4cd5b8e17569543f6963a888d2d0 SHA512 cdda4f434d1698d08b22687e21c01a7fbf22bde0aeecca11c70f1ee9aed61d27f183d11359a881cb6cb8bd22b04afa5dfb037725db42b5b8da32270d90677120
 AUX pipewire.desktop-r2 333 BLAKE2B 6a8805bb4ea3f23af535867c0551b8f742543de1fa8d99d2b451575066c3394b01977587078356dab65a640899bf336252b7f81b83072c676110fce9b0732eff SHA512 292fbc7283b30454025be50c657803dcb0592c9a6f0757eebe4de5a98166c3bcfeb5563da3d72489762073fe782b5e1f913c01184fbd2e926d872fc7ade73eb7
 DIST pipewire-1.0.0-docs.tar.xz 33632 BLAKE2B be06aa7242f7d2f8627b3bf2a2ae491dbda456a24811a767218eb89b1fd5961a461697e5d8ae2782323fdb927985fa4fd5dd40c21268b1c7939f4cd3c9e1a9ab SHA512 14f794c4152d7d9a4a7d9d4d5c2ff381c2a8262deaff034f993c4d28629fca8cc3d71d3a7c02982703e449fae5f58257fea0c20db02bf95b5aed88a4d99d2c58
 DIST pipewire-1.0.5.tar.bz2 1698291 BLAKE2B 0f919a01b5f84060fb2ce560a7790a0d59374671f52a941492930fe21ac39178688f27f00cad649d239901f88b392e16895648efae2ec2785c394c1f6d186ddf SHA512 18fbbe36c8752eb0f1df5ee3f3fffee279addcec9825281bd165ad8316f17af7e91bb5759f63c16139c074b03e5a77ef9d596a87f584d1580bbb754101b70a0f
@@ -13,7 +16,7 @@ DIST pipewire-1.2.0.tar.bz2 1810104 BLAKE2B a20caae515d800f80f607aeba585609ce9f4
 EBUILD pipewire-1.0.5-r1.ebuild 19283 BLAKE2B c873436b2f3cad35aa2d6797085823cc215d621b275634c25c3b79e00a56121a97824f3092df74b13809a9ea7639b669710fb9ae7476441209c9f7aff1496827 SHA512 f290058849e339a64bb897e831618b9f886b9c6b7754a0f3b4301fc94be929c0531ffd6c98754228c30bc308371e508021fa907252028d6a5a57d14314d4b5b6
 EBUILD pipewire-1.0.5.ebuild 19988 BLAKE2B 49df8fcf2e136537401ebab8673c0815a275c2deb29a2779306a77536d2db0688c81e69bbf768061a2ee3e94888da5e77e12055594bf84b14951fd28f12e248c SHA512 5d6506afa393f6286ba33a88cdf17f739a265e2f09baf1b7f9ff5fb239a7b4d87b32ce553d366bfaf6ba36f4384982cf73a521488118d2e5f33d87b4cc9467e3
 EBUILD pipewire-1.0.6.ebuild 19283 BLAKE2B c873436b2f3cad35aa2d6797085823cc215d621b275634c25c3b79e00a56121a97824f3092df74b13809a9ea7639b669710fb9ae7476441209c9f7aff1496827 SHA512 f290058849e339a64bb897e831618b9f886b9c6b7754a0f3b4301fc94be929c0531ffd6c98754228c30bc308371e508021fa907252028d6a5a57d14314d4b5b6
-EBUILD pipewire-1.0.7.ebuild 19277 BLAKE2B d97bbf129c960bc2d2d69ce71fd4873d305e9390f427d118bdaff0dc4d88bbadc3253303f8139f065c149d7431525c98d54943f70b567a241ff2019fc9c84b7a SHA512 aff7291ae34be08bbb17165d761e00eedd8b6037c6717f016d1f6e66565c2bae59d94be2b2ebb10aaed69ee0d00066a06fe64b3da4bf650549b1658915ddad04
-EBUILD pipewire-1.2.0.ebuild 19371 BLAKE2B b5a2e13de1904f02eb8fdf43fd6e1f12f976138c6712fde5fcee293f4f263204a50163cbc9264c675d689b2a5031f7d0587b154645fca2b532fb910f31c66abc SHA512 593a1da78b367c33eb40b31f72a1b77aba200b06f8dee737f68797c32b95e60939feb13daa97b9d8af9b745bdf1eb4058701549fc98b0b27fd406618f7908266
-EBUILD pipewire-9999.ebuild 19371 BLAKE2B b5a2e13de1904f02eb8fdf43fd6e1f12f976138c6712fde5fcee293f4f263204a50163cbc9264c675d689b2a5031f7d0587b154645fca2b532fb910f31c66abc SHA512 593a1da78b367c33eb40b31f72a1b77aba200b06f8dee737f68797c32b95e60939feb13daa97b9d8af9b745bdf1eb4058701549fc98b0b27fd406618f7908266
+EBUILD pipewire-1.0.7.ebuild 19565 BLAKE2B c0250fdcf5157412d74ef4c020d64b571f84cf75296fe900a4fa964352782f440bc05b413df6475e227c42b526b9e423f23aafa19debc65d18018a43a85452cf SHA512 77f9b34964a14f34a855a8061860b4ce5a6de0ad75f99bc1d599c9c0ad318b6e4604b449e7a0c0483cc4439ce39d4233d2a2cedc1f92ad2b7c3e12ba317841bc
+EBUILD pipewire-1.2.0.ebuild 19711 BLAKE2B 65857f3b19d08a242973dc65fc333556b8ec0d8e91f56e712706ff8a217f3aa5cecdaa7dd43002e8391b61feb96e818c852d68a8cf4d9930906cd7fbf3d228f1 SHA512 bc94f1000e8ad0b7ba91199d240fa8ac15e55f50bab175be6390d040238f8682df5235a5871aa528c5cd36c429a8bc1a7a838660614265696862389ac9cea6c9
+EBUILD pipewire-9999.ebuild 19591 BLAKE2B 4c2d6315cad7fb2746817dbc15fe29f3a2007e8abc83a338952ee0f82a1113dbfd8d0426595fd6d5c3c1ea7e4a1d7b87e135b2202e563b95a06ad4403cf684e9 SHA512 f8341246a2c4403375f8493966d42801d1a4846d2a3a6e9464421a50bddf95dca5c3b7832c042e63ef68773550e009235e55d98f3a90178419ee15c73ddad936
 MISC metadata.xml 2156 BLAKE2B 974459115e0f3cf4e4c3ac15159740b42e01a093da37d8a27f80e122c9ab2a3fe9194443eaf08f9b66d613db90a14465abbe1b76816bce90e11a46c8409c7513 SHA512 cfe0fdb86c993f167507e22635878d6d7d5dcd48f4c23323231263551ceff986fc454700428ecb7d2ee2abe82093c35d8e7bd491020fd6dd3f3889c09e9020bb
diff --git a/media-video/pipewire/files/pipewire-1.0.7-automagic-gsettings.patch b/media-video/pipewire/files/pipewire-1.0.7-automagic-gsettings.patch
new file mode 100644
index 000000000000..bde229b80b24
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-1.0.7-automagic-gsettings.patch
@@ -0,0 +1,80 @@
+From acc75b21f653873ec1da68bfa08f2945a8dd09d2 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 30 Jun 2024 13:44:06 -0400
+Subject: [PATCH] meson: fix conflicting use of feature-based dependency
+ lookups
+
+When spa-plugins is enabled, the gio-2.0 global dependency is
+overwritten.
+
+When bluez support is enabled, OR when gsettings is enabled, the gio-2.0
+dependency is then detected as found. This means that
+pipewire-module-protocol-pulse can end up enabling gsettings support
+even if it has been forcibly turned off.
+
+Rename the meson variables to ensure they are looked up separately.
+
+(cherry picked from commit b5f031bc15524bbfde577290ad9bbadeab77ae8b)
+Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
+---
+ meson.build             | 4 ++--
+ spa/meson.build         | 6 +++---
+ src/modules/meson.build | 4 ++--
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 0ea256e9b..3353a2aec 100644
+--- a/meson.build
++++ b/meson.build
+@@ -343,8 +343,8 @@ summary({'GLib-2.0 (Flatpak support)': glib2_dep.found()}, bool_yn: true, sectio
+ flatpak_support = glib2_dep.found()
+ cdata.set('HAVE_GLIB2', flatpak_support)
+ 
+-gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
+-summary({'GIO (GSettings)': gio_dep.found()}, bool_yn: true, section: 'Misc dependencies')
++gsettings_gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
++summary({'GIO (GSettings)': gsettings_gio_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+ 
+ gst_option = get_option('gstreamer')
+ gst_deps_def = {
+diff --git a/spa/meson.build b/spa/meson.build
+index db0a84425..e37744b08 100644
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -43,12 +43,12 @@ if get_option('spa-plugins').allowed()
+   summary({'ALSA': alsa_dep.found()}, bool_yn: true, section: 'Backend')
+ 
+   bluez_dep = dependency('bluez', version : '>= 4.101', required: get_option('bluez5'))
+-  gio_dep = dependency('gio-2.0', required : get_option('bluez5'))
+-  gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5'))
++  bluez_gio_dep = dependency('gio-2.0', required : get_option('bluez5'))
++  bluez_gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5'))
+   bluez_glib2_dep = dependency('glib-2.0', required : get_option('bluez5'))
+   sbc_dep = dependency('sbc', required: get_option('bluez5'))
+   summary({'SBC': sbc_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+-  bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, gio_dep, gio_unix_dep ]
++  bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, bluez_gio_dep, bluez_gio_unix_dep ]
+   bluez_deps_found = get_option('bluez5').allowed()
+   foreach dep: bluez5_deps
+       if get_option('bluez5').enabled() and not dep.found()
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index 1b434b7f6..52660253e 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -409,11 +409,11 @@ if avahi_dep.found()
+   cdata.set('HAVE_AVAHI', true)
+ endif
+ 
+-if gio_dep.found()
++if gsettings_gio_dep.found()
+   pipewire_module_protocol_pulse_sources += [
+     'module-protocol-pulse/modules/module-gsettings.c',
+   ]
+-  pipewire_module_protocol_pulse_deps += gio_dep
++  pipewire_module_protocol_pulse_deps += gsettings_gio_dep
+   cdata.set('HAVE_GIO', true)
+ endif
+ 
+-- 
+2.44.2
+
diff --git a/media-video/pipewire/files/pipewire-1.0.7-automagic-webrtc-audio-processing.patch b/media-video/pipewire/files/pipewire-1.0.7-automagic-webrtc-audio-processing.patch
new file mode 100644
index 000000000000..ac245dd7cc15
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-1.0.7-automagic-webrtc-audio-processing.patch
@@ -0,0 +1,95 @@
+From acd5bf60b9d4a35d00c90bfdca7f89e4ff4a4ff7 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Thu, 30 May 2024 19:44:38 -0400
+Subject: [PATCH] meson: fix webrtc-audio-processing dependency ignoring
+ configure args
+
+Most dependencies use meson "feature" options for optional
+functionality. This allows people to disable them, if they don't want
+them, through the power of tristate decision-making.
+
+This particular dependency does something a bit more complicated than
+can be described by simply passing feature options to the required
+kwarg. It:
+
+- tries to look for two different names of the dependency
+- selects different version ranges, depending on the dependency name
+- has a hole in the middle of the versions
+
+Unfortunately, `required: false` for the first dependency isn't
+equivalent to a tristate decision-making process. We have to manually
+code the logic ourselves.
+
+The problem is that when we look up the first name, we cannot pass the
+feature option in because if the option is force enabled, then the
+dependency lookup fails and configuration never tries to find the older
+version instead.
+
+But also, we can't just say it *isn't* required, because if the option
+is force *disabled* but it is installed on the system, we still find it
+and build against it.
+
+One solution would be using meson 0.60's support for multiple dependency
+names:
+
+```
+dependency('webrtc-audio-processing-1', 'webrtc-audio-processing',
+    version : ['>= 0.2'],
+    required: get_option('echo-cancel-webrtc'),
+)
+```
+
+Unfortunately, this too doesn't work since we could end up detecting 1.1
+(the hole in the middle) which is invalid.
+
+Instead, we do a bit of checking for tristate values before deciding to
+invoke `dependency()`. This lets us guarantee that disabled dependencies
+are well and truly disabled.
+
+Bug: https://bugs.gentoo.org/933218
+Fixes: #3678
+---
+ meson.build | 25 +++++++++++++++----------
+ 1 file changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index cda60112f..72d275086 100644
+--- a/meson.build
++++ b/meson.build
+@@ -393,18 +393,23 @@ cdata.set('HAVE_GSTREAMER_DEVICE_PROVIDER', get_option('gstreamer-device-provide
+ summary({'gstreamer DMA_DRM support': gst_dma_drm_found}, bool_yn: true, section: 'Backend')
+ cdata.set('HAVE_GSTREAMER_DMA_DRM', gst_dma_drm_found)
+ 
+-webrtc_dep = dependency('webrtc-audio-processing-1',
+-  version : ['>= 1.2' ],
+-  required : false)
+-cdata.set('HAVE_WEBRTC1', webrtc_dep.found())
+-if webrtc_dep.found()
++if get_option('echo-cancel-webrtc').disabled()
++  webrtc_dep = dependency('', required: false)
+   summary({'WebRTC Echo Canceling >= 1.2': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+ else
+-  webrtc_dep = dependency('webrtc-audio-processing',
+-    version : ['>= 0.2', '< 1.0'],
+-    required : get_option('echo-cancel-webrtc'))
+-  cdata.set('HAVE_WEBRTC', webrtc_dep.found())
+-  summary({'WebRTC Echo Canceling < 1.0': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')
++  webrtc_dep = dependency('webrtc-audio-processing-1',
++    version : ['>= 1.2' ],
++    required : false)
++  cdata.set('HAVE_WEBRTC1', webrtc_dep.found())
++  if webrtc_dep.found()
++    summary({'WebRTC Echo Canceling >= 1.2': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')
++  else
++    webrtc_dep = dependency('webrtc-audio-processing',
++      version : ['>= 0.2', '< 1.0'],
++      required : get_option('echo-cancel-webrtc'))
++    cdata.set('HAVE_WEBRTC', webrtc_dep.found())
++    summary({'WebRTC Echo Canceling < 1.0': webrtc_dep.found()}, bool_yn: true, section: 'Misc dependencies')
++  endif
+ endif
+ 
+ # On FreeBSD and MidnightBSD, epoll-shim library is required for eventfd() and timerfd()
+-- 
+GitLab
+
diff --git a/media-video/pipewire/files/pipewire-1.2.0-automagic-gsettings.patch b/media-video/pipewire/files/pipewire-1.2.0-automagic-gsettings.patch
new file mode 100644
index 000000000000..ab102a606c82
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-1.2.0-automagic-gsettings.patch
@@ -0,0 +1,79 @@
+From b5f031bc15524bbfde577290ad9bbadeab77ae8b Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 30 Jun 2024 13:44:06 -0400
+Subject: [PATCH] meson: fix conflicting use of feature-based dependency
+ lookups
+
+When spa-plugins is enabled, the gio-2.0 global dependency is
+overwritten.
+
+When bluez support is enabled, OR when gsettings is enabled, the gio-2.0
+dependency is then detected as found. This means that
+pipewire-module-protocol-pulse can end up enabling gsettings support
+even if it has been forcibly turned off.
+
+Rename the meson variables to ensure they are looked up separately.
+---
+ meson.build             | 6 +++---
+ spa/meson.build         | 6 +++---
+ src/modules/meson.build | 4 ++--
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 2607c5c8f4..38b6b59d00 100644
+--- a/meson.build
++++ b/meson.build
+@@ -346,9 +346,9 @@ summary({'GLib-2.0 (Flatpak support)': glib2_dep.found()}, bool_yn: true, sectio
+ flatpak_support = glib2_dep.found()
+ cdata.set('HAVE_GLIB2', flatpak_support)
+ 
+-gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
+-summary({'GIO (GSettings)': gio_dep.found()}, bool_yn: true, section: 'Misc dependencies')
+-if not gio_dep.found() and get_option('gsettings-pulse-schema').enabled()
++gsettings_gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
++summary({'GIO (GSettings)': gsettings_gio_dep.found()}, bool_yn: true, section: 'Misc dependencies')
++if not gsettings_gio_dep.found() and get_option('gsettings-pulse-schema').enabled()
+   error('`gsettings-pulse-schema` is enabled but `gio` was not found.')
+ endif
+ 
+diff --git a/spa/meson.build b/spa/meson.build
+index 67e4b5c506..cf25609dab 100644
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -47,12 +47,12 @@ if get_option('spa-plugins').allowed()
+   summary({'ALSA': alsa_dep.found()}, bool_yn: true, section: 'Backend')
+ 
+   bluez_dep = dependency('bluez', version : '>= 4.101', required: get_option('bluez5'))
+-  gio_dep = dependency('gio-2.0', required : get_option('bluez5'))
+-  gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5'))
++  bluez_gio_dep = dependency('gio-2.0', required : get_option('bluez5'))
++  bluez_gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5'))
+   bluez_glib2_dep = dependency('glib-2.0', required : get_option('bluez5'))
+   sbc_dep = dependency('sbc', required: get_option('bluez5'))
+   summary({'SBC': sbc_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+-  bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, gio_dep, gio_unix_dep ]
++  bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, bluez_gio_dep, bluez_gio_unix_dep ]
+   bluez_deps_found = get_option('bluez5').allowed()
+   foreach dep: bluez5_deps
+       if get_option('bluez5').enabled() and not dep.found()
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index ceaa7013d9..3f400f0877 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -433,11 +433,11 @@ if avahi_dep.found()
+   cdata.set('HAVE_AVAHI', true)
+ endif
+ 
+-if gio_dep.found()
++if gsettings_gio_dep.found()
+   pipewire_module_protocol_pulse_sources += [
+     'module-protocol-pulse/modules/module-gsettings.c',
+   ]
+-  pipewire_module_protocol_pulse_deps += gio_dep
++  pipewire_module_protocol_pulse_deps += gsettings_gio_dep
+   cdata.set('HAVE_GIO', true)
+   if get_option('gsettings-pulse-schema').enabled()
+     install_data(['module-protocol-pulse/modules/org.freedesktop.pulseaudio.gschema.xml'],
+-- 
+GitLab
+
diff --git a/media-video/pipewire/pipewire-1.0.7.ebuild b/media-video/pipewire/pipewire-1.0.7.ebuild
index 69bb29b9e1af..fa900f161e78 100644
--- a/media-video/pipewire/pipewire-1.0.7.ebuild
+++ b/media-video/pipewire/pipewire-1.0.7.ebuild
@@ -175,6 +175,11 @@ PDEPEND=">=media-video/wireplumber-0.5.2"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	# https://bugs.gentoo.org/933218
+	# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/2028
+	"${FILESDIR}"/${P}-automagic-webrtc-audio-processing.patch
+	# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/2061
+	"${FILESDIR}"/${P}-automagic-gsettings.patch
 )
 
 pkg_setup() {
diff --git a/media-video/pipewire/pipewire-1.2.0.ebuild b/media-video/pipewire/pipewire-1.2.0.ebuild
index bffc3587f167..f4aeba1f7ea4 100644
--- a/media-video/pipewire/pipewire-1.2.0.ebuild
+++ b/media-video/pipewire/pipewire-1.2.0.ebuild
@@ -175,6 +175,8 @@ PDEPEND=">=media-video/wireplumber-0.5.2"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/2061
+	"${FILESDIR}"/${P}-automagic-gsettings.patch
 )
 
 pkg_setup() {
@@ -205,7 +207,6 @@ multilib_src_configure() {
 		$(meson_native_use_feature gstreamer)
 		$(meson_native_use_feature gstreamer gstreamer-device-provider)
 		$(meson_native_use_feature gsettings)
-		$(meson_native_use_feature gsettings gsettings-pulse-schema)
 		$(meson_native_use_feature systemd)
 
 		$(meson_native_use_feature system-service systemd-system-service)
@@ -280,6 +281,16 @@ multilib_src_configure() {
 		-Dsnap=disabled
 	)
 
+	# This installs the schema file for pulseaudio-daemon, iff we are replacing
+	# the official sound-server
+	if use !sound-server; then
+		emesonargs+=( '-Dgsettings-pulse-schema=disabled' )
+	else
+		emesonargs+=(
+			$(meson_native_use_feature gsettings gsettings-pulse-schema)
+		)
+	fi
+
 	meson_src_configure
 }
 
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index bffc3587f167..785496b22c13 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -205,7 +205,6 @@ multilib_src_configure() {
 		$(meson_native_use_feature gstreamer)
 		$(meson_native_use_feature gstreamer gstreamer-device-provider)
 		$(meson_native_use_feature gsettings)
-		$(meson_native_use_feature gsettings gsettings-pulse-schema)
 		$(meson_native_use_feature systemd)
 
 		$(meson_native_use_feature system-service systemd-system-service)
@@ -280,6 +279,16 @@ multilib_src_configure() {
 		-Dsnap=disabled
 	)
 
+	# This installs the schema file for pulseaudio-daemon, iff we are replacing
+	# the official sound-server
+	if use !sound-server; then
+		emesonargs+=( '-Dgsettings-pulse-schema=disabled' )
+	else
+		emesonargs+=(
+			$(meson_native_use_feature gsettings gsettings-pulse-schema)
+		)
+	fi
+
 	meson_src_configure
 }