From 5444b14a0e393f0b8612389d1765f6e57a3cfcbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Monnom?= Date: Wed, 29 Nov 2023 21:16:17 +0100 Subject: [PATCH 01/10] Update lib.rs --- webrtc-sys/build/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc-sys/build/src/lib.rs b/webrtc-sys/build/src/lib.rs index c32fa23e..482524f5 100644 --- a/webrtc-sys/build/src/lib.rs +++ b/webrtc-sys/build/src/lib.rs @@ -26,7 +26,7 @@ use regex::Regex; use reqwest::StatusCode; pub const SCRATH_PATH: &str = "livekit_webrtc"; -pub const WEBRTC_TAG: &str = "webrtc-d5afc4b"; +pub const WEBRTC_TAG: &str = "webrtc-d5afc4b-1"; pub const IGNORE_DEFINES: [&str; 2] = ["CR_CLANG_REVISION", "CR_XCODE_VERSION"]; pub fn target_os() -> String { From 49031b514b59e026469308f082bac0194078b4b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Monnom?= Date: Thu, 30 Nov 2023 14:29:00 +0100 Subject: [PATCH 02/10] test --- webrtc-sys/libwebrtc/build_windows.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc-sys/libwebrtc/build_windows.cmd b/webrtc-sys/libwebrtc/build_windows.cmd index 77bf8925..7f8924d5 100644 --- a/webrtc-sys/libwebrtc/build_windows.cmd +++ b/webrtc-sys/libwebrtc/build_windows.cmd @@ -65,7 +65,7 @@ if "!profile!" == "debug" ( rem generate ninja for release call gn.bat gen %OUTPUT_DIR% --root="src" ^ - --args="is_debug=!debug! is_clang=true target_cpu=\"!arch!\" use_custom_libcxx=false rtc_disable_check_msg=true rtc_include_tests=false rtc_build_examples=false rtc_build_tools=false is_component_build=false rtc_enable_protobuf=false rtc_use_h264=true ffmpeg_branding=\"Chrome\" symbol_level=0 enable_iterator_debugging=false" + --args="is_debug=!debug! is_clang=false target_cpu=\"!arch!\" use_custom_libcxx=false rtc_disable_check_msg=true rtc_include_tests=false rtc_build_examples=false rtc_build_tools=false is_component_build=false rtc_enable_protobuf=false rtc_use_h264=true ffmpeg_branding=\"Chrome\" symbol_level=0 enable_iterator_debugging=false" rem build ninja.exe -C %OUTPUT_DIR% :default From a6b1be4b5d3ea73fc8f1a081ceb33344e603cdc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Monnom?= Date: Thu, 30 Nov 2023 14:40:24 +0100 Subject: [PATCH 03/10] Update build_windows.cmd --- webrtc-sys/libwebrtc/build_windows.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc-sys/libwebrtc/build_windows.cmd b/webrtc-sys/libwebrtc/build_windows.cmd index 7f8924d5..bab99aaf 100644 --- a/webrtc-sys/libwebrtc/build_windows.cmd +++ b/webrtc-sys/libwebrtc/build_windows.cmd @@ -65,7 +65,7 @@ if "!profile!" == "debug" ( rem generate ninja for release call gn.bat gen %OUTPUT_DIR% --root="src" ^ - --args="is_debug=!debug! is_clang=false target_cpu=\"!arch!\" use_custom_libcxx=false rtc_disable_check_msg=true rtc_include_tests=false rtc_build_examples=false rtc_build_tools=false is_component_build=false rtc_enable_protobuf=false rtc_use_h264=true ffmpeg_branding=\"Chrome\" symbol_level=0 enable_iterator_debugging=false" + --args="is_debug=!debug! is_clang=false target_cpu=\"!arch!\" use_custom_libcxx=false rtc_disable_check_msg=true rtc_include_tests=false rtc_build_examples=false rtc_build_tools=false is_component_build=false rtc_enable_protobuf=false treat_warnings_as_errors=false rtc_use_h264=true ffmpeg_branding=\"Chrome\" symbol_level=0 enable_iterator_debugging=false" rem build ninja.exe -C %OUTPUT_DIR% :default From bc7a3bf38301d009c0699973b7182b02db0ce024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Monnom?= Date: Sat, 2 Dec 2023 23:30:53 +0100 Subject: [PATCH 04/10] Update build.rs --- webrtc-sys/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc-sys/build.rs b/webrtc-sys/build.rs index 9da4df32..0ab30673 100644 --- a/webrtc-sys/build.rs +++ b/webrtc-sys/build.rs @@ -125,7 +125,7 @@ fn main() { println!("cargo:rustc-link-lib=dylib=dwmapi"); println!("cargo:rustc-link-lib=dylib=shcore"); - builder.flag("/std:c++20").flag("/EHsc"); + builder.flag("/std:c++latest").flag("/EHsc").flag("/W"); } "linux" => { println!("cargo:rustc-link-lib=dylib=Xext"); From 3d68a23790cc423dd290b245712fa45a42d2b5be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Monnom?= Date: Sat, 2 Dec 2023 23:38:03 +0100 Subject: [PATCH 05/10] Update build.rs --- webrtc-sys/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc-sys/build.rs b/webrtc-sys/build.rs index 0ab30673..e5352710 100644 --- a/webrtc-sys/build.rs +++ b/webrtc-sys/build.rs @@ -125,7 +125,7 @@ fn main() { println!("cargo:rustc-link-lib=dylib=dwmapi"); println!("cargo:rustc-link-lib=dylib=shcore"); - builder.flag("/std:c++latest").flag("/EHsc").flag("/W"); + builder.flag("/std:c++latest").flag("/EHsc").flag("/W0"); } "linux" => { println!("cargo:rustc-link-lib=dylib=Xext"); From 415ef2fe433146858d8b9572a6084109597abb7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Monnom?= Date: Fri, 8 Dec 2023 10:47:57 +0100 Subject: [PATCH 06/10] Update ffi-builds.yml --- .github/workflows/ffi-builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ffi-builds.yml b/.github/workflows/ffi-builds.yml index 85f96d73..faea2147 100644 --- a/.github/workflows/ffi-builds.yml +++ b/.github/workflows/ffi-builds.yml @@ -29,12 +29,12 @@ jobs: fail-fast: false matrix: include: - - os: windows-latest + - os: windows-2019 platform: windows dylib: livekit_ffi.dll target: x86_64-pc-windows-msvc name: ffi-windows-x86_64 - - os: windows-latest + - os: windows-2019 platform: windows dylib: livekit_ffi.dll buildargs: --no-default-features --features "native-tls" # ring 0.16 is incompatible with win aarch64 From 4f7655518c450696710dfcfe5cbd2c040e80e695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Monnom?= Date: Fri, 8 Dec 2023 10:49:07 +0100 Subject: [PATCH 07/10] windows-2019 --- .github/workflows/builds.yml | 4 ++-- .github/workflows/tests.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index bb209984..786e2213 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -29,9 +29,9 @@ jobs: fail-fast: false matrix: include: - - os: windows-latest + - os: windows-2019 target: x86_64-pc-windows-msvc - - os: windows-latest + - os: windows-2019 target: aarch64-pc-windows-msvc #extraargs: --exclude livekit-api --exclude livekit-ffi # waiting for v0.17 of ring - os: macos-latest diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 15902cde..07f85c9a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,7 +31,7 @@ jobs: matrix: include: # Platform supports is limited for tests (no aarch64) - - os: windows-latest + - os: windows-2019 target: x86_64-pc-windows-msvc - os: macos-latest target: x86_64-apple-darwin From 561106033357ab4ebf85087d28b19af7a9c8d64a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Monnom?= Date: Fri, 8 Dec 2023 23:19:31 +0100 Subject: [PATCH 08/10] Update lib.rs --- webrtc-sys/build/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc-sys/build/src/lib.rs b/webrtc-sys/build/src/lib.rs index 482524f5..6b4cb1ee 100644 --- a/webrtc-sys/build/src/lib.rs +++ b/webrtc-sys/build/src/lib.rs @@ -26,7 +26,7 @@ use regex::Regex; use reqwest::StatusCode; pub const SCRATH_PATH: &str = "livekit_webrtc"; -pub const WEBRTC_TAG: &str = "webrtc-d5afc4b-1"; +pub const WEBRTC_TAG: &str = "webrtc-d5afc4b-2"; pub const IGNORE_DEFINES: [&str; 2] = ["CR_CLANG_REVISION", "CR_XCODE_VERSION"]; pub fn target_os() -> String { From 2fdc59cacc54b5dc69849ca5ca08f728b96c8fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Monnom?= Date: Fri, 8 Dec 2023 23:20:13 +0100 Subject: [PATCH 09/10] Update build.rs --- webrtc-sys/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc-sys/build.rs b/webrtc-sys/build.rs index e5352710..4532a26a 100644 --- a/webrtc-sys/build.rs +++ b/webrtc-sys/build.rs @@ -125,7 +125,7 @@ fn main() { println!("cargo:rustc-link-lib=dylib=dwmapi"); println!("cargo:rustc-link-lib=dylib=shcore"); - builder.flag("/std:c++latest").flag("/EHsc").flag("/W0"); + builder.flag("/std:c++20").flag("/EHsc") } "linux" => { println!("cargo:rustc-link-lib=dylib=Xext"); From fce2318e31a6293df5c514b3c822cc9f99557bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Monnom?= Date: Fri, 8 Dec 2023 23:20:34 +0100 Subject: [PATCH 10/10] Update build.rs --- webrtc-sys/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc-sys/build.rs b/webrtc-sys/build.rs index 4532a26a..9da4df32 100644 --- a/webrtc-sys/build.rs +++ b/webrtc-sys/build.rs @@ -125,7 +125,7 @@ fn main() { println!("cargo:rustc-link-lib=dylib=dwmapi"); println!("cargo:rustc-link-lib=dylib=shcore"); - builder.flag("/std:c++20").flag("/EHsc") + builder.flag("/std:c++20").flag("/EHsc"); } "linux" => { println!("cargo:rustc-link-lib=dylib=Xext");