Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# We need lld to link libwebrtc.a successfully on aarch64-linux
[target.aarch64-unknown-linux-gnu]
rustflags = ["-C", "link-arg=-fuse-ld=lld"]

[target.x86_64-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static"]

Expand All @@ -14,4 +18,4 @@ rustflags = ["-C", "link-args=-ObjC"]
rustflags = ["-C", "link-args=-ObjC"]

[target.aarch64-apple-ios-sim]
rustflags = ["-C", "link-args=-ObjC"]
rustflags = ["-C", "link-args=-ObjC"]
2 changes: 2 additions & 0 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ jobs:
sudo apt update -y
# libasound2-dev is needed for local_audio example
# libdrm, libgbm, libxfixes, libxdamage, libxrandr, libxcomposite and libglib are needed for DesktopCapturer
# lld is needed on aarch64 because GNU ld cannot link libwebrtc.a for some reason
sudo apt install -y \
lld \
libasound2-dev \
libssl-dev \
libx11-dev \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ffi-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ jobs:
docker run --rm -v $PWD:/workspace -w /workspace ${{ matrix.build_image }} bash -c "\
uname -a; \
export PATH=/root/.cargo/bin:\$PATH; \
yum install llvm llvm-libs -y; \
yum install llvm llvm-libs lld -y; \
yum install clang -y; \
yum install protobuf-compiler -y; \
yum groupinstall 'Development Tools' -y; \
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/webrtc-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,30 +112,6 @@ jobs:
run: |
pip3 install setuptools # pkg_resources is sometimes not found?

- name: Add GCC PPA and install GCC 14
if: ${{ matrix.target.os == 'ubuntu-latest' }}
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
sudo apt update
sudo apt install gcc-14 g++-14 g++-14-aarch64-linux-gnu -y

- name: Verify GCC 14 installation
if: ${{ matrix.target.os == 'ubuntu-latest' }}
run: |
gcc-14 --version
g++-14 --version
aarch64-linux-gnu-g++-14 --version

- name: Set GCC 14 as default (optional)
if: ${{ matrix.target.os == 'ubuntu-latest' }}
run: |
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 140 --slave /usr/bin/g++ g++ /usr/bin/g++-14
sudo update-alternatives --config gcc
gcc --version
sudo update-alternatives --install /usr/bin/aarch64-linux-gnu-gcc aarch64-linux-gnu-gcc /usr/bin/aarch64-linux-gnu-gcc-14 140 --slave /usr/bin/aarch64-linux-gnu-g++ aarch64-linux-gnu-g++ /usr/bin/aarch64-linux-gnu-g++-14
sudo update-alternatives --config aarch64-linux-gnu-gcc
aarch64-linux-gnu-gcc --version

- name: Install linux dependencies
if: ${{ matrix.target.os == 'ubuntu-latest' }}
run: |
Expand Down
147 changes: 77 additions & 70 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/agent_dispatch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish = false

[dependencies]
tokio = { workspace = true, features = ["full", "parking_lot"] }
livekit-api = { workspace = true, features = ["rustls-tls-native-roots"] }
livekit-api = { workspace = true, features = ["webhooks", "rustls-tls-native-roots"] }
env_logger = { workspace = true }
log = { workspace = true }
livekit-protocol = { workspace = true }
Expand Down
Loading