mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 01:26:39 -04:00
www/firefox: update to 138.0 (rc1)
Release Notes (soon): https://www.mozilla.org/en-US/firefox/138.0/releasenotes/
This commit is contained in:
Christoph Moench-Tegeder
parent
6ad0acddcb
commit
0223499bfd
5 changed files with 217 additions and 249 deletions
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= firefox
|
||||
DISTVERSION= 137.0.2
|
||||
DISTVERSION= 138.0
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= www wayland
|
||||
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
|
||||
|
|
@ -11,7 +11,7 @@ COMMENT= Web browser based on the browser portion of Mozilla
|
|||
WWW= https://www.mozilla.com/firefox
|
||||
|
||||
BUILD_DEPENDS= nspr>=4.32:devel/nspr \
|
||||
nss>=3.109:security/nss \
|
||||
nss>=3.110:security/nss \
|
||||
icu>=76.1:devel/icu \
|
||||
libevent>=2.1.8:devel/libevent \
|
||||
harfbuzz>=10.1.0:print/harfbuzz \
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1744651144
|
||||
SHA256 (firefox-137.0.2.source.tar.xz) = 06fc3abaa822148bfa5ee7b759428d74052493876c053c05379c3f6c302bcd07
|
||||
SIZE (firefox-137.0.2.source.tar.xz) = 599825260
|
||||
TIMESTAMP = 1745264637
|
||||
SHA256 (firefox-138.0.source.tar.xz) = 04623d7ee88c1b456228dca1aac4d40b18fee82c803b6562a34ce30b46f19b23
|
||||
SIZE (firefox-138.0.source.tar.xz) = 630343992
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
commit 43b044fe8adaccb46868ac00c70a4e7a5d354a9c
|
||||
Author: Christoph Moench-Tegeder <cmt@burggraben.net>
|
||||
|
||||
Bug 1948776 - handle non-existence of MAP_NORESERVE for FreeBSD, r=afranchuk,jld,nika
|
||||
|
||||
The MAP_NORESERVE flag does not exist in FreeBSD. As the minimally-
|
||||
invasive workaround, I decided to remove that flag directly in the
|
||||
mmap() calls, instead of defining our own MAP_NORESERVE as 0
|
||||
possibly far away and not obviously connected to these places.
|
||||
|
||||
Differential Revision: https://phabricator.services.mozilla.com/D238531
|
||||
|
||||
diff --git ipc/glue/SharedMemoryPlatform_posix.cpp ipc/glue/SharedMemoryPlatform_posix.cpp
|
||||
index 61121bcbaf8d..b31f2200e8e6 100644
|
||||
--- ipc/glue/SharedMemoryPlatform_posix.cpp
|
||||
+++ ipc/glue/SharedMemoryPlatform_posix.cpp
|
||||
@@ -447,8 +447,12 @@ bool Platform::Protect(char* aAddr, size_t aSize, Access aAccess) {
|
||||
}
|
||||
|
||||
void* Platform::FindFreeAddressSpace(size_t aSize) {
|
||||
- void* memory = mmap(nullptr, aSize, PROT_NONE,
|
||||
- MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE, -1, 0);
|
||||
+#ifndef __FreeBSD__
|
||||
+ constexpr int flags = MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE;
|
||||
+#else
|
||||
+ constexpr int flags = MAP_ANONYMOUS | MAP_PRIVATE;
|
||||
+#endif
|
||||
+ void* memory = mmap(nullptr, aSize, PROT_NONE, flags, -1, 0);
|
||||
if (memory == MAP_FAILED) {
|
||||
return nullptr;
|
||||
}
|
||||
diff --git ipc/glue/SharedMemory_posix.cpp ipc/glue/SharedMemory_posix.cpp
|
||||
index da279f469237..9ed83af4b1f2 100644
|
||||
--- ipc/glue/SharedMemory_posix.cpp
|
||||
+++ ipc/glue/SharedMemory_posix.cpp
|
||||
@@ -61,8 +61,12 @@ SharedMemory::Handle SharedMemory::CloneHandle(const Handle& aHandle) {
|
||||
}
|
||||
|
||||
void* SharedMemory::FindFreeAddressSpace(size_t size) {
|
||||
- void* memory = mmap(nullptr, size, PROT_NONE,
|
||||
- MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE, -1, 0);
|
||||
+#ifndef __FreeBSD__
|
||||
+ constexpr int flags = MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE;
|
||||
+#else
|
||||
+ constexpr int flags = MAP_ANONYMOUS | MAP_PRIVATE;
|
||||
+#endif
|
||||
+ void* memory = mmap(nullptr, size, PROT_NONE, flags, -1, 0);
|
||||
if (memory == MAP_FAILED) {
|
||||
return nullptr;
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
commit 03ad892364d95687b41b0eabd6031c4d3e081db4
|
||||
commit 5ea36422bfaa3e795cd42f94a26f0cb567404dce
|
||||
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
|
||||
|
||||
regenerate FreeBSD libwebrtc patch for Firefox 137
|
||||
regenerate FreeBSD libwebrtc patch for Firefox 138
|
||||
|
||||
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 655ef59cba4b..d54f6dbed565 100644
|
||||
|
|
@ -16583,6 +16583,197 @@ index 7ae9e4b54679..d79bb6509222 100644
|
|||
+ DEFINES["USE_X11"] = "1"
|
||||
|
||||
Library("network_control_gn")
|
||||
diff --git third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
|
||||
index 5c94efb78495..915f17ef72d7 100644
|
||||
--- third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
|
||||
+++ third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
|
||||
@@ -12,11 +12,20 @@ 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_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 = "xul"
|
||||
|
||||
@@ -39,112 +48,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_LINUX"] = True
|
||||
- DEFINES["WEBRTC_POSIX"] = True
|
||||
- DEFINES["_GNU_SOURCE"] = True
|
||||
- DEFINES["__STDC_CONSTANT_MACROS"] = True
|
||||
- DEFINES["__STDC_FORMAT_MACROS"] = True
|
||||
-
|
||||
- OS_LIBS += [
|
||||
- "log"
|
||||
- ]
|
||||
-
|
||||
-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_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_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"] == "loongarch64":
|
||||
-
|
||||
- DEFINES["_GNU_SOURCE"] = 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":
|
||||
|
||||
@@ -154,50 +68,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("corruption_detection_message_gn")
|
||||
diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
|
||||
index fa5f3fb195e6..a2bad5bb1bca 100644
|
||||
--- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
|
||||
|
|
@ -32173,197 +32364,6 @@ index 9cb9225a87fc..0db4ddb79920 100644
|
|||
+ DEFINES["USE_X11"] = "1"
|
||||
|
||||
Library("corruption_detection_converters_gn")
|
||||
diff --git third_party/libwebrtc/common_video/corruption_detection_message_gn/moz.build third_party/libwebrtc/common_video/corruption_detection_message_gn/moz.build
|
||||
index 5c94efb78495..915f17ef72d7 100644
|
||||
--- third_party/libwebrtc/common_video/corruption_detection_message_gn/moz.build
|
||||
+++ third_party/libwebrtc/common_video/corruption_detection_message_gn/moz.build
|
||||
@@ -12,11 +12,20 @@ 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_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 = "xul"
|
||||
|
||||
@@ -39,112 +48,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_LINUX"] = True
|
||||
- DEFINES["WEBRTC_POSIX"] = True
|
||||
- DEFINES["_GNU_SOURCE"] = True
|
||||
- DEFINES["__STDC_CONSTANT_MACROS"] = True
|
||||
- DEFINES["__STDC_FORMAT_MACROS"] = True
|
||||
-
|
||||
- OS_LIBS += [
|
||||
- "log"
|
||||
- ]
|
||||
-
|
||||
-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_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_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"] == "loongarch64":
|
||||
-
|
||||
- DEFINES["_GNU_SOURCE"] = 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":
|
||||
|
||||
@@ -154,50 +68,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("corruption_detection_message_gn")
|
||||
diff --git third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
|
||||
index fc3bafbb64b4..7581bd78b6c5 100644
|
||||
--- third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
|
||||
|
|
@ -73368,7 +73368,7 @@ index a734c18d2ccf..42f79acec164 100644
|
|||
|
||||
Library("webrtc_vp9_helpers_gn")
|
||||
diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
|
||||
index 933b80f70d75..b92ee1039bce 100644
|
||||
index fb93b2ab5309..08ce55822bf1 100644
|
||||
--- third_party/libwebrtc/moz.build
|
||||
+++ third_party/libwebrtc/moz.build
|
||||
@@ -291,6 +291,8 @@ DIRS += [
|
||||
|
|
|
|||
18
www/firefox/files/patch-python_sites_mach.txt
Normal file
18
www/firefox/files/patch-python_sites_mach.txt
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
commit 10ee367cbe7ff5a19acfcfe3bfb75a49671e4132
|
||||
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
|
||||
|
||||
bump psutil (same as ports)
|
||||
|
||||
5.9.x breaks mach
|
||||
|
||||
diff --git python/sites/mach.txt python/sites/mach.txt
|
||||
index 6e3db1c848f7..10ba12c2f13b 100644
|
||||
--- python/sites/mach.txt
|
||||
+++ python/sites/mach.txt
|
||||
@@ -108,5 +108,5 @@ pypi-optional:glean-sdk==63.1.0:telemetry will not be collected
|
||||
# Mach gracefully handles the case where `psutil` is unavailable.
|
||||
# We aren't (yet) able to pin packages in automation, so we have to
|
||||
# support down to the oldest locally-installed version (5.4.2).
|
||||
-pypi-optional:psutil>=5.4.2,<=5.9.4:telemetry will be missing some data
|
||||
+pypi-optional:psutil>=5.4.2,<=7.0.0:telemetry will be missing some data
|
||||
pypi-optional:zstandard>=0.11.1,<=0.23.0:zstd archives will not be possible to extract
|
||||
Loading…
Add table
Reference in a new issue