Date: Mon, 14 Oct 2024 14:10:52 GMT From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 634c08de92be - main - www/librewolf: Update 129.0-1 =?utf-8?Q?=E2=86=92?= 131.0.2-1 (CVE-2024-9680) Message-ID: <202410141410.49EEAqbo054430@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=634c08de92be7b90316ba381a4e495fb15a73d5e commit 634c08de92be7b90316ba381a4e495fb15a73d5e Author: Martin Filla <freebsd@sysctl.cz> AuthorDate: 2024-10-14 14:03:35 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-10-14 14:08:47 +0000 www/librewolf: Update 129.0-1 → 131.0.2-1 (CVE-2024-9680) Changelog: https://www.mozilla.org/en-US/firefox/131.0/releasenotes/ https://www.mozilla.org/en-US/firefox/131.0.2/releasenotes/ Fix CVE-2024-9680: Use-after-free in Animation timeline: https://www.mozilla.org/en-US/security/advisories/mfsa2024-51/ Fix build on aarch64. PR: 281985 281902 MFH: 2024Q4 --- www/librewolf/Makefile | 23 +- www/librewolf/distinfo | 6 +- www/librewolf/files/patch-bug1559213 | 63 +- www/librewolf/files/patch-bug847568 | 91 +- .../files/patch-gfx_skia_skia_src_core_SkCpu.cpp | 33 - www/librewolf/files/patch-libwebrtc-generated | 8418 +++++++++++--------- 6 files changed, 4750 insertions(+), 3884 deletions(-) diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile index 3fb75f9e1d86..ad6c6289ab17 100644 --- a/www/librewolf/Makefile +++ b/www/librewolf/Makefile @@ -1,7 +1,6 @@ PORTNAME= librewolf -DISTVERSION= 129.0 +DISTVERSION= 131.0.2 DISTVERSIONSUFFIX= -1.source -PORTREVISION= 2 CATEGORIES= www wayland MASTER_SITES= https://gitlab.com/api/v4/projects/32320088/packages/generic/${PORTNAME}-source/${DISTVERSION}-1/ @@ -13,14 +12,14 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= nspr>=4.32:devel/nspr \ - nss>=3.101:security/nss \ + nss>=3.104:security/nss \ icu>=73.1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=8.5.0:print/harfbuzz \ + harfbuzz>=9.0.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.43:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ - libvpx>=1.14.0:multimedia/libvpx \ + libvpx>=1.14.1:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf2.13:devel/autoconf2.13 \ @@ -66,7 +65,6 @@ MOZ_OPTIONS= --enable-application=browser \ FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png -FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop .include "${.CURDIR}/../../www/firefox/Makefile.options" @@ -86,18 +84,19 @@ BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:deve MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .endif +post-extract: + @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \ + -e 's|firefox|${MOZILLA}|' \ + -e 's|Firefox|${MOZILLA_CAP}|' \ + <${.CURDIR}/../firefox/files/firefox.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop + post-patch: - @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ - -e 's/firefox/${MOZILLA}/' \ - -e 's/Firefox/${MOZILLA_CAP}/' \ - -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \ - ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp @${RM} ${WRKSRC}/mozconfig post-install: - ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop + ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} diff --git a/www/librewolf/distinfo b/www/librewolf/distinfo index f61584dd92b8..f15c5bc15c06 100644 --- a/www/librewolf/distinfo +++ b/www/librewolf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723582244 -SHA256 (librewolf-129.0-1.source.tar.gz) = ff03845699e62aa68f31fb7b17193636e9e8a63dd824011f3d84059574c9b09d -SIZE (librewolf-129.0-1.source.tar.gz) = 1016824247 +TIMESTAMP = 1728675727 +SHA256 (librewolf-131.0.2-1.source.tar.gz) = 74e4bbcd9108d7f04c8be6a52ab96aa23d6eef7e1a396215444b2028a0db5ae7 +SIZE (librewolf-131.0.2-1.source.tar.gz) = 1035020649 diff --git a/www/librewolf/files/patch-bug1559213 b/www/librewolf/files/patch-bug1559213 index ae11fb38f989..ead3425fa70b 100644 --- a/www/librewolf/files/patch-bug1559213 +++ b/www/librewolf/files/patch-bug1559213 @@ -1,17 +1,16 @@ -commit 717bba28411c -Author: Jory A. Pratt <anarchy@gentoo.org> -Date: Thu Jun 13 11:53:00 2019 -0700 +commit 25a5572d5cd137aa6d893e09a00bd39908a59a18 +Author: Christoph Moench-Tegeder <cmt@burggraben.net> +Date: Tue Sep 10 22:23:32 2024 +0200 - Bug 1559213 - Allow to use system av1 libs instead of bundled. ---- - config/external/moz.build | 5 +++-- - config/system-headers.mozbuild | 8 ++++++++ - dom/media/platforms/moz.build | 5 +++++ - toolkit/moz.configure | 19 ++++++++++++++++++- - 4 files changed, 34 insertions(+), 3 deletions(-) + based on: + commit 717bba28411c + Author: Jory A. Pratt <anarchy@gentoo.org> + Date: Thu Jun 13 11:53:00 2019 -0700 + + Bug 1559213 - Allow to use system av1 libs instead of bundled. diff --git config/external/moz.build config/external/moz.build -index 2fc8df57992e..63d18e50a961 100644 +index a24b470396cf..547f5f5c9e04 100644 --- config/external/moz.build +++ config/external/moz.build @@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]: @@ -27,10 +26,10 @@ index 2fc8df57992e..63d18e50a961 100644 if not CONFIG["MOZ_SYSTEM_PNG"]: external_dirs += ["media/libpng"] diff --git dom/media/platforms/moz.build dom/media/platforms/moz.build -index 5c6e25b3980b..ce99ebfb6d3f 100644 +index 61536cc6e225..29cf635bbb44 100644 --- dom/media/platforms/moz.build +++ dom/media/platforms/moz.build -@@ -81,6 +81,11 @@ if CONFIG["MOZ_AV1"]: +@@ -71,6 +71,11 @@ if CONFIG["MOZ_AV1"]: "agnostic/AOMDecoder.cpp", "agnostic/DAV1DDecoder.cpp", ] @@ -43,10 +42,10 @@ index 5c6e25b3980b..ce99ebfb6d3f 100644 if CONFIG["MOZ_OMX"]: EXPORTS += [ diff --git media/ffvpx/libavcodec/moz.build media/ffvpx/libavcodec/moz.build -index 761fc8cf4cd9..793a5b8697a8 100644 +index 6f09049a6068..90a82a19a9d1 100644 --- media/ffvpx/libavcodec/moz.build +++ media/ffvpx/libavcodec/moz.build -@@ -120,10 +120,14 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: +@@ -119,10 +119,16 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: 'vp9recon.c', 'vpx_rac.c', ] @@ -57,6 +56,8 @@ index 761fc8cf4cd9..793a5b8697a8 100644 + if CONFIG["MOZ_SYSTEM_AV1"]: + CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS'] + OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS'] ++ CFLAGS += CONFIG['MOZ_SYSTEM_LIBAOM_CFLAGS'] ++ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBAOM_LIBS'] + else: + USE_LIBS += [ + 'dav1d', @@ -65,11 +66,37 @@ index 761fc8cf4cd9..793a5b8697a8 100644 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": LOCAL_INCLUDES += ['/media/mozva'] SOURCES += [ +diff --git media/libopus/moz.build media/libopus/moz.build +index 943aee79ee99..4ad07e3e98af 100644 +--- media/libopus/moz.build ++++ media/libopus/moz.build +@@ -58,7 +58,7 @@ if not CONFIG["MOZ_SAMPLE_TYPE_FLOAT32"]: + DEFINES["FIXED_POINT"] = 1 + DEFINES["DISABLE_FLOAT_API"] = True + +-if CONFIG["OS_ARCH"] == "Linux": ++if CONFIG["OS_ARCH"] in ("FreeBSD", "Linux"): + OS_LIBS += [ + "m", + ] +diff --git media/libvorbis/moz.build media/libvorbis/moz.build +index cd17d4f89759..816edd72a000 100644 +--- media/libvorbis/moz.build ++++ media/libvorbis/moz.build +@@ -45,7 +45,7 @@ LOCAL_INCLUDES += ['lib'] + if CONFIG['OS_ARCH'] == 'SunOS': + DEFINES['HAVE_ALLOCA_H'] = True + +-if CONFIG["OS_ARCH"] == "Linux": ++if CONFIG["OS_ARCH"] in ("FreeBSD", "Linux"): + OS_LIBS += [ + "m", + ] diff --git toolkit/moz.configure toolkit/moz.configure -index f93a5d64fec8..814357f4e979 100644 +index 1f85d2831f2f..07294b93f850 100644 --- toolkit/moz.configure +++ toolkit/moz.configure -@@ -744,7 +744,23 @@ def av1(value): +@@ -883,7 +883,23 @@ def av1(value): return True @@ -94,7 +121,7 @@ index f93a5d64fec8..814357f4e979 100644 def dav1d_asm(target): if target.cpu in ("aarch64", "x86", "x86_64"): return True -@@ -760,6 +776,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm) +@@ -899,6 +915,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm) set_define("MOZ_DAV1D_ASM", dav1d_asm) set_config("MOZ_AV1", av1) set_define("MOZ_AV1", av1) diff --git a/www/librewolf/files/patch-bug847568 b/www/librewolf/files/patch-bug847568 index 6e2cccebff70..f3e7ecbc1a13 100644 --- a/www/librewolf/files/patch-bug847568 +++ b/www/librewolf/files/patch-bug847568 @@ -1,8 +1,10 @@ -# Allow building against system-wide graphite2/harfbuzz. +Allow building against system-wide graphite2/harfbuzz ---- config/system-headers.mozbuild.orig 2024-07-25 20:34:40 UTC +diff --git config/system-headers.mozbuild config/system-headers.mozbuild +index af44c89057fc..c0ac271917fb 100644 +--- config/system-headers.mozbuild +++ config/system-headers.mozbuild -@@ -1305,6 +1305,19 @@ if CONFIG["MOZ_ENABLE_LIBPROXY"]: +@@ -1304,6 +1304,19 @@ if CONFIG["MOZ_ENABLE_LIBPROXY"]: "proxy.h", ] @@ -22,9 +24,11 @@ if CONFIG["MOZ_SYSTEM_ICU"]: system_headers += [ "unicode/calendar.h", ---- dom/base/moz.build.orig 2024-07-25 20:34:40 UTC +diff --git dom/base/moz.build dom/base/moz.build +index 170d19f09aa9..a47fc8b1193c 100644 +--- dom/base/moz.build +++ dom/base/moz.build -@@ -616,6 +616,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": +@@ -620,6 +620,9 @@ FINAL_LIBRARY = "xul" if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] @@ -34,7 +38,10 @@ GeneratedFile( "UseCounterList.h", script="gen-usecounters.py", ---- gfx/graphite2/geckoextra/moz.build.orig 2024-08-13 19:48:57 UTC +diff --git gfx/graphite2/geckoextra/moz.build gfx/graphite2/geckoextra/moz.build +new file mode 100644 +index 000000000000..ed0323eba9d5 +--- /dev/null +++ gfx/graphite2/geckoextra/moz.build @@ -0,0 +1,21 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- @@ -58,16 +65,21 @@ +AllowCompilerWarnings() + +FINAL_LIBRARY = 'xul' ---- gfx/harfbuzz/README-mozilla.fbsd.orig 2024-08-13 19:48:57 UTC +diff --git gfx/harfbuzz/README-mozilla.fbsd gfx/harfbuzz/README-mozilla.fbsd +new file mode 100644 +index 000000000000..2a10eb1e2b42 +--- /dev/null +++ gfx/harfbuzz/README-mozilla.fbsd @@ -0,0 +1,4 @@ +The in-tree copy may be omitted during build by --with-system-harfbuzz. +Make sure to keep pkg-config version check within toolkit/moz.configure in sync +with checkout version or increment latest tag by one if it's not based +on upstream release. ---- gfx/moz.build.orig 2024-07-25 20:34:43 UTC +diff --git gfx/moz.build gfx/moz.build +index 56ea317bedfc..07dd7f66f1bc 100644 +--- gfx/moz.build +++ gfx/moz.build -@@ -10,6 +10,14 @@ with Files("wr/**"): +@@ -10,6 +10,14 @@ with Files("**"): with Files("wr/**"): BUG_COMPONENT = ("Core", "Graphics: WebRender") @@ -91,7 +103,9 @@ "ots/src", "thebes", "ipc", ---- gfx/skia/generate_mozbuild.py.orig 2024-07-25 20:34:42 UTC +diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py +index b589efde1c5c..47f49e10df70 100755 +--- gfx/skia/generate_mozbuild.py +++ gfx/skia/generate_mozbuild.py @@ -95,6 +95,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', @@ -103,7 +117,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'): LOCAL_INCLUDES += [ "/gfx/cairo/cairo/src", ---- gfx/skia/moz.build.orig 2024-07-25 20:34:42 UTC +diff --git gfx/skia/moz.build gfx/skia/moz.build +index 7fee54534878..ba1a4038e4a0 100644 +--- gfx/skia/moz.build +++ gfx/skia/moz.build @@ -623,6 +623,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', @@ -115,9 +131,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'): LOCAL_INCLUDES += [ "/gfx/cairo/cairo/src", ---- gfx/thebes/moz.build.orig 2024-07-25 20:34:42 UTC +diff --git gfx/thebes/moz.build gfx/thebes/moz.build +index 48f2849e2025..7d0a161a91b4 100644 +--- gfx/thebes/moz.build +++ gfx/thebes/moz.build -@@ -295,7 +295,13 @@ LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"] +@@ -295,7 +295,13 @@ if CONFIG["MOZ_WAYLAND"]: LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"] @@ -132,7 +150,9 @@ CXXFLAGS += ["-Werror=switch"] ---- intl/unicharutil/util/moz.build.orig 2024-07-25 20:34:43 UTC +diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build +index 2396210428ee..092baac6f79c 100644 +--- intl/unicharutil/util/moz.build +++ intl/unicharutil/util/moz.build @@ -24,6 +24,9 @@ UNIFIED_SOURCES += [ "nsUnicodeProperties.cpp", @@ -144,9 +164,11 @@ include("/ipc/chromium/chromium-config.mozbuild") GeneratedFile( ---- netwerk/dns/moz.build.orig 2024-07-25 20:34:48 UTC +diff --git netwerk/dns/moz.build netwerk/dns/moz.build +index 1bb0430f01aa..0360e0f468c0 100644 +--- netwerk/dns/moz.build +++ netwerk/dns/moz.build -@@ -112,6 +112,9 @@ GeneratedFile( +@@ -111,6 +111,9 @@ GeneratedFile( "etld_data.inc", script="prepare_tlds.py", inputs=["effective_tld_names.dat"] ) @@ -156,12 +178,15 @@ # need to include etld_data.inc LOCAL_INCLUDES += [ "/netwerk/base", ---- old-configure.in.orig 2024-07-25 20:34:49 UTC +diff --git old-configure.in old-configure.in +index 1af75c496b15..f1c7d7c48d28 100644 +--- old-configure.in +++ old-configure.in -@@ -704,6 +704,27 @@ dnl ================================================== +@@ -167,6 +167,27 @@ fi + AC_DEFINE_UNQUOTED(MOZ_MACBUNDLE_ID,$MOZ_MACBUNDLE_ID) AC_SUBST(MOZ_MACBUNDLE_ID) - dnl ======================================================== ++dnl ======================================================== +dnl Check for graphite2 +dnl ======================================================== +if test -n "$MOZ_SYSTEM_GRAPHITE2"; then @@ -182,13 +207,27 @@ + CFLAGS=$_SAVE_CFLAGS +fi + -+dnl ======================================================== + dnl ======================================================== dnl = Child Process Name for IPC dnl ======================================================== - if test "$MOZ_WIDGET_TOOLKIT" != "android"; then ---- toolkit/library/moz.build.orig 2024-07-25 20:34:58 UTC +diff --git security/rlbox/moz.build security/rlbox/moz.build +index 7ad8d076f0f1..835b9d905e03 100644 +--- security/rlbox/moz.build ++++ security/rlbox/moz.build +@@ -47,6 +47,8 @@ if CONFIG["MOZ_WASM_SANDBOXING_GRAPHITE"]: + for k, v in graphite_defines: + WASM_DEFINES[k] = v + LOCAL_INCLUDES += ["/gfx/graphite2/src"] ++ if CONFIG["MOZ_SYSTEM_GRAPHITE2"]: ++ WASM_CXXFLAGS += CONFIG["MOZ_GRAPHITE2_CFLAGS"] + + if CONFIG["MOZ_WASM_SANDBOXING_OGG"]: + include("/media/libogg/sources.mozbuild") +diff --git toolkit/library/moz.build toolkit/library/moz.build +index ee6051567c8e..c24a5a513bbc 100644 +--- toolkit/library/moz.build +++ toolkit/library/moz.build -@@ -297,6 +297,12 @@ if CONFIG["MOZ_SYSTEM_WEBP"]: +@@ -298,6 +298,12 @@ if CONFIG["MOZ_SYSTEM_PNG"]: if CONFIG["MOZ_SYSTEM_WEBP"]: OS_LIBS += CONFIG["MOZ_WEBP_LIBS"] @@ -201,9 +240,11 @@ if CONFIG["MOZ_SYSTEM_LIBEVENT"]: OS_LIBS += CONFIG["MOZ_LIBEVENT_LIBS"] ---- toolkit/moz.configure.orig 2024-08-02 23:23:42 UTC +diff --git toolkit/moz.configure toolkit/moz.configure +index 1f85d2831f2f..04ce56e2cc0b 100644 +--- toolkit/moz.configure +++ toolkit/moz.configure -@@ -1279,6 +1279,26 @@ set_config("CAIRO_FT_CFLAGS", ft2_info.cflags, when=en +@@ -1397,6 +1397,26 @@ def enable_cairo_ft(target, tree_freetype, freetype2_info): set_config("MOZ_ENABLE_CAIRO_FT", True, when=enable_cairo_ft) set_config("CAIRO_FT_CFLAGS", ft2_info.cflags, when=enable_cairo_ft) diff --git a/www/librewolf/files/patch-gfx_skia_skia_src_core_SkCpu.cpp b/www/librewolf/files/patch-gfx_skia_skia_src_core_SkCpu.cpp deleted file mode 100644 index fe73016d6618..000000000000 --- a/www/librewolf/files/patch-gfx_skia_skia_src_core_SkCpu.cpp +++ /dev/null @@ -1,33 +0,0 @@ -Regressed by https://svnweb.freebsd.org/changeset/base/324815 - -gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'getauxval' - uint32_t hwcaps = getauxval(AT_HWCAP); - ^ - -diff --git gfx/skia/skia/src/core/SkCpu.cpp gfx/skia/skia/src/core/SkCpu.cpp -index cdac7db2be2c..88391138880a 100644 ---- gfx/skia/skia/src/core/SkCpu.cpp -+++ gfx/skia/skia/src/core/SkCpu.cpp -@@ -81,6 +81,22 @@ - if (hwcap & HWCAP_LOONGARCH_LSX) { features |= SkCpu::LOONGARCH_SX; } - if (hwcap & HWCAP_LOONGARCH_LASX) { features |= SkCpu::LOONGARCH_ASX; } - -+ return features; -+ } -+#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__) -+ #include <machine/armreg.h> -+ #ifndef ID_AA64ISAR0_CRC32_VAL -+ #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 -+ #endif -+ -+ static uint32_t read_cpu_features() { -+ uint32_t features = 0; -+ uint64_t id_aa64isar0; -+ -+ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); -+ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { -+ features |= SkCpu::CRC32; -+ } - return features; - } - #else diff --git a/www/librewolf/files/patch-libwebrtc-generated b/www/librewolf/files/patch-libwebrtc-generated index c547d211c7d4..17702f82615d 100644 --- a/www/librewolf/files/patch-libwebrtc-generated +++ b/www/librewolf/files/patch-libwebrtc-generated @@ -1,7 +1,8 @@ -commit 8f47d0fc87c264faae3f47b2023f8a7eb4c36101 +commit da3b4d2fa4d2a502149450e93d2ceaee9eb8d8e4 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> +Date: Wed Sep 18 20:59:22 2024 +0000 - regenerate FreeBSD libwebrtc patch for Firefox 129 + regenerate FreeBSD libwebrtc patch for Firefox 131 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 2dbd5881583e..332ca04819ee 100644 @@ -1038,6 +1039,197 @@ index 746585483f96..33ea9b79d47b 100644 + DEFINES["USE_X11"] = "1" Library("aec3_factory_gn") +diff --git third_party/libwebrtc/api/audio/audio_device_gn/moz.build third_party/libwebrtc/api/audio/audio_device_gn/moz.build +index 9609692094c1..f0da29e5d200 100644 +--- third_party/libwebrtc/api/audio/audio_device_gn/moz.build ++++ third_party/libwebrtc/api/audio/audio_device_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 = "xul" + +@@ -39,111 +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 +- +- 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_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": + +@@ -153,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("audio_device_gn") 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 e2561db08f06..59da7761dd35 100644 --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build @@ -1641,10 +1833,10 @@ index 36d43783a3e7..fd0111ba0ffd 100644 - DEFINES["_GNU_SOURCE"] = True - Library("audio_mixer_api_gn") -diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build -index 06f43e765114..6c06b87bcfe3 100644 ---- third_party/libwebrtc/api/audio/echo_control_gn/moz.build -+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build +diff --git third_party/libwebrtc/api/audio/audio_processing_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_gn/moz.build +index 7226d2a92a40..c60a400c218b 100644 +--- third_party/libwebrtc/api/audio/audio_processing_gn/moz.build ++++ third_party/libwebrtc/api/audio/audio_processing_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -1667,7 +1859,7 @@ index 06f43e765114..6c06b87bcfe3 100644 FINAL_LIBRARY = "xul" -@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1764,6 +1956,10 @@ index 06f43e765114..6c06b87bcfe3 100644 -if CONFIG["TARGET_CPU"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True @@ -1780,10 +1976,12 @@ index 06f43e765114..6c06b87bcfe3 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["TARGET_CPU"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -1805,16 +2003,21 @@ index 06f43e765114..6c06b87bcfe3 100644 - 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" - +- +- DEFINES["USE_X11"] = "1" +- -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ - "unwind" - ] - +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": +- + CXXFLAGS += [ + "-msse2" + ] + -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -1824,18 +2027,27 @@ index 06f43e765114..6c06b87bcfe3 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["TARGET_CPU"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("echo_control_gn") -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 5811f4d9321b..0f11017e2f6c 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 ++ DEFINES["USE_X11"] = "1" + + Library("audio_processing_gn") +diff --git third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build +index d7629659d6ba..cb69c23840a0 100644 +--- third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build ++++ third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -1858,7 +2070,7 @@ index 5811f4d9321b..0f11017e2f6c 100644 FINAL_LIBRARY = "xul" -@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1877,10 +2089,6 @@ index 5811f4d9321b..0f11017e2f6c 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -1946,13 +2154,6 @@ index 5811f4d9321b..0f11017e2f6c 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": @@ -2049,11 +2250,202 @@ index 5811f4d9321b..0f11017e2f6c 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" - Library("audio_decoder_L16_gn") -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 f4fb06ef3f09..90113fd85d92 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 + Library("audio_processing_statistics_gn") +diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build +index 06f43e765114..6c06b87bcfe3 100644 +--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build ++++ third_party/libwebrtc/api/audio/echo_control_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 = "xul" + +@@ -39,111 +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 +- +- 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_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": + +@@ -153,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": *** 12489 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410141410.49EEAqbo054430>