From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 config/external/moz.build                                          | 7 +------
 .../external/rlbox_wasm2c_sandbox/rlbox_wasm2c_thread_locals.cpp   | 2 +-
 config/makefiles/rust.mk                                           | 6 ++++++
 config/milestone.txt                                               | 2 +-
 config/system-headers.mozbuild                                     | 5 -----
 5 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'config')

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
 }
diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
index 9e3d5256b9..b10594f5cb 100644
--- a/config/makefiles/rust.mk
+++ b/config/makefiles/rust.mk
@@ -252,6 +252,12 @@ ifeq ($(OS_ARCH), Darwin)
 ifdef MACOS_SDK_DIR
 export COREAUDIO_SDK_PATH=$(MACOS_SDK_DIR)
 endif
+ifdef IPHONEOS_SDK_DIR
+export COREAUDIO_SDK_PATH=$(IPHONEOS_SDK_DIR)
+# export for build/macosx/xcrun
+export IPHONEOS_SDK_DIR
+PATH := $(topsrcdir)/build/macosx:$(PATH)
+endif
 endif
 
 ifndef RUSTC_BOOTSTRAP
diff --git a/config/milestone.txt b/config/milestone.txt
index 0809f53609..40b4883e49 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-124.0.1
+125.0.1
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
index 0c06f581b3..d1808cc710 100644
--- a/config/system-headers.mozbuild
+++ b/config/system-headers.mozbuild
@@ -1267,11 +1267,6 @@ if CONFIG["MOZ_SYSTEM_JPEG"]:
         "jpeglib.h",
     ]
 
-if CONFIG["MOZ_LIBAV_FFT"]:
-    system_headers += [
-        "libavcodec/avfft.h",
-    ]
-
 if CONFIG["MOZ_SYSTEM_PNG"]:
     system_headers += [
         "png.h",
-- 
cgit v1.2.3