1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
From: Michael Froman <mfroman@mozilla.com>
Date: Thu, 28 Sep 2023 14:12:00 +0000
Subject: Bug 1832465 - remove libXtst usage from libwebrtc.
r=ng,webrtc-reviewers
Differential Revision: https://phabricator.services.mozilla.com/D189386
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/0ec1b33b95dbb2d39355f28b2812fe25b4ad9f20
---
modules/desktop_capture/BUILD.gn | 3 +++
modules/desktop_capture/linux/x11/shared_x_display.cc | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index dcc1b3c6ac..0634e0e9c4 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -384,6 +384,9 @@ rtc_library("desktop_capture") {
"Xrandr",
"Xtst",
]
+ if (build_with_mozilla) {
+ libs -= [ "Xtst" ]
+ }
}
if (!is_win && !is_mac && !rtc_use_x11_extensions && !rtc_use_pipewire &&
diff --git a/modules/desktop_capture/linux/x11/shared_x_display.cc b/modules/desktop_capture/linux/x11/shared_x_display.cc
index d690b0e2ba..3f3617b074 100644
--- a/modules/desktop_capture/linux/x11/shared_x_display.cc
+++ b/modules/desktop_capture/linux/x11/shared_x_display.cc
@@ -11,7 +11,9 @@
#include "modules/desktop_capture/linux/x11/shared_x_display.h"
#include <X11/Xlib.h>
+#if !defined(WEBRTC_MOZILLA_BUILD)
#include <X11/extensions/XTest.h>
+#endif
#include <algorithm>
@@ -95,6 +97,7 @@ void SharedXDisplay::ProcessPendingXEvents() {
}
void SharedXDisplay::IgnoreXServerGrabs() {
+#if !defined(WEBRTC_MOZILLA_BUILD)
int test_event_base = 0;
int test_error_base = 0;
int major = 0;
@@ -103,6 +106,7 @@ void SharedXDisplay::IgnoreXServerGrabs() {
&minor)) {
XTestGrabControl(display(), true);
}
+#endif
}
} // namespace webrtc
|
