diff options
Diffstat (limited to 'multimedia/ringrtc/files')
15 files changed, 128 insertions, 125 deletions
diff --git a/multimedia/ringrtc/files/patch-build_config_BUILD.gn b/multimedia/ringrtc/files/patch-build_config_BUILD.gn index 74d9f784d94c..ca0aa388f6b1 100644 --- a/multimedia/ringrtc/files/patch-build_config_BUILD.gn +++ b/multimedia/ringrtc/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ --- src/webrtc/src/build/config/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ src/webrtc/src/build/config/BUILD.gn -@@ -214,6 +214,10 @@ config("default_libs") { +@@ -215,6 +215,10 @@ config("default_libs") { # Targets should choose to explicitly link frameworks they require. Since # linking can have run-time side effects, nothing should be listed here. libs = [] diff --git a/multimedia/ringrtc/files/patch-build_config_BUILDCONFIG.gn b/multimedia/ringrtc/files/patch-build_config_BUILDCONFIG.gn index 79473a536c3d..384f674203f1 100644 --- a/multimedia/ringrtc/files/patch-build_config_BUILDCONFIG.gn +++ b/multimedia/ringrtc/files/patch-build_config_BUILDCONFIG.gn @@ -10,7 +10,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -231,6 +232,10 @@ if (host_toolchain == "") { +@@ -235,6 +236,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -21,16 +21,16 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -274,6 +279,8 @@ if (target_os == "android") { +@@ -279,6 +284,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/aix:$target_cpu" } else if (target_os == "zos") { _default_toolchain = "//build/toolchain/zos:$target_cpu" +} else if (target_os == "openbsd" || target_os == "freebsd") { + _default_toolchain = host_toolchain - } else { - assert(false, "Unsupported target_os: $target_os") - } -@@ -308,7 +315,11 @@ is_android = current_os == "android" + } else if (target_os == "emscripten") { + # Because it's too hard to remove all targets from //BUILD.gn that do not work with it. + assert( +@@ -318,7 +325,11 @@ is_ios = current_os == "ios" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" @@ -42,4 +42,4 @@ +is_bsd = current_os == "openbsd" || current_os == "freebsd" is_mac = current_os == "mac" is_nacl = current_os == "nacl" - is_win = current_os == "win" || current_os == "winuwp" + is_wasm = current_os == "emscripten" diff --git a/multimedia/ringrtc/files/patch-build_config_clang_BUILD.gn b/multimedia/ringrtc/files/patch-build_config_clang_BUILD.gn index f2dd7f101af1..5f81aa974ab7 100644 --- a/multimedia/ringrtc/files/patch-build_config_clang_BUILD.gn +++ b/multimedia/ringrtc/files/patch-build_config_clang_BUILD.gn @@ -1,11 +1,16 @@ --- src/webrtc/src/build/config/clang/BUILD.gn.orig 2024-07-30 11:12:21 UTC +++ src/webrtc/src/build/config/clang/BUILD.gn -@@ -224,7 +224,7 @@ clang_lib("compiler_builtins") { - libname = "ios" - } - } else { -- libname = "builtins" -+ #libname = "builtins" - } - } +@@ -252,7 +252,12 @@ template("clang_lib") { + # Adds a dependency on the Clang runtime library clang_rt.builtins. + clang_lib("compiler_builtins") { +- if (is_mac) { ++ if (is_bsd) { ++ # Since there's no Rust in the toolchain, there's no concern that we'll use ++ # the Rust stdlib's intrinsics here. ++ # ++ # Don't define libname which makes this target do nothing. ++ } else if (is_mac) { + libname = "osx" + } else if (is_ios) { + if (target_platform == "iphoneos") { diff --git a/multimedia/ringrtc/files/patch-build_config_compiler_BUILD.gn b/multimedia/ringrtc/files/patch-build_config_compiler_BUILD.gn index 92fcd9a9cd56..65b46735dcc7 100644 --- a/multimedia/ringrtc/files/patch-build_config_compiler_BUILD.gn +++ b/multimedia/ringrtc/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ --- src/webrtc/src/build/config/compiler/BUILD.gn.orig 2024-06-18 16:34:35 UTC +++ src/webrtc/src/build/config/compiler/BUILD.gn -@@ -198,7 +198,7 @@ declare_args() { +@@ -199,7 +199,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of # debugging information which is required by some specialized # debugging tools. @@ -9,7 +9,7 @@ } declare_args() { -@@ -255,13 +255,16 @@ config("no_unresolved_symbols") { +@@ -256,13 +256,16 @@ config("no_unresolved_symbols") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -27,7 +27,7 @@ } # compiler --------------------------------------------------------------------- -@@ -519,6 +522,10 @@ config("compiler") { +@@ -521,6 +524,10 @@ config("compiler") { } } @@ -38,7 +38,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_icf && (!is_apple || use_lld)) { -@@ -578,7 +585,7 @@ config("compiler") { +@@ -581,7 +588,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -47,7 +47,16 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1240,7 +1247,7 @@ config("compiler_cpu_abi") { +@@ -1233,7 +1240,7 @@ config("compiler_cpu_abi") { + # simplicity we always explicitly set the architecture. + if (current_cpu == "x64") { + if (is_clang && !is_android && !is_nacl && !is_fuchsia && +- !is_chromeos_device) { ++ !is_chromeos_device && !is_bsd) { + cflags += [ "--target=x86_64-unknown-linux-gnu" ] + ldflags += [ "--target=x86_64-unknown-linux-gnu" ] + } else { +@@ -1256,7 +1263,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -56,7 +65,7 @@ cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] } -@@ -1255,7 +1262,7 @@ config("compiler_cpu_abi") { +@@ -1271,7 +1278,7 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia && @@ -65,7 +74,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1589,7 +1596,7 @@ config("compiler_deterministic") { +@@ -1617,7 +1624,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -74,38 +83,35 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1647,7 +1654,7 @@ config("clang_revision") { +@@ -1683,7 +1690,7 @@ config("clang_revision") { } config("clang_revision") { - if (is_clang && clang_base_path == default_clang_base_path && + if (is_clang && !is_bsd && clang_base_path == default_clang_base_path && current_os != "zos") { - update_args = [ - "--print-revision", -@@ -1965,20 +1972,12 @@ config("default_warnings") { - ] - } + _perform_consistency_checks = current_toolchain == default_toolchain + if (llvm_force_head_revision) { +@@ -1775,7 +1782,7 @@ config("clang_warning_suppression") { + # e.g. by setting in the the project's .gn file. + config("clang_warning_suppression") { + # Some build configs use older versions of clang that don't support WSMs +- if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" && ++ if (!is_bsd && !is_nacl && default_toolchain != "//build/toolchain/cros:target" && + !llvm_android_mainline && is_clang && + clang_warning_suppression_file != "") { + from_build_root = +@@ -2134,9 +2141,6 @@ config("default_warnings") { -- cflags += [ -- # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now. -- "-Wno-cast-function-type", -- -- # TODO(crbug.com/40284799): Fix and re-enable. -- "-Wno-thread-safety-reference-return", -- ] + # TODO(crbug.com/40284799): Fix and re-enable. + "-Wno-thread-safety-reference-return", - - cflags_cc += [ - # TODO(crbug.com/328490295): Fix and re-enable for C flags. - "-Wenum-compare-conditional", +- # TODO(crbug.com/376641662): Fix and re-enable. +- "-Wno-nontrivial-memcall", ] -- if (!is_nacl) { -+ if (!is_nacl && !is_bsd) { - cflags_cc += [ - # TODO(crbug.com/41486292): Fix and re-enable. - "-Wno-c++11-narrowing-const-reference", -@@ -2769,7 +2768,7 @@ config("afdo") { + cflags_cc += [ +@@ -2920,7 +2924,7 @@ config("afdo") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -114,7 +120,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2796,7 +2795,7 @@ config("afdo") { +@@ -2947,7 +2951,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -123,7 +129,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2973,7 +2972,7 @@ config("symbols") { +@@ -3136,7 +3140,7 @@ config("symbols") { cflags += [ "-gomit-unreferenced-methods" ] } diff --git a/multimedia/ringrtc/files/patch-build_toolchain_gcc__toolchain.gni b/multimedia/ringrtc/files/patch-build_toolchain_gcc__toolchain.gni index e3def33f6fcb..49b30f663a3c 100644 --- a/multimedia/ringrtc/files/patch-build_toolchain_gcc__toolchain.gni +++ b/multimedia/ringrtc/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,6 +1,6 @@ --- src/webrtc/src/build/toolchain/gcc_toolchain.gni.orig 2022-02-16 12:34:12 UTC +++ src/webrtc/src/build/toolchain/gcc_toolchain.gni -@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { +@@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } @@ -14,8 +14,8 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -825,22 +832,12 @@ template("gcc_toolchain") { - # use_gold too. +@@ -896,22 +903,12 @@ template("gcc_toolchain") { + # actually just be doing a native compile. template("clang_toolchain") { gcc_toolchain(target_name) { - _path = "$clang_base_path/bin" @@ -36,9 +36,9 @@ - readelf = "${prefix}/llvm-readelf" - ar = "${prefix}/llvm-ar" - nm = "${prefix}/llvm-nm" -+ readelf = "llvm-readelf" ++ readelf = "readelf" + ar = "llvm-ar" + nm = "llvm-nm" - forward_variables_from(invoker, - [ + forward_variables_from(invoker, "*", [ "toolchain_args" ]) + diff --git a/multimedia/ringrtc/files/patch-build_toolchain_toolchain.gni b/multimedia/ringrtc/files/patch-build_toolchain_toolchain.gni index f5c9a960dfa6..8f1d9a3dacd4 100644 --- a/multimedia/ringrtc/files/patch-build_toolchain_toolchain.gni +++ b/multimedia/ringrtc/files/patch-build_toolchain_toolchain.gni @@ -1,6 +1,6 @@ --- src/webrtc/src/build/toolchain/toolchain.gni.orig 2024-03-22 08:19:40 UTC +++ src/webrtc/src/build/toolchain/toolchain.gni -@@ -72,7 +72,7 @@ if (host_os == "mac") { +@@ -75,7 +75,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" diff --git a/multimedia/ringrtc/files/patch-cargo-crates_neon_Cargo.toml b/multimedia/ringrtc/files/patch-cargo-crates_neon_Cargo.toml new file mode 100644 index 000000000000..c3385f611dcb --- /dev/null +++ b/multimedia/ringrtc/files/patch-cargo-crates_neon_Cargo.toml @@ -0,0 +1,10 @@ +--- cargo-crates/neon-1.1.1/Cargo.toml.orig 2025-06-20 16:24:28.786063000 +0200 ++++ cargo-crates/neon-1.1.1/Cargo.toml 2025-06-20 15:29:20.492364000 +0200 +@@ -109,6 +109,7 @@ version = "0.3.33" + + [dependencies.linkme] + version = "0.3.33" ++features = ["used_linker"] + + [dependencies.neon-macros] + version = "=1.1.1" diff --git a/multimedia/ringrtc/files/patch-cargo-crates_neon_src_lib.rs b/multimedia/ringrtc/files/patch-cargo-crates_neon_src_lib.rs new file mode 100644 index 000000000000..322ea7e0200c --- /dev/null +++ b/multimedia/ringrtc/files/patch-cargo-crates_neon_src_lib.rs @@ -0,0 +1,8 @@ +--- cargo-crates/neon-1.1.1/src/lib.rs.orig 2025-06-20 16:23:34.475493000 +0200 ++++ cargo-crates/neon-1.1.1/src/lib.rs 2025-06-20 15:36:29.406748000 +0200 +@@ -1,3 +1,5 @@ ++#![feature(used_with_arg)] ++ + //! The [Neon][neon] crate provides bindings for writing [Node.js addons][addons] + //! (i.e., dynamically-loaded binary modules) with a safe and fast Rust API. + //! diff --git a/multimedia/ringrtc/files/patch-src_rust_src_lib.rs b/multimedia/ringrtc/files/patch-src_rust_src_lib.rs new file mode 100644 index 000000000000..b422a1b6e588 --- /dev/null +++ b/multimedia/ringrtc/files/patch-src_rust_src_lib.rs @@ -0,0 +1,7 @@ +--- src/rust/src/lib.rs.orig 2025-06-20 16:23:04.823901000 +0200 ++++ src/rust/src/lib.rs 2025-06-20 15:36:53.716050000 +0200 +@@ -1,3 +1,4 @@ ++#![feature(used_with_arg)] + // + // Copyright 2019-2021 Signal Messenger, LLC + // SPDX-License-Identifier: AGPL-3.0-only diff --git a/multimedia/ringrtc/files/patch-src_rust_src_webrtc_audio__device__module__utils.rs b/multimedia/ringrtc/files/patch-src_rust_src_webrtc_audio__device__module__utils.rs index 9d75b5641e26..ec15f6b1927f 100644 --- a/multimedia/ringrtc/files/patch-src_rust_src_webrtc_audio__device__module__utils.rs +++ b/multimedia/ringrtc/files/patch-src_rust_src_webrtc_audio__device__module__utils.rs @@ -1,15 +1,15 @@ --- src/rust/src/webrtc/audio_device_module_utils.rs.orig 2024-11-18 16:04:01 UTC +++ src/rust/src/webrtc/audio_device_module_utils.rs -@@ -10,7 +10,7 @@ use cubeb_core::DevicePref; +@@ -11,7 +11,7 @@ use cubeb_core::DevicePref; use anyhow::anyhow; use cubeb::{DeviceCollection, DeviceState}; use cubeb_core::DevicePref; -#[cfg(target_os = "linux")] +#[cfg(any(target_os = "freebsd", target_os = "linux"))] use cubeb_core::DeviceType; - use std::ffi::{c_uchar, c_void, CString}; + use regex::Regex; -@@ -18,7 +18,7 @@ pub struct MinimalDeviceInfo { +@@ -22,7 +22,7 @@ pub struct MinimalDeviceInfo { pub devid: *const c_void, pub device_id: Option<String>, pub friendly_name: Option<String>, @@ -18,7 +18,7 @@ device_type: DeviceType, preferred: DevicePref, state: DeviceState, -@@ -35,7 +35,7 @@ pub struct DeviceCollectionWrapper { +@@ -40,7 +40,7 @@ pub struct DeviceCollectionWrapper { device_collection: Vec<MinimalDeviceInfo>, } @@ -27,7 +27,7 @@ fn device_is_monitor(device: &MinimalDeviceInfo) -> bool { device.device_type == DeviceType::INPUT && device -@@ -52,7 +52,7 @@ impl DeviceCollectionWrapper { +@@ -57,7 +57,7 @@ impl DeviceCollectionWrapper { devid: device.devid(), device_id: device.device_id().as_ref().map(|s| s.to_string()), friendly_name: device.friendly_name().as_ref().map(|s| s.to_string()), @@ -36,7 +36,7 @@ device_type: device.device_type(), preferred: device.preferred(), state: device.state(), -@@ -74,7 +74,7 @@ impl DeviceCollectionWrapper { +@@ -79,7 +79,7 @@ impl DeviceCollectionWrapper { } // For linux only, a method that will ignore "monitor" devices. @@ -45,7 +45,7 @@ pub fn iter_non_monitor( &self, ) -> std::iter::Filter<std::slice::Iter<'_, MinimalDeviceInfo>, fn(&&MinimalDeviceInfo) -> bool> -@@ -116,7 +116,7 @@ impl DeviceCollectionWrapper { +@@ -121,7 +121,7 @@ impl DeviceCollectionWrapper { { self.iter().nth(idx - 1) } @@ -54,12 +54,18 @@ { // filter out "monitor" devices. self.iter_non_monitor().nth(idx - 1) -@@ -146,7 +146,7 @@ impl DeviceCollectionWrapper { +@@ -149,12 +149,12 @@ impl DeviceCollectionWrapper { + pub fn count(&self) -> usize { + #[cfg(target_os = "macos")] let count = self.iter().count(); - // Whether a monitor device is default or not, there will be an additional default, - // so no need to do anything different. - #[cfg(target_os = "linux")] + #[cfg(any(target_os = "freebsd", target_os = "linux"))] let count = self.iter_non_monitor().count(); if count == 0 { - 0 + #[cfg(target_os = "macos")] + return 0; +- #[cfg(target_os = "linux")] ++ #[cfg(any(target_os = "freebsd", target_os = "linux"))] + return + // edge case: if there are only monitor devices, and one is the default, + // allow it. diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_testing_test.gni b/multimedia/ringrtc/files/patch-src_webrtc_src_testing_test.gni index 133fddbcdd19..8fafdd4eed49 100644 --- a/multimedia/ringrtc/files/patch-src_webrtc_src_testing_test.gni +++ b/multimedia/ringrtc/files/patch-src_webrtc_src_testing_test.gni @@ -1,11 +1,11 @@ --- src/webrtc/src/testing/test.gni.orig 2022-02-18 09:31:19 UTC +++ src/webrtc/src/testing/test.gni -@@ -17,7 +17,7 @@ declare_args() { +@@ -19,7 +19,7 @@ declare_args() { # "location_tags.json", and so we don't want to try and upload the tags # for their tests. # And, some build configs may simply turn off generation altogether. - tests_have_location_tags = generate_location_tags + tests_have_location_tags = false - } - if (is_android) { + # Build individual_fuzztest_wrapper if use_fuzztest_wrapper is set. + # Some projects doesn't have //base and cannot build diff --git a/multimedia/ringrtc/files/patch-third__party_nasm_config_config-linux.h b/multimedia/ringrtc/files/patch-third__party_nasm_config_config-linux.h index 3bb7bc175176..d6cc94a8ccf6 100644 --- a/multimedia/ringrtc/files/patch-third__party_nasm_config_config-linux.h +++ b/multimedia/ringrtc/files/patch-third__party_nasm_config_config-linux.h @@ -1,27 +1,18 @@ --- src/webrtc/src/third_party/nasm/config/config-linux.h.orig 2024-03-14 18:07:21 UTC +++ src/webrtc/src/third_party/nasm/config/config-linux.h -@@ -160,7 +160,7 @@ - - /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you - don't. */ --#define HAVE_DECL_STRLCPY 0 -+#define HAVE_DECL_STRLCPY 1 - - /* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you - don't. */ -@@ -183,7 +183,7 @@ +@@ -209,7 +209,7 @@ #define HAVE_DECL_STRSEP 1 /* Define to 1 if you have the <endian.h> header file. */ -#define HAVE_ENDIAN_H 1 +/* #undef HAVE_ENDIAN_H */ - /* Define to 1 if you have the `faccessat' function. */ + /* Define to 1 if you have the 'faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -327,10 +327,10 @@ +@@ -351,10 +351,10 @@ #define HAVE_ISASCII 1 - /* Define to 1 if you have the `iscntrl' function. */ + /* Define to 1 if you have the 'iscntrl' function. */ -/* #undef HAVE_ISCNTRL */ +#define HAVE_ISCNTRL 1 @@ -29,9 +20,9 @@ -/* #undef HAVE_MACHINE_ENDIAN_H */ +#define HAVE_MACHINE_ENDIAN_H 1 - /* Define to 1 if you have the <memory.h> header file. */ - #define HAVE_MEMORY_H 1 -@@ -357,7 +357,7 @@ + /* Define to 1 if you have the 'mempcpy' function. */ + #define HAVE_MEMPCPY 1 +@@ -384,7 +384,7 @@ #define HAVE_STDARG_H 1 /* Define to 1 if stdbool.h conforms to C99. */ @@ -40,16 +31,16 @@ /* Define to 1 if your compiler supports C99 extern inline */ #define HAVE_STDC_INLINE 1 -@@ -384,7 +384,7 @@ +@@ -414,7 +414,7 @@ #define HAVE_STRING_H 1 - /* Define to 1 if you have the `strlcpy' function. */ --/* #undef HAVE_STRLCPY */ + /* Define to 1 if you have the 'strlcpy' function. */ +-/* #undef HAVE_STRLCPY */ // Shouldn\'t work with -std=c11, but configure still detects it. +#define HAVE_STRLCPY 1 - /* Define to 1 if you have the `strncasecmp' function. */ + /* Define to 1 if you have the 'strncasecmp' function. */ #define HAVE_STRNCASECMP 1 -@@ -411,7 +411,7 @@ +@@ -441,7 +441,7 @@ #define HAVE_SYSCONF 1 /* Define to 1 if you have the <sys/endian.h> header file. */ @@ -58,7 +49,7 @@ /* Define to 1 if you have the <sys/mman.h> header file. */ #define HAVE_SYS_MMAN_H 1 -@@ -486,13 +486,13 @@ +@@ -522,13 +522,13 @@ /* #undef HAVE__STATI64 */ /* Define to 1 if you have the `__bswap_16' intrinsic function. */ @@ -75,21 +66,3 @@ /* Define to 1 if you have the `__builtin_bswap16' intrinsic function. */ #define HAVE___BUILTIN_BSWAP16 1 -@@ -620,7 +620,7 @@ - /* Define to the equivalent of the C99 'restrict' keyword, or to - nothing if this is not supported. Do not define if restrict is - supported directly. */ --#define restrict __restrict -+#define restrict __restrict__ - /* Work around a bug in Sun C++: it does not support _Restrict or - __restrict__, even though the corresponding Sun C compiler ends up with - "#define restrict _Restrict" or "#define restrict __restrict__" in the -@@ -637,7 +637,7 @@ - /* Define if your snprintf function is not named snprintf. */ - /* #undef snprintf */ - --/* Define if your typeof operator is not named typeof. */ -+/* Define if your typeof operator is not named `typeof'. */ - #define typeof __typeof - - /* Define to the type of an unsigned integer type wide enough to hold a diff --git a/multimedia/ringrtc/files/patch-third__party_perfetto_src_base_string__utils.cc b/multimedia/ringrtc/files/patch-third__party_perfetto_src_base_string__utils.cc deleted file mode 100644 index 19116d9de29f..000000000000 --- a/multimedia/ringrtc/files/patch-third__party_perfetto_src_base_string__utils.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/webrtc/src/third_party/perfetto/src/base/string_utils.cc.orig 2023-12-10 06:10:27 UTC -+++ src/webrtc/src/third_party/perfetto/src/base/string_utils.cc -@@ -39,7 +39,8 @@ namespace base { - // Locale-independant as possible version of strtod. - double StrToD(const char* nptr, char** endptr) { - #if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \ -+ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ - PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) - static auto c_locale = newlocale(LC_ALL, "C", nullptr); - return strtod_l(nptr, endptr, c_locale); diff --git a/multimedia/ringrtc/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc b/multimedia/ringrtc/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc index 8fc6f48670d5..849970708a27 100644 --- a/multimedia/ringrtc/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc +++ b/multimedia/ringrtc/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc @@ -4,9 +4,9 @@ #define PERFETTO_MEMFD_ENABLED() \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) -+ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) +- PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) ++ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) #if PERFETTO_MEMFD_ENABLED() diff --git a/multimedia/ringrtc/files/patch-third__party_webrtc_rtc__base_network.cc b/multimedia/ringrtc/files/patch-third__party_webrtc_rtc__base_network.cc index 4852bcb601d4..366f357f6262 100644 --- a/multimedia/ringrtc/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/multimedia/ringrtc/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,12 +1,12 @@ --- src/webrtc/src/rtc_base/network.cc.orig 2024-06-17 12:56:06 UTC +++ src/webrtc/src/rtc_base/network.cc -@@ -290,7 +290,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n +@@ -312,7 +312,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n } #endif +#if defined(WEBRTC_BSD) + // Treat all other network interface names as ethernet on BSD -+ return ADAPTER_TYPE_ETHERNET; ++ return webrtc::ADAPTER_TYPE_ETHERNET; +#else return ADAPTER_TYPE_UNKNOWN; +#endif |