Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Jul 2022 18:39:37 GMT
From:      Christoph Moench-Tegeder <cmt@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 5db62413655c - main - www/firefox: regenerate libwebrtc build files
Message-ID:  <202207141839.26EIdbpt051705@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by cmt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5db62413655cd5f25756b23012d0e8390f0917c5

commit 5db62413655cd5f25756b23012d0e8390f0917c5
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2022-07-14 18:38:39 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2022-07-14 18:38:39 +0000

    www/firefox: regenerate libwebrtc build files
    
    this seems to fix the build on i386.
    
    PR:             264857
---
 www/firefox/files/patch-libwebrtc-generated | 7021 ++++++++++++++-------------
 1 file changed, 3682 insertions(+), 3339 deletions(-)

diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index c1052ad4cca1..90d481d0446f 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,14 +1,15 @@
 diff --git third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-index 3dffbc4abb..aac5d092ef 100644
+index 989f348be6cc..db0bcfcded11 100644
 --- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
 +++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-@@ -67,6 +67,17 @@
+@@ -67,6 +67,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -20,7 +21,7 @@ index 3dffbc4abb..aac5d092ef 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@
+@@ -153,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -31,7 +32,7 @@ index 3dffbc4abb..aac5d092ef 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@
+@@ -169,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -42,30 +43,31 @@ index 3dffbc4abb..aac5d092ef 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@
- 
-     OS_LIBS += [
+@@ -195,6 +215,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
          "android_support"
-+    ]
-+
+     ]
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-     ]
- 
++    ]
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build
-index aca9f59966..1ea31b6a5e 100644
+index b9e9f3dd7ff9..9df1a7163a5a 100644
 --- third_party/libwebrtc/api/array_view_gn/moz.build
 +++ third_party/libwebrtc/api/array_view_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -77,7 +79,7 @@ index aca9f59966..1ea31b6a5e 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -141,6 +152,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -141,6 +153,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -88,7 +90,7 @@ index aca9f59966..1ea31b6a5e 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -157,6 +172,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -157,6 +173,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -100,16 +102,17 @@ index aca9f59966..1ea31b6a5e 100644
  
      DEFINES["_DEBUG"] = True
 diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-index 861233bfeb..c2f87155bb 100644
+index fa1cc1f3a3ab..da73ac5884e9 100644
 --- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-@@ -67,6 +67,17 @@
+@@ -67,6 +67,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -121,7 +124,7 @@ index 861233bfeb..c2f87155bb 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@
+@@ -153,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -132,7 +135,7 @@ index 861233bfeb..c2f87155bb 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@
+@@ -169,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -143,30 +146,31 @@ index 861233bfeb..c2f87155bb 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@
- 
-     OS_LIBS += [
+@@ -195,6 +215,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
          "android_support"
-+    ]
-+
+     ]
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-     ]
- 
++    ]
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-index 2421e514b6..6a6fc577a5 100644
+index 7b2186be89a1..15ac3dd39810 100644
 --- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-@@ -68,6 +68,17 @@
+@@ -68,6 +68,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -178,7 +182,7 @@ index 2421e514b6..6a6fc577a5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -161,6 +172,10 @@
+@@ -161,6 +173,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -189,7 +193,7 @@ index 2421e514b6..6a6fc577a5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -177,6 +192,10 @@
+@@ -177,6 +193,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -200,30 +204,31 @@ index 2421e514b6..6a6fc577a5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -201,6 +220,12 @@
- 
-     OS_LIBS += [
+@@ -203,6 +223,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
          "android_support"
-+    ]
-+
+     ]
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-     ]
- 
++    ]
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-index 48abf7cd40..26317d4cf5 100644
+index 4c8a3b864fc7..f185a8a24120 100644
 --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-@@ -67,6 +67,17 @@
+@@ -68,6 +68,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -235,7 +240,7 @@ index 48abf7cd40..26317d4cf5 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@
+@@ -154,6 +166,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -246,7 +251,7 @@ index 48abf7cd40..26317d4cf5 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@
+@@ -170,6 +186,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -257,30 +262,31 @@ index 48abf7cd40..26317d4cf5 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@
- 
-     OS_LIBS += [
+@@ -196,6 +216,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
          "android_support"
-+    ]
-+
+     ]
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-     ]
- 
++    ]
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-index 41222e1e06..5a75494c05 100644
+index da4393f09178..f2381443da31 100644
 --- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -292,7 +298,7 @@ index 41222e1e06..5a75494c05 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -145,6 +156,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -145,6 +157,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -303,7 +309,7 @@ index 41222e1e06..5a75494c05 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -161,6 +176,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -161,6 +177,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -315,16 +321,17 @@ index 41222e1e06..5a75494c05 100644
  
      DEFINES["_DEBUG"] = True
 diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index 132b296b25..df28661dfb 100644
+index d6076e7ff3b3..67851ac54434 100644
 --- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
 +++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-@@ -63,6 +63,17 @@ if CONFIG["OS_TARGET"] == "Darwin":
+@@ -63,6 +63,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -336,7 +343,7 @@ index 132b296b25..df28661dfb 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -141,6 +152,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+@@ -141,6 +153,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -347,7 +354,7 @@ index 132b296b25..df28661dfb 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -157,6 +172,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+@@ -157,6 +173,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -359,16 +366,17 @@ index 132b296b25..df28661dfb 100644
  
      DEFINES["_DEBUG"] = True
 diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-index 8499f556e3..92d90abb2d 100644
+index 9663c227a5b4..b3eef064971d 100644
 --- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-@@ -67,6 +67,17 @@
+@@ -67,6 +67,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -380,7 +388,7 @@ index 8499f556e3..92d90abb2d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@
+@@ -153,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -391,7 +399,7 @@ index 8499f556e3..92d90abb2d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@
+@@ -169,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -402,30 +410,31 @@ index 8499f556e3..92d90abb2d 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@
- 
-     OS_LIBS += [
+@@ -195,6 +215,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
          "android_support"
-+    ]
-+
+     ]
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-     ]
- 
++    ]
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-index a5f3673082..58e96dbb98 100644
+index 22fa55066eae..0640946b26c1 100644
 --- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-@@ -67,6 +67,17 @@
+@@ -67,6 +67,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -437,7 +446,7 @@ index a5f3673082..58e96dbb98 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@
+@@ -153,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -448,7 +457,7 @@ index a5f3673082..58e96dbb98 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@
+@@ -169,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -459,30 +468,31 @@ index a5f3673082..58e96dbb98 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@
- 
-     OS_LIBS += [
+@@ -195,6 +215,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
          "android_support"
-+    ]
-+
+     ]
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-     ]
- 
++    ]
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-index f7bf17624e..1f8a4a7497 100644
+index 1106e1abb32b..8e79889aa0dc 100644
 --- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-@@ -70,6 +70,17 @@
+@@ -70,6 +70,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -494,7 +504,7 @@ index f7bf17624e..1f8a4a7497 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -156,6 +167,10 @@
+@@ -156,6 +168,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -505,7 +515,7 @@ index f7bf17624e..1f8a4a7497 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -172,6 +187,10 @@
+@@ -172,6 +188,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -516,30 +526,31 @@ index f7bf17624e..1f8a4a7497 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -196,6 +215,12 @@
- 
-     OS_LIBS += [
+@@ -198,6 +218,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
          "android_support"
-+    ]
-+
+     ]
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-     ]
- 
++    ]
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-index b52257b6b6..402d787b35 100644
+index e1282ef7fc03..69ba1f8a4679 100644
 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-@@ -71,6 +71,19 @@
+@@ -71,6 +71,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
@@ -553,7 +564,7 @@ index b52257b6b6..402d787b35 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -173,6 +186,10 @@
+@@ -173,6 +187,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -564,7 +575,7 @@ index b52257b6b6..402d787b35 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -189,6 +206,10 @@
+@@ -189,6 +207,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -575,30 +586,31 @@ index b52257b6b6..402d787b35 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -227,6 +248,12 @@
- 
+@@ -228,6 +250,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
      DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
      DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
-+
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
 +    ]
- 
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
  
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-index d84e1656f6..afddfe8bac 100644
+index 059520e68160..5090e540bb39 100644
 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-@@ -71,6 +71,19 @@
+@@ -71,6 +71,20 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
@@ -612,7 +624,7 @@ index d84e1656f6..afddfe8bac 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -173,6 +186,10 @@
+@@ -173,6 +187,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -623,7 +635,7 @@ index d84e1656f6..afddfe8bac 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -189,6 +206,10 @@
+@@ -189,6 +207,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -634,30 +646,31 @@ index d84e1656f6..afddfe8bac 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -227,6 +248,12 @@
- 
+@@ -228,6 +250,12 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":
      DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
      DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
-+
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
 +    ]
- 
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
  
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-index e39db35128..ec6254de74 100644
+index 7d0a0897c3cf..5ad975a4f42c 100644
 --- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-@@ -67,6 +67,17 @@
+@@ -67,6 +67,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -669,7 +682,7 @@ index e39db35128..ec6254de74 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@
+@@ -153,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -680,7 +693,7 @@ index e39db35128..ec6254de74 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@
+@@ -169,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -691,30 +704,31 @@ index e39db35128..ec6254de74 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@
- 
-     OS_LIBS += [
+@@ -195,6 +215,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
          "android_support"
-+    ]
-+
+     ]
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-     ]
- 
++    ]
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-index 6a431c8970..413d83e455 100644
+index a32cecf159b3..84f15b829971 100644
 --- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-@@ -67,6 +67,17 @@
+@@ -67,6 +67,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -726,7 +740,7 @@ index 6a431c8970..413d83e455 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@
+@@ -153,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -737,7 +751,7 @@ index 6a431c8970..413d83e455 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@
+@@ -169,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -748,30 +762,31 @@ index 6a431c8970..413d83e455 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@
- 
-     OS_LIBS += [
+@@ -195,6 +215,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
          "android_support"
-+    ]
-+
+     ]
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-     ]
- 
++    ]
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-index 57f9cbdb1a..f1b7612533 100644
+index 843e12faccf6..585faa5e4226 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-@@ -67,6 +67,17 @@
+@@ -67,6 +67,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -783,7 +798,7 @@ index 57f9cbdb1a..f1b7612533 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@
+@@ -153,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -794,7 +809,7 @@ index 57f9cbdb1a..f1b7612533 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@
+@@ -169,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -805,30 +820,31 @@ index 57f9cbdb1a..f1b7612533 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@
- 
-     OS_LIBS += [
+@@ -195,6 +215,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
          "android_support"
-+    ]
-+
+     ]
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-     ]
- 
++    ]
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-index 6b2c8222cf..17d26b56bb 100644
+index da03926a4f06..b8be9937e4e9 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-@@ -67,6 +67,17 @@
+@@ -59,6 +59,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -840,7 +856,7 @@ index 6b2c8222cf..17d26b56bb 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@
+@@ -137,6 +149,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -851,7 +867,7 @@ index 6b2c8222cf..17d26b56bb 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@
+@@ -153,6 +169,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -862,30 +878,18 @@ index 6b2c8222cf..17d26b56bb 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@
- 
-     OS_LIBS += [
-         "android_support"
-+    ]
-+
-+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
-+
-+    CXXFLAGS += [
-+        "-msse2"
-     ]
- 
- if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-index bc3dac1e0e..e6d120ffff 100644
+index 58da84e1ffc5..778ad73df1a1 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-@@ -67,6 +67,17 @@
+@@ -67,6 +67,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -897,7 +901,7 @@ index bc3dac1e0e..e6d120ffff 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -153,6 +164,10 @@
+@@ -153,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -908,7 +912,7 @@ index bc3dac1e0e..e6d120ffff 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -169,6 +184,10 @@
+@@ -169,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -919,30 +923,31 @@ index bc3dac1e0e..e6d120ffff 100644
  if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_DEBUG"] = True
-@@ -193,6 +212,12 @@
- 
-     OS_LIBS += [
+@@ -195,6 +215,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
          "android_support"
-+    ]
-+
+     ]
+ 
 +if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    CXXFLAGS += [
 +        "-msse2"
-     ]
- 
++    ]
++
  if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
 diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
-index ca0df168ef..db603b008d 100644
+index 23249247d88a..4767502bc819 100644
 --- third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
-@@ -67,6 +67,17 @@
+@@ -67,6 +67,18 @@ if CONFIG["OS_TARGET"] == "Darwin":
      DEFINES["__STDC_CONSTANT_MACROS"] = True
      DEFINES["__STDC_FORMAT_MACROS"] = True
  
 +if CONFIG["OS_TARGET"] == "FreeBSD":
 +
 +    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_X11"] = "1"
 +    DEFINES["WEBRTC_BSD"] = True
 +    DEFINES["WEBRTC_POSIX"] = True
 +    DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -954,7 +959,7 @@ index ca0df168ef..db603b008d 100644
  if CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["USE_AURA"] = "1"
-@@ -160,6 +171,10 @@
+@@ -160,6 +172,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
  
@@ -965,7 +970,7 @@ index ca0df168ef..db603b008d 100644
  if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
  
      DEFINES["_FORTIFY_SOURCE"] = "2"
-@@ -176,6 +191,10 @@
+@@ -176,6 +192,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
  
      DEFINES["_DEBUG"] = True
  
@@ -976,30 +981,31 @@ index ca0df168ef..db603b008d 100644
*** 18625 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207141839.26EIdbpt051705>