File: s0087.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 (52 lines) | stat: -rw-r--r-- 1,525 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
From: Nico Grunbaum <na-g@nostrum.com>
Date: Thu, 2 May 2024 00:47:00 -0700
Subject: Bug 1892299 - fix-afaae4e38a - fix adapted_track_source build
 exclusion;r?mjf

Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/60304c5d8a86fdecfe7527e75629dbc65fc9cbc1
---
 media/BUILD.gn | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/media/BUILD.gn b/media/BUILD.gn
index 0f58959926..6dcbc2bb33 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -56,6 +56,11 @@ rtc_library("rtc_media_base") {
     "base/video_broadcaster.h",  # Used downstream
     "base/video_common.h",  # Used downstream
   ]
+  if (build_with_mozilla) {
+    sources -= [
+      "base/adapted_video_track_source.h",
+    ]
+  }
   deps = [
     ":adapted_video_track_source",
     ":codec",
@@ -129,12 +134,6 @@ rtc_library("rtc_media_base") {
     "../video/config:encoder_config",
     "//third_party/abseil-cpp/absl/base:core_headers",
   ]
-    if (build_with_mozilla) {
-    sources -= [
-      "base/adapted_video_track_source.cc",
-      "base/adapted_video_track_source.h",
-    ]
-  }
 }
 
 rtc_library("adapted_video_track_source") {
@@ -142,6 +141,12 @@ rtc_library("adapted_video_track_source") {
     "base/adapted_video_track_source.cc",
     "base/adapted_video_track_source.h",
   ]
+  if (build_with_mozilla) {
+    sources -= [
+      "base/adapted_video_track_source.cc",
+      "base/adapted_video_track_source.h",
+    ]
+  }
   deps = [
     ":video_adapter",
     ":video_broadcaster",