diff --git a/VERSION b/VERSION index c1f0dff3..d3f6bbff 100644 --- a/VERSION +++ b/VERSION @@ -2,10 +2,10 @@ CCACHE_VERSION=4.6 # WebRTC doesn't have its own versioning, so we use Chromium versions: # https://chromiumdash.appspot.com/releases -WEBRTC_VERSION=105.0.5195.125 +WEBRTC_VERSION=106.0.5249.91 # Look for the concrete revision for WebRTC in: # https://chromium.googlesource.com/chromium/src/+/refs/tags//DEPS -WEBRTC_COMMIT=42be4ae879ed6870dfc5ca554d11062b536da717 +WEBRTC_COMMIT=17f085c1d7f6f0cad9e6041aa55a22594925eca5 PACKAGE_NAMES= \ linux-arm64 \ diff --git a/build.windows.ps1 b/build.windows.ps1 index 8ccf3314..a2f02b56 100644 --- a/build.windows.ps1 +++ b/build.windows.ps1 @@ -118,7 +118,7 @@ Exec { git apply --ignore-space-change -v $PATCH_DIR\add_licenses.patch } Exec { git apply --ignore-space-change -v $PATCH_DIR\webrtc_voice_engine.patch } Exec { git apply --ignore-space-change -v $PATCH_DIR\win_dynamic_crt.patch } Exec { git apply --ignore-space-change -v $PATCH_DIR\windows_fix_towupper.patch } -Exec { git apply --ignore-space-change -v $PATCH_DIR\windows_fix_type_traits.patch } +Exec { git apply --ignore-space-change -v $PATCH_DIR\windows_fix_abseil.patch } Pop-Location Get-PSDrive diff --git a/patch/windows_fix_abseil.patch b/patch/windows_fix_abseil.patch new file mode 100644 index 00000000..6545f35a --- /dev/null +++ b/patch/windows_fix_abseil.patch @@ -0,0 +1,15 @@ +diff --git a/src/third_party/abseil-cpp/absl/types/internal/optional.h b/src/third_party/abseil-cpp/absl/types/internal/optional.h +index 6ed0c669..681acb7a 100644 +--- a/src/third_party/abseil-cpp/absl/types/internal/optional.h ++++ b/src/third_party/abseil-cpp/absl/types/internal/optional.h +@@ -179,8 +179,8 @@ class optional_data_base : public optional_data_dtor_base { + // Also, we should be checking is_trivially_copyable here, which is not + // supported now, so we use is_trivially_* traits instead. + template ::value&& +- absl::is_trivially_copy_assignable::value&& ++ std::is_trivially_copy_assignable::type>::value&& std::is_trivially_destructible::value> + class optional_data; + diff --git a/patch/windows_fix_type_traits.patch b/patch/windows_fix_type_traits.patch deleted file mode 100644 index 09891110..00000000 --- a/patch/windows_fix_type_traits.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/third_party/abseil-cpp/absl/meta/type_traits.h b/src/third_party/abseil-cpp/absl/meta/type_traits.h -index d886cb30a81..b4734383e5e 100644 ---- a/src/third_party/abseil-cpp/absl/meta/type_traits.h -+++ b/src/third_party/abseil-cpp/absl/meta/type_traits.h -@@ -490,9 +490,13 @@ struct is_trivially_move_assignable - // `is_trivially_assignable`. - template - struct is_trivially_copy_assignable -+#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE -+ : std::is_trivially_copy_assignable { -+#else - : std::integral_constant< - bool, __has_trivial_assign(typename std::remove_reference::type) && - absl::is_copy_assignable::value> { -+#endif - #ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE - private: - static constexpr bool compliant =