Michael Froman
0f781eb82b
Upstream commit: https://webrtc.googlesource.com/src/+/4e3c057bedc15913c832750c3ee0fbf1f5b32450 Wayland screencast: use PipeWire built from sources This allows us to use newer APIs without needing to redefine missing bits because of the outdated PipeWire available in the sysroot. Also switch from using PipeWire from pre-built CIPD package and build our own from sources. Bug: chromium:493637569 Change-Id: Iae4ff3c60a5657cb5fc5a13a61d45a6fd7403d8d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/457920 Reviewed-by: Alexander Cooper <alcooper@chromium.org> Commit-Queue: Jan Grulich <grulja@gmail.com> Reviewed-by: Jeremy Leconte <jleconte@google.com> Cr-Commit-Position: refs/heads/main@{#48250}
64 lines
2.1 KiB
Diff
64 lines
2.1 KiB
Diff
From: Jan Grulich <jgrulich@redhat.com>
|
|
Date: Mon, 14 Apr 2025 16:37:00 +0000
|
|
Subject: Bug 1954903 - Update libwebrtc GN configs r=webrtc-reviewers,mjf
|
|
|
|
Update GN config files for the special handling in gn_processor.py for
|
|
gbm, drm and PipeWire libraries.
|
|
|
|
Also remove libwebrtc/third_party/[gbm,drm,pipewire] libs for which we
|
|
now have a special handling in gn_processor.py.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D242101
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/506d4efaf2dc29472623beff64cc2bd0d5555afd
|
|
---
|
|
modules/desktop_capture/BUILD.gn | 4 ++++
|
|
modules/portal/BUILD.gn | 4 +---
|
|
modules/video_capture/BUILD.gn | 2 +-
|
|
3 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
|
|
index 6fdac0cabf..4abfd48931 100644
|
|
--- a/modules/desktop_capture/BUILD.gn
|
|
+++ b/modules/desktop_capture/BUILD.gn
|
|
@@ -873,6 +873,10 @@ rtc_library("desktop_capture") {
|
|
"../../rtc_base:sanitizer",
|
|
"../portal",
|
|
]
|
|
+
|
|
+ if (build_with_mozilla) {
|
|
+ defines += [ "WEBRTC_USE_PIPEWIRE" ]
|
|
+ }
|
|
}
|
|
|
|
if (rtc_enable_win_wgc) {
|
|
diff --git a/modules/portal/BUILD.gn b/modules/portal/BUILD.gn
|
|
index dc0d234db3..7c020a9004 100644
|
|
--- a/modules/portal/BUILD.gn
|
|
+++ b/modules/portal/BUILD.gn
|
|
@@ -146,11 +146,9 @@ if (!build_with_mozilla) {
|
|
deps -= [ ":pipewire_stubs" ]
|
|
defines -= [ "WEBRTC_DLOPEN_PIPEWIRE" ]
|
|
public_deps = [
|
|
- "../../third_party/pipewire",
|
|
- "../../third_party/drm",
|
|
- "../../third_party/gbm",
|
|
"../../third_party/libepoxy"
|
|
]
|
|
+ defines += [ "WEBRTC_USE_PIPEWIRE" ]
|
|
}
|
|
}
|
|
}
|
|
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
|
|
index dbcc162510..5d581b823a 100644
|
|
--- a/modules/video_capture/BUILD.gn
|
|
+++ b/modules/video_capture/BUILD.gn
|
|
@@ -114,7 +114,7 @@ if (!build_with_chromium || is_linux || is_chromeos) {
|
|
]
|
|
if (build_with_mozilla) {
|
|
configs -= [ "../portal:pipewire_base" ]
|
|
- public_deps = [ "../../third_party/pipewire" ]
|
|
+ defines = [ "WEBRTC_USE_PIPEWIRE" ]
|
|
}
|
|
}
|
|
}
|