File: s0055.patch

package info (click to toggle)
firefox 147.0.2-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 4,683,484 kB
  • sloc: cpp: 7,607,246; javascript: 6,533,185; ansic: 3,775,227; python: 1,415,393; xml: 634,561; asm: 438,951; java: 186,241; sh: 62,752; makefile: 18,079; objc: 13,092; perl: 12,808; yacc: 4,583; cs: 3,846; pascal: 3,448; lex: 1,720; ruby: 1,003; php: 436; lisp: 258; awk: 247; sql: 66; sed: 54; csh: 10; exp: 6
file content (78 lines) | stat: -rw-r--r-- 1,989 bytes parent folder | download
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
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
From: Andreas Pehrson <apehrson@mozilla.com>
Date: Mon, 12 Dec 2022 15:47:00 +0000
Subject: Bug 1451394 - Expose mac camera capture backend in .gn and switch it
 to gecko libyuv. r=webrtc-reviewers,mjf

Differential Revision: https://phabricator.services.mozilla.com/D163682
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b0658888969395dca938597783c8a377b9bea209
---
 BUILD.gn     | 4 ++++
 sdk/BUILD.gn | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/BUILD.gn b/BUILD.gn
index bcf71680dc..33ed200085 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -628,6 +628,10 @@ if (!build_with_chromium) {
       ]
     }
 
+    if (build_with_mozilla && is_mac) {
+      deps += [ "sdk:videocapture_objc" ]
+    }
+
     if (rtc_enable_protobuf) {
       deps += [ "logging:rtc_event_log_proto" ]
     }
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 75f5ee2541..ef363d15a6 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -571,6 +571,7 @@ if (is_ios || is_mac) {
       }
     }
 
+    if (!build_with_mozilla) {
     rtc_library("videosource_objc") {
       sources = [
         "objc/api/peerconnection/RTCVideoSource+Private.h",
@@ -600,6 +601,7 @@ if (is_ios || is_mac) {
         ":used_from_extension",
       ]
     }
+    }
 
     rtc_library("videoframebuffer_objc") {
       visibility = [ "*" ]
@@ -632,6 +634,7 @@ if (is_ios || is_mac) {
       ]
     }
 
+    if (!build_with_mozilla) {
     rtc_library("metal_objc") {
       visibility = [ "*" ]
       allow_poison = [
@@ -693,6 +696,7 @@ if (is_ios || is_mac) {
         ":videoframebuffer_objc",
       ]
     }
+    }
 
     rtc_library("videocapture_objc") {
       visibility = [ "*" ]
@@ -721,6 +725,7 @@ if (is_ios || is_mac) {
       ]
     }
 
+    if (!build_with_mozilla) {
     rtc_library("videocodec_objc") {
       visibility = [ "*" ]
       configs += [ "..:no_global_constructors" ]
@@ -1820,5 +1825,6 @@ if (is_ios || is_mac) {
         "VideoToolbox.framework",
       ]
     }
+    }
   }
 }