Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update webrtc to webrtc-d5afc4b-2 #255

Merged
merged 13 commits into from
Dec 8, 2023
Merged

update webrtc to webrtc-d5afc4b-2 #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5444b14
Update lib.rs
theomonnom Nov 29, 2023
49031b5
test
theomonnom Nov 30, 2023
a6b1be4
Update build_windows.cmd
theomonnom Nov 30, 2023
bc7a3bf
Update build.rs
theomonnom Dec 2, 2023
3d68a23
Update build.rs
theomonnom Dec 2, 2023
415ef2f
Update ffi-builds.yml
theomonnom Dec 8, 2023
4d67021
Merge branch 'main' into theo/update-webrtc-1
theomonnom Dec 8, 2023
4f76555
windows-2019
theomonnom Dec 8, 2023
0510777
Merge branch 'theo/update-webrtc-1' of https://github.com/livekit/rus…
theomonnom Dec 8, 2023
5611060
Update lib.rs
theomonnom Dec 8, 2023
2fdc59c
Update build.rs
theomonnom Dec 8, 2023
fce2318
Update build.rs
theomonnom Dec 8, 2023
90083f8
Merge branch 'main' into theo/update-webrtc-1
theomonnom Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/ffi-builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ jobs:
fail-fast: false
matrix:
include:
#- os: windows-latest
# platform: windows
# dylib: livekit_ffi.dll
# target: x86_64-pc-windows-msvc
# name: ffi-windows-x86_64
#- os: windows-latest
# platform: windows
# dylib: livekit_ffi.dll
# buildargs: --no-default-features --features "native-tls" # ring 0.16 is incompatible with win aarch64
# target: aarch64-pc-windows-msvc
# name: ffi-windows-arm64
- os: windows-2019
platform: windows
dylib: livekit_ffi.dll
target: x86_64-pc-windows-msvc
name: ffi-windows-x86_64
- os: windows-2019
platform: windows
dylib: livekit_ffi.dll
buildargs: --no-default-features --features "native-tls" # ring 0.16 is incompatible with win aarch64
target: aarch64-pc-windows-msvc
name: ffi-windows-arm64
- os: macos-latest
platform: macos
dylib: liblivekit_ffi.dylib
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion webrtc-sys/build/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-2";
pub const IGNORE_DEFINES: [&str; 2] = ["CR_CLANG_REVISION", "CR_XCODE_VERSION"];

pub fn target_os() -> String {
Expand Down
2 changes: 1 addition & 1 deletion webrtc-sys/libwebrtc/build_windows.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_libvpx_build_vp9=true enable_libaom=true 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=true target_cpu=\"!arch!\" use_custom_libcxx=false rtc_libvpx_build_vp9=true enable_libaom=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
Expand Down
Loading