commit:     08c7484b3de49e3b077974b6a1f0de326738193c
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Mon Oct 20 21:53:52 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 21 01:13:25 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08c7484b

media-video/pipewire: support webrtc-audio-processing-2

Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44267
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/pipewire/pipewire-1.4.7-r2.ebuild | 10 +++++++---
 media-video/pipewire/pipewire-1.4.8-r2.ebuild | 10 +++++++---
 media-video/pipewire/pipewire-1.4.9.ebuild    | 10 +++++++---
 media-video/pipewire/pipewire-1.4.9999.ebuild | 10 +++++++---
 media-video/pipewire/pipewire-9999.ebuild     | 10 +++++++---
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/media-video/pipewire/pipewire-1.4.7-r2.ebuild 
b/media-video/pipewire/pipewire-1.4.7-r2.ebuild
index 3bbed9ef6fc8..38f58bc9ee42 100644
--- a/media-video/pipewire/pipewire-1.4.7-r2.ebuild
+++ b/media-video/pipewire/pipewire-1.4.7-r2.ebuild
@@ -107,8 +107,7 @@ BDEPEND="
 # * While udev could technically be optional, it's needed for a number of 
options,
 # and not really worth it, bug #877769.
 #
-# * Supports both legacy webrtc-audio-processing:2 and new 
webrtc-audio-processing:1.
-# Automagic but :2 isn't yet packaged.
+# * Supports both new webrtc-audio-processing:2 and legacy 
webrtc-audio-processing:1.
 #
 # * Older Doxygen (<1.9.8) may work but inferior output is created:
 #   - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1778
@@ -132,7 +131,12 @@ RDEPEND="
        )
        elogind? ( sys-auth/elogind )
        dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 )
+       echo-cancel? (
+               || (
+                       >=media-libs/webrtc-audio-processing-2.0:2
+                       >=media-libs/webrtc-audio-processing-1.2:1
+               )
+       )
        extra? ( >=media-libs/libsndfile-1.0.20 )
        ffmpeg? ( media-video/ffmpeg:= )
        fftw? ( sci-libs/fftw:3.0=[${MULTILIB_USEDEP}] )

diff --git a/media-video/pipewire/pipewire-1.4.8-r2.ebuild 
b/media-video/pipewire/pipewire-1.4.8-r2.ebuild
index 5f5259610bd3..745e6d6a36b9 100644
--- a/media-video/pipewire/pipewire-1.4.8-r2.ebuild
+++ b/media-video/pipewire/pipewire-1.4.8-r2.ebuild
@@ -107,8 +107,7 @@ BDEPEND="
 # * While udev could technically be optional, it's needed for a number of 
options,
 # and not really worth it, bug #877769.
 #
-# * Supports both legacy webrtc-audio-processing:2 and new 
webrtc-audio-processing:1.
-# Automagic but :2 isn't yet packaged.
+# * Supports both new webrtc-audio-processing:2 and legacy 
webrtc-audio-processing:1.
 #
 # * Older Doxygen (<1.9.8) may work but inferior output is created:
 #   - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1778
@@ -132,7 +131,12 @@ RDEPEND="
        )
        elogind? ( sys-auth/elogind )
        dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 )
+       echo-cancel? (
+               || (
+                       >=media-libs/webrtc-audio-processing-2.0:2
+                       >=media-libs/webrtc-audio-processing-1.2:1
+               )
+       )
        extra? ( >=media-libs/libsndfile-1.0.20 )
        ffmpeg? ( media-video/ffmpeg:= )
        fftw? ( sci-libs/fftw:3.0=[${MULTILIB_USEDEP}] )

diff --git a/media-video/pipewire/pipewire-1.4.9.ebuild 
b/media-video/pipewire/pipewire-1.4.9.ebuild
index 69832cf73fcc..ef3c754b14f5 100644
--- a/media-video/pipewire/pipewire-1.4.9.ebuild
+++ b/media-video/pipewire/pipewire-1.4.9.ebuild
@@ -107,8 +107,7 @@ BDEPEND="
 # * While udev could technically be optional, it's needed for a number of 
options,
 # and not really worth it, bug #877769.
 #
-# * Supports both legacy webrtc-audio-processing:2 and new 
webrtc-audio-processing:1.
-# Automagic but :2 isn't yet packaged.
+# * Supports both new webrtc-audio-processing:2 and legacy 
webrtc-audio-processing:1.
 #
 # * Older Doxygen (<1.9.8) may work but inferior output is created:
 #   - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1778
@@ -132,7 +131,12 @@ RDEPEND="
        )
        elogind? ( sys-auth/elogind )
        dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 )
+       echo-cancel? (
+               || (
+                       >=media-libs/webrtc-audio-processing-2.0:2
+                       >=media-libs/webrtc-audio-processing-1.2:1
+               )
+       )
        extra? ( >=media-libs/libsndfile-1.0.20 )
        ffmpeg? ( media-video/ffmpeg:= )
        fftw? ( sci-libs/fftw:3.0=[${MULTILIB_USEDEP}] )

diff --git a/media-video/pipewire/pipewire-1.4.9999.ebuild 
b/media-video/pipewire/pipewire-1.4.9999.ebuild
index 69832cf73fcc..ef3c754b14f5 100644
--- a/media-video/pipewire/pipewire-1.4.9999.ebuild
+++ b/media-video/pipewire/pipewire-1.4.9999.ebuild
@@ -107,8 +107,7 @@ BDEPEND="
 # * While udev could technically be optional, it's needed for a number of 
options,
 # and not really worth it, bug #877769.
 #
-# * Supports both legacy webrtc-audio-processing:2 and new 
webrtc-audio-processing:1.
-# Automagic but :2 isn't yet packaged.
+# * Supports both new webrtc-audio-processing:2 and legacy 
webrtc-audio-processing:1.
 #
 # * Older Doxygen (<1.9.8) may work but inferior output is created:
 #   - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1778
@@ -132,7 +131,12 @@ RDEPEND="
        )
        elogind? ( sys-auth/elogind )
        dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 )
+       echo-cancel? (
+               || (
+                       >=media-libs/webrtc-audio-processing-2.0:2
+                       >=media-libs/webrtc-audio-processing-1.2:1
+               )
+       )
        extra? ( >=media-libs/libsndfile-1.0.20 )
        ffmpeg? ( media-video/ffmpeg:= )
        fftw? ( sci-libs/fftw:3.0=[${MULTILIB_USEDEP}] )

diff --git a/media-video/pipewire/pipewire-9999.ebuild 
b/media-video/pipewire/pipewire-9999.ebuild
index 666a2b0b2f8c..d367921c0956 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -105,8 +105,7 @@ BDEPEND="
 # * While udev could technically be optional, it's needed for a number of 
options,
 # and not really worth it, bug #877769.
 #
-# * Supports both legacy webrtc-audio-processing:2 and new 
webrtc-audio-processing:1.
-# Automagic but :2 isn't yet packaged.
+# * Supports both new webrtc-audio-processing:2 and legacy 
webrtc-audio-processing:1.
 #
 # * Older Doxygen (<1.9.8) may work but inferior output is created:
 #   - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1778
@@ -130,7 +129,12 @@ RDEPEND="
        )
        elogind? ( sys-auth/elogind )
        dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-       echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 )
+       echo-cancel? (
+               || (
+                       >=media-libs/webrtc-audio-processing-2.0:2
+                       >=media-libs/webrtc-audio-processing-1.2:1
+               )
+       )
        extra? ( >=media-libs/libsndfile-1.0.20 )
        ffmpeg? ( media-video/ffmpeg:= )
        fftw? ( sci-libs/fftw:3.0=[${MULTILIB_USEDEP}] )

Reply via email to