File: s0114.patch

package info (click to toggle)
firefox 149.0-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 4,767,760 kB
  • sloc: cpp: 7,416,064; javascript: 6,752,859; ansic: 3,774,850; python: 1,250,473; xml: 641,578; asm: 439,191; java: 186,617; sh: 56,634; makefile: 18,856; objc: 13,092; perl: 12,763; pascal: 5,960; yacc: 4,583; cs: 3,846; lex: 1,720; ruby: 1,002; php: 436; lisp: 258; awk: 105; sql: 66; sed: 53; csh: 10; exp: 6
file content (63 lines) | stat: -rw-r--r-- 2,186 bytes parent folder | download | duplicates (2)
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
57
58
59
60
61
62
63
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 f501b517fd..0a6ccf4011 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -557,6 +557,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 72972d18e1..70b4739ad0 100644
--- a/modules/portal/BUILD.gn
+++ b/modules/portal/BUILD.gn
@@ -139,11 +139,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 83c1b21260..e32e3ab37e 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -118,7 +118,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" ]
         }
       }
     }