Attachment #251628 for bug #279919

View | Details | Raw Unified | Return to bug 279919
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/www/librewolf/Makefile (-1 / +1 lines)
1	PORTNAME= librewolf	1	PORTNAME= librewolf
2	DISTVERSION= 126.0.1-1	2	DISTVERSION= 127.0.1
3	CATEGORIES= www wayland	3	CATEGORIES= www wayland
4	MASTER_SITES= https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${DISTVERSION:R}-1/	4	MASTER_SITES= https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${DISTVERSION:R}-1/
5	DISTNAME= ${PORTNAME}-${DISTVERSION:R}-1.source.	5	DISTNAME= ${PORTNAME}-${DISTVERSION:R}-1.source.

Lines 1-3 Link Here

(-)b/www/librewolf/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1718275256	1	TIMESTAMP = 1718996614
2	SHA256 (librewolf-126.0-1.source.tar.gz) = 545e4d26522c4ed1a669814340dc8fee7ca8d60452a07a91f30ec28198ec072d	2	SHA256 (librewolf-127.0-1.source.tar.gz) = eb7c03ad394dd8445110d718b90da6a0252c0533b8cb6ab27dd1a6e83b6853e7
3	SIZE (librewolf-126.0-1.source.tar.gz) = 990551134	3	SIZE (librewolf-127.0-1.source.tar.gz) = 1008033344




commit 1fb2333e2d53204e69a318a8c803981d8ded116b
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>

    regenerate FreeBSD libwebrtc patch for Firefox 127

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 b0671b5d4adb..642f867db664 100644

+    DEFINES["USE_X11"] = "1"
 
 Library("task_queue_gn")
diff --git third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
index 10e3f8f8356e..56aa757e1b6c 100644
--- third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
+++ third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()
 DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
 DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
 DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
+DEFINES["USE_OZONE"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
 DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
 DEFINES["WEBRTC_LIBRARY_IMPL"] = True
 DEFINES["WEBRTC_MOZILLA_BUILD"] = True
 DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
 DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
+DEFINES["__STDC_CONSTANT_MACROS"] = True
+DEFINES["__STDC_FORMAT_MACROS"] = True
 
 FINAL_LIBRARY = "webrtc"
 
@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
 if CONFIG["MOZ_DEBUG"] == "1":
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["ANDROID"] = True
-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_GNU_SOURCE"] = True
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
-    DEFINES["WEBRTC_MAC"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["USE_AURA"] = "1"
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_NSS_CERTS"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_UDEV"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_FILE_OFFSET_BITS"] = "64"
-    DEFINES["_LARGEFILE64_SOURCE"] = True
-    DEFINES["_LARGEFILE_SOURCE"] = True
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["USE_GLIB"] = "1"
-    DEFINES["USE_OZONE"] = "1"
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_BSD"] = True
-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["_FILE_OFFSET_BITS"] = "64"
-    DEFINES["_LARGEFILE64_SOURCE"] = True
-    DEFINES["_LARGEFILE_SOURCE"] = True
-    DEFINES["__STDC_CONSTANT_MACROS"] = True
-    DEFINES["__STDC_FORMAT_MACROS"] = True
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-    DEFINES["NOMINMAX"] = True
-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
-    DEFINES["PSAPI_VERSION"] = "2"
-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
-    DEFINES["UNICODE"] = True
-    DEFINES["USE_AURA"] = "1"
-    DEFINES["WEBRTC_WIN"] = True
-    DEFINES["WIN32"] = True
-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
-    DEFINES["WINVER"] = "0x0A00"
-    DEFINES["_ATL_NO_OPENGL"] = True
-    DEFINES["_CRT_RAND_S"] = True
-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
-    DEFINES["_HAS_EXCEPTIONS"] = "0"
-    DEFINES["_HAS_NODISCARD"] = True
-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-    DEFINES["_SECURE_ATL"] = True
-    DEFINES["_UNICODE"] = True
-    DEFINES["_WIN32_WINNT"] = "0x0A00"
-    DEFINES["_WINDOWS"] = True
-    DEFINES["__STD_C"] = True
+    DEFINES["_DEBUG"] = True
 
 if CONFIG["TARGET_CPU"] == "aarch64":
 
     DEFINES["WEBRTC_ARCH_ARM64"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
 
-if CONFIG["TARGET_CPU"] == "arm":
-
-    DEFINES["WEBRTC_ARCH_ARM"] = True
-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-
 if CONFIG["TARGET_CPU"] == "mips32":
 
     DEFINES["MIPS32_LE"] = True
     DEFINES["MIPS_FPU_LE"] = True
-    DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["TARGET_CPU"] == "mips64":
-
-    DEFINES["_GNU_SOURCE"] = True
 
 if CONFIG["TARGET_CPU"] == "x86":
 
@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
 
     DEFINES["WEBRTC_ENABLE_AVX2"] = True
 
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
-    DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
-    DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
-    DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
 
     DEFINES["USE_X11"] = "1"
 
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
-
-    OS_LIBS += [
-        "unwind"
-    ]
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
-    DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
-
-    DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-    DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-
-    DEFINES["_GNU_SOURCE"] = True
-
 Library("bandwidth_estimation_settings_gn")
diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
index 2b732ca51e9d..716e91c361d1 100644
--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build

 
 Library("scalability_mode_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
index 13a1c027cfba..56d51a419490 100644
--- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()

 
 FINAL_LIBRARY = "webrtc"
 
@@ -54,185 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
 if CONFIG["MOZ_DEBUG"] == "1":
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"

 
 Library("legacy_encoded_audio_frame_gn")
diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
index 9b2996fa22d9..3ac873404dd5 100644
--- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()

 
 FINAL_LIBRARY = "webrtc"
 
@@ -77,189 +87,32 @@ if not CONFIG["MOZ_DEBUG"]:
 if CONFIG["MOZ_DEBUG"] == "1":
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"

 
 Library("timing_module_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
index c0d139fc6d0a..b367c42eb7a8 100644
--- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
@@ -12,11 +12,21 @@ AllowCompilerWarnings()

 
 FINAL_LIBRARY = "webrtc"
 
@@ -45,185 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
 if CONFIG["MOZ_DEBUG"] == "1":
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"

 
 Library("webrtc_vp9_helpers_gn")
diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
index 68c4cd93c417..9d93a43355ec 100644
--- third_party/libwebrtc/moz.build
+++ third_party/libwebrtc/moz.build
@@ -267,6 +267,8 @@ DIRS += [
     "/third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn",
     "/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn",
     "/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn",

     "/third_party/libwebrtc/modules/module_api_gn",
     "/third_party/libwebrtc/modules/module_api_public_gn",
     "/third_party/libwebrtc/modules/module_fec_api_gn",
@@ -466,102 +468,11 @@ DIRS += [
     "/third_party/libwebrtc/webrtc_gn"
 ]
 

         "/third_party/libwebrtc/modules/portal/portal_gn",
         "/third_party/libwebrtc/third_party/drm/drm_gn",
         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
@@ -569,26 +480,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
     ]
 

         "/third_party/libwebrtc/modules/portal/portal_gn",
         "/third_party/libwebrtc/third_party/drm/drm_gn",
         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
@@ -596,11 +490,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
     ]
 

         "/third_party/libwebrtc/modules/portal/portal_gn",
         "/third_party/libwebrtc/third_party/drm/drm_gn",
         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
@@ -608,7 +500,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":
         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
     ]
 

 
     DIRS += [
         "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
@@ -616,8 +508,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
         "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
         "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
         "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",

         "/third_party/libwebrtc/modules/portal/portal_gn",
         "/third_party/libwebrtc/third_party/drm/drm_gn",
         "/third_party/libwebrtc/third_party/gbm/gbm_gn",
@@ -625,7 +515,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
         "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
     ]
 

 
     DIRS += [
         "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
@@ -633,69 +523,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
         "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
         "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
         "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
- 

Return to bug 279919

Lines 1-7 Link Here

(-)b/www/librewolf/files/patch-libwebrtc-generated (-18 / +204 lines)
1	commit e0f8f58bed7cc4cd65c82ef0ea0e795ac6eeda65	1	commit 1fb2333e2d53204e69a318a8c803981d8ded116b
2	Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>	2	Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
3		3
4	regenerate FreeBSD libwebrtc patch for Firefox 126	4	regenerate FreeBSD libwebrtc patch for Firefox 127
5		5
6	diff --git third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build	6	diff --git third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
7	index b0671b5d4adb..642f867db664 100644	7	index b0671b5d4adb..642f867db664 100644
Lines 14108-14113 index 8c04d40cf594..e9f40adf5dcc 100644 Link Here
14108	+ DEFINES["USE_X11"] = "1"	14108	+ DEFINES["USE_X11"] = "1"
14109		14109
14110	Library("task_queue_gn")	14110	Library("task_queue_gn")
		14111	diff --git third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
		14112	index 10e3f8f8356e..56aa757e1b6c 100644
		14113	--- third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
		14114	+++ third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
		14115	@@ -12,11 +12,21 @@ AllowCompilerWarnings()
		14116	DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
		14117	DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
		14118	DEFINES["RTC_ENABLE_VP9"] = True
		14119	+DEFINES["USE_GLIB"] = "1"
		14120	+DEFINES["USE_OZONE"] = "1"
		14121	+DEFINES["WEBRTC_BSD"] = True
		14122	+DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
		14123	DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
		14124	DEFINES["WEBRTC_LIBRARY_IMPL"] = True
		14125	DEFINES["WEBRTC_MOZILLA_BUILD"] = True
		14126	DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
		14127	+DEFINES["WEBRTC_POSIX"] = True
		14128	DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
		14129	+DEFINES["_FILE_OFFSET_BITS"] = "64"
		14130	+DEFINES["_LARGEFILE64_SOURCE"] = True
		14131	+DEFINES["_LARGEFILE_SOURCE"] = True
		14132	+DEFINES["__STDC_CONSTANT_MACROS"] = True
		14133	+DEFINES["__STDC_FORMAT_MACROS"] = True
		14134
		14135	FINAL_LIBRARY = "webrtc"
		14136
		14137	@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
		14138	if CONFIG["MOZ_DEBUG"] == "1":
		14139
		14140	DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
		14141	-
		14142	-if CONFIG["OS_TARGET"] == "Android":
		14143	-
		14144	- DEFINES["ANDROID"] = True
		14145	- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
		14146	- DEFINES["HAVE_SYS_UIO_H"] = True
		14147	- DEFINES["WEBRTC_ANDROID"] = True
		14148	- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
		14149	- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
		14150	- DEFINES["WEBRTC_LINUX"] = True
		14151	- DEFINES["WEBRTC_POSIX"] = True
		14152	- DEFINES["_GNU_SOURCE"] = True
		14153	- DEFINES["__STDC_CONSTANT_MACROS"] = True
		14154	- DEFINES["__STDC_FORMAT_MACROS"] = True
		14155	-
		14156	-if CONFIG["OS_TARGET"] == "Darwin":
		14157	-
		14158	- DEFINES["WEBRTC_MAC"] = True
		14159	- DEFINES["WEBRTC_POSIX"] = True
		14160	- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
		14161	- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
		14162	- DEFINES["__STDC_CONSTANT_MACROS"] = True
		14163	- DEFINES["__STDC_FORMAT_MACROS"] = True
		14164	-
		14165	-if CONFIG["OS_TARGET"] == "Linux":
		14166	-
		14167	- DEFINES["USE_AURA"] = "1"
		14168	- DEFINES["USE_GLIB"] = "1"
		14169	- DEFINES["USE_NSS_CERTS"] = "1"
		14170	- DEFINES["USE_OZONE"] = "1"
		14171	- DEFINES["USE_UDEV"] = True
		14172	- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
		14173	- DEFINES["WEBRTC_LINUX"] = True
		14174	- DEFINES["WEBRTC_POSIX"] = True
14175	- DEFINES["_FILE_OFFSET_BITS"] = "64"
14176	- DEFINES["_LARGEFILE64_SOURCE"] = True
14177	- DEFINES["_LARGEFILE_SOURCE"] = True
14178	- DEFINES["__STDC_CONSTANT_MACROS"] = True
14179	- DEFINES["__STDC_FORMAT_MACROS"] = True
14180	-
14181	-if CONFIG["OS_TARGET"] == "OpenBSD":
14182	-
14183	- DEFINES["USE_GLIB"] = "1"
14184	- DEFINES["USE_OZONE"] = "1"
14185	- DEFINES["USE_X11"] = "1"
14186	- DEFINES["WEBRTC_BSD"] = True
14187	- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
14188	- DEFINES["WEBRTC_POSIX"] = True
14189	- DEFINES["_FILE_OFFSET_BITS"] = "64"
14190	- DEFINES["_LARGEFILE64_SOURCE"] = True
14191	- DEFINES["_LARGEFILE_SOURCE"] = True
14192	- DEFINES["__STDC_CONSTANT_MACROS"] = True
14193	- DEFINES["__STDC_FORMAT_MACROS"] = True
14194	-
14195	-if CONFIG["OS_TARGET"] == "WINNT":
14196	-
14197	- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
14198	- DEFINES["NOMINMAX"] = True
14199	- DEFINES["NTDDI_VERSION"] = "0x0A000000"
14200	- DEFINES["PSAPI_VERSION"] = "2"
14201	- DEFINES["RTC_ENABLE_WIN_WGC"] = True
14202	- DEFINES["UNICODE"] = True
14203	- DEFINES["USE_AURA"] = "1"
14204	- DEFINES["WEBRTC_WIN"] = True
14205	- DEFINES["WIN32"] = True
14206	- DEFINES["WIN32_LEAN_AND_MEAN"] = True
14207	- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
14208	- DEFINES["WINVER"] = "0x0A00"
14209	- DEFINES["_ATL_NO_OPENGL"] = True
14210	- DEFINES["_CRT_RAND_S"] = True
14211	- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
14212	- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
14213	- DEFINES["_HAS_EXCEPTIONS"] = "0"
14214	- DEFINES["_HAS_NODISCARD"] = True
14215	- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
14216	- DEFINES["_SECURE_ATL"] = True
14217	- DEFINES["_UNICODE"] = True
14218	- DEFINES["_WIN32_WINNT"] = "0x0A00"
14219	- DEFINES["_WINDOWS"] = True
14220	- DEFINES["__STD_C"] = True
14221	+ DEFINES["_DEBUG"] = True
14222
14223	if CONFIG["TARGET_CPU"] == "aarch64":
14224
14225	DEFINES["WEBRTC_ARCH_ARM64"] = True
14226	DEFINES["WEBRTC_HAS_NEON"] = True
14227
14228	-if CONFIG["TARGET_CPU"] == "arm":
14229	-
14230	- DEFINES["WEBRTC_ARCH_ARM"] = True
14231	- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
14232	- DEFINES["WEBRTC_HAS_NEON"] = True
14233	-
14234	if CONFIG["TARGET_CPU"] == "mips32":
14235
14236	DEFINES["MIPS32_LE"] = True
14237	DEFINES["MIPS_FPU_LE"] = True
14238	- DEFINES["_GNU_SOURCE"] = True
14239	-
14240	-if CONFIG["TARGET_CPU"] == "mips64":
14241	-
14242	- DEFINES["_GNU_SOURCE"] = True
14243
14244	if CONFIG["TARGET_CPU"] == "x86":
14245
14246	@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
14247
14248	DEFINES["WEBRTC_ENABLE_AVX2"] = True
14249
14250	-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
14251	-
14252	- DEFINES["_DEBUG"] = True
14253	-
14254	-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
14255	-
14256	- DEFINES["_DEBUG"] = True
14257	-
14258	-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
14259	-
14260	- DEFINES["_DEBUG"] = True
14261	-
14262	-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
14263	-
14264	- DEFINES["_DEBUG"] = True
14265	-
14266	-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
14267	-
14268	- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
14269	-
14270	-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
14271	+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
14272
14273	DEFINES["USE_X11"] = "1"
14274
14275	-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
14276	-
14277	- OS_LIBS += [
14278	- "unwind"
14279	- ]
14280	-
14281	-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
14282	-
14283	- DEFINES["_GNU_SOURCE"] = True
14284	-
14285	-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
14286	-
14287	- DEFINES["_GNU_SOURCE"] = True
14288	-
14289	-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
14290	-
14291	- DEFINES["_GNU_SOURCE"] = True
14292	-
14293	-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
14294	-
14295	- DEFINES["_GNU_SOURCE"] = True
14296	-
14297	Library("bandwidth_estimation_settings_gn")
14111	diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build	14298	diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
14112	index 2b732ca51e9d..716e91c361d1 100644	14299	index 2b732ca51e9d..716e91c361d1 100644
14113	--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build	14300	--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
Lines 21584-21590 index 491c4880cc46..874d12b31e06 100644 Link Here
21584		21771
21585	Library("scalability_mode_gn")	21772	Library("scalability_mode_gn")
21586	diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build	21773	diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
21587	index c6c127e5b607..c866cb6d800f 100644	21774	index 13a1c027cfba..56d51a419490 100644
21588	--- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build	21775	--- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
21589	+++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build	21776	+++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
21590	@@ -12,11 +12,21 @@ AllowCompilerWarnings()	21777	@@ -12,11 +12,21 @@ AllowCompilerWarnings()
Lines 21609-21615 index c6c127e5b607..c866cb6d800f 100644 Link Here
21609		21796
21610	FINAL_LIBRARY = "webrtc"	21797	FINAL_LIBRARY = "webrtc"
21611		21798
21612	@@ -53,185 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:	21799	@@ -54,185 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
21613	if CONFIG["MOZ_DEBUG"] == "1":	21800	if CONFIG["MOZ_DEBUG"] == "1":
21614		21801
21615	DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"	21802	DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
Lines 36669-36675 index b884cb8d99d1..cac379b6b793 100644 Link Here
36669		36856
36670	Library("legacy_encoded_audio_frame_gn")	36857	Library("legacy_encoded_audio_frame_gn")
36671	diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build	36858	diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
36672	index 834a8d1265d4..57d0a614a954 100644	36859	index 9b2996fa22d9..3ac873404dd5 100644
36673	--- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build	36860	--- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
36674	+++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build	36861	+++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
36675	@@ -12,11 +12,21 @@ AllowCompilerWarnings()	36862	@@ -12,11 +12,21 @@ AllowCompilerWarnings()
Lines 36694-36700 index 834a8d1265d4..57d0a614a954 100644 Link Here
36694		36881
36695	FINAL_LIBRARY = "webrtc"	36882	FINAL_LIBRARY = "webrtc"
36696		36883
36697	@@ -78,189 +88,32 @@ if not CONFIG["MOZ_DEBUG"]:	36884	@@ -77,189 +87,32 @@ if not CONFIG["MOZ_DEBUG"]:
36698	if CONFIG["MOZ_DEBUG"] == "1":	36885	if CONFIG["MOZ_DEBUG"] == "1":
36699		36886
36700	DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"	36887	DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
Lines 64082-64088 index 76c4cfe66496..40909203b3cf 100644 Link Here
64082		64269
64083	Library("timing_module_gn")	64270	Library("timing_module_gn")
64084	diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build	64271	diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
64085	index 141def90908b..fae7dffcca41 100644	64272	index c0d139fc6d0a..b367c42eb7a8 100644
64086	--- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build	64273	--- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
64087	+++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build	64274	+++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
64088	@@ -12,11 +12,21 @@ AllowCompilerWarnings()	64275	@@ -12,11 +12,21 @@ AllowCompilerWarnings()
Lines 64107-64113 index 141def90908b..fae7dffcca41 100644 Link Here
64107		64294
64108	FINAL_LIBRARY = "webrtc"	64295	FINAL_LIBRARY = "webrtc"
64109		64296
64110	@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:	64297	@@ -45,185 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
64111	if CONFIG["MOZ_DEBUG"] == "1":	64298	if CONFIG["MOZ_DEBUG"] == "1":
64112		64299
64113	DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"	64300	DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
Lines 66060-66069 index 883e5c70b24b..caec155ca861 100644 Link Here
66060		66247
66061	Library("webrtc_vp9_helpers_gn")	66248	Library("webrtc_vp9_helpers_gn")
66062	diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build	66249	diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
66063	index 59472bdc9b56..45b99de39516 100644	66250	index 68c4cd93c417..9d93a43355ec 100644
66064	--- third_party/libwebrtc/moz.build	66251	--- third_party/libwebrtc/moz.build
66065	+++ third_party/libwebrtc/moz.build	66252	+++ third_party/libwebrtc/moz.build
66066	@@ -266,6 +266,8 @@ DIRS += [	66253	@@ -267,6 +267,8 @@ DIRS += [
66067	"/third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn",	66254	"/third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn",
66068	"/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn",	66255	"/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn",
66069	"/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn",	66256	"/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn",
Lines 66072-66078 index 59472bdc9b56..45b99de39516 100644 Link Here
66072	"/third_party/libwebrtc/modules/module_api_gn",	66259	"/third_party/libwebrtc/modules/module_api_gn",
66073	"/third_party/libwebrtc/modules/module_api_public_gn",	66260	"/third_party/libwebrtc/modules/module_api_public_gn",
66074	"/third_party/libwebrtc/modules/module_fec_api_gn",	66261	"/third_party/libwebrtc/modules/module_fec_api_gn",
66075	@@ -465,102 +467,11 @@ DIRS += [	66262	@@ -466,102 +468,11 @@ DIRS += [
66076	"/third_party/libwebrtc/webrtc_gn"	66263	"/third_party/libwebrtc/webrtc_gn"
66077	]	66264	]
66078		66265
Lines 66176-66182 index 59472bdc9b56..45b99de39516 100644 Link Here
66176	"/third_party/libwebrtc/modules/portal/portal_gn",	66363	"/third_party/libwebrtc/modules/portal/portal_gn",
66177	"/third_party/libwebrtc/third_party/drm/drm_gn",	66364	"/third_party/libwebrtc/third_party/drm/drm_gn",
66178	"/third_party/libwebrtc/third_party/gbm/gbm_gn",	66365	"/third_party/libwebrtc/third_party/gbm/gbm_gn",
66179	@@ -568,26 +479,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":	66366	@@ -569,26 +480,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
66180	"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"	66367	"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
66181	]	66368	]
66182		66369
Lines 66204-66210 index 59472bdc9b56..45b99de39516 100644 Link Here
66204	"/third_party/libwebrtc/modules/portal/portal_gn",	66391	"/third_party/libwebrtc/modules/portal/portal_gn",
66205	"/third_party/libwebrtc/third_party/drm/drm_gn",	66392	"/third_party/libwebrtc/third_party/drm/drm_gn",
66206	"/third_party/libwebrtc/third_party/gbm/gbm_gn",	66393	"/third_party/libwebrtc/third_party/gbm/gbm_gn",
66207	@@ -595,11 +489,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":	66394	@@ -596,11 +490,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
66208	"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"	66395	"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
66209	]	66396	]
66210		66397
Lines 66217-66223 index 59472bdc9b56..45b99de39516 100644 Link Here
66217	"/third_party/libwebrtc/modules/portal/portal_gn",	66404	"/third_party/libwebrtc/modules/portal/portal_gn",
66218	"/third_party/libwebrtc/third_party/drm/drm_gn",	66405	"/third_party/libwebrtc/third_party/drm/drm_gn",
66219	"/third_party/libwebrtc/third_party/gbm/gbm_gn",	66406	"/third_party/libwebrtc/third_party/gbm/gbm_gn",
66220	@@ -607,7 +499,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":	66407	@@ -608,7 +500,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":
66221	"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"	66408	"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
66222	]	66409	]
66223		66410
Lines 66226-66232 index 59472bdc9b56..45b99de39516 100644 Link Here
66226		66413
66227	DIRS += [	66414	DIRS += [
66228	"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",	66415	"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
66229	@@ -615,8 +507,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":	66416	@@ -616,8 +508,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
66230	"/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",	66417	"/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
66231	"/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",	66418	"/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
66232	"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",	66419	"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
Lines 66235-66241 index 59472bdc9b56..45b99de39516 100644 Link Here
66235	"/third_party/libwebrtc/modules/portal/portal_gn",	66422	"/third_party/libwebrtc/modules/portal/portal_gn",
66236	"/third_party/libwebrtc/third_party/drm/drm_gn",	66423	"/third_party/libwebrtc/third_party/drm/drm_gn",
66237	"/third_party/libwebrtc/third_party/gbm/gbm_gn",	66424	"/third_party/libwebrtc/third_party/gbm/gbm_gn",
66238	@@ -624,7 +514,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":	66425	@@ -625,7 +515,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
66239	"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"	66426	"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
66240	]	66427	]
66241		66428
Lines 66244-66250 index 59472bdc9b56..45b99de39516 100644 Link Here
66244		66431
66245	DIRS += [	66432	DIRS += [
66246	"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",	66433	"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
66247	@@ -632,69 +522,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":	66434	@@ -633,69 +523,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
66248	"/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",	66435	"/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
66249	"/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",	66436	"/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
66250	"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",	66437	"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
66251	-