Adding upstream version 125.0.1.upstream/125.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 2 insertions, 7 deletions

diff --git a/config/external/moz.build b/config/external/moz.build
index 2fc8df5799..f9f0113216 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -49,17 +49,12 @@ if not CONFIG["MOZ_SYSTEM_PNG"]:
 if not CONFIG["MOZ_SYSTEM_WEBP"]:
     external_dirs += ["media/libwebp"]
 
-if CONFIG["TARGET_CPU"] == "arm":
-    external_dirs += ["media/openmax_dl/dl"]
-
-if CONFIG["MOZ_FFVPX"]:
-    external_dirs += ["media/ffvpx"]
+external_dirs += ["media/ffvpx"]
 
 if CONFIG["MOZ_JXL"]:
     external_dirs += ["media/libjxl", "media/highway"]
 
 external_dirs += [
-    "media/kiss_fft",
     "media/libcubeb",
     "media/libmkv",
     "media/libnestegg",
diff --git a/config/external/rlbox_wasm2c_sandbox/rlbox_wasm2c_thread_locals.cpp b/config/external/rlbox_wasm2c_sandbox/rlbox_wasm2c_thread_locals.cpp
index 0fadb5af40..f4be9c6c44 100644
--- a/config/external/rlbox_wasm2c_sandbox/rlbox_wasm2c_thread_locals.cpp
+++ b/config/external/rlbox_wasm2c_sandbox/rlbox_wasm2c_thread_locals.cpp
@@ -38,7 +38,7 @@ void moz_wasm2c_memgrow_failed() {
 #  ifdef WASM_RT_GROW_FAILED_CRASH
   MOZ_CRASH("wasm2c memory grow failed");
 #  else
-  CrashReporter::AnnotateCrashReport(
+  CrashReporter::RecordAnnotationBool(
       CrashReporter::Annotation::WasmLibrarySandboxMallocFailed, true);
 #  endif
 }