Skip to content

Commit

Permalink
Use the other libdav1d bindings to build from source
Browse files Browse the repository at this point in the history
  • Loading branch information
kornelski authored and lu-zero committed Oct 9, 2023
1 parent 5a1c725 commit 77d2a08
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/rav1e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
run: |
sudo sed -i 's/jammy/lunar/g' /etc/apt/sources.list
sudo apt update
sudo apt install nasm libaom-dev libdav1d-dev
sudo apt install nasm libaom-dev meson ninja-build nasm
- name: Install cargo-c
if: matrix.conf == 'cargo-c'
env:
Expand All @@ -134,7 +134,7 @@ jobs:
if: matrix.conf == 'grcov-codecov'
run: |
rustup component add llvm-tools-preview
- name: Install aarch64 toolchain, qemu-user and libdav1d-dev:arm64
- name: Install aarch64 toolchain, qemu-user and libdav1d deps
if: matrix.conf == 'dav1d-tests-arm64'
env:
LINK: http://ports.ubuntu.com/ubuntu-ports/pool
Expand All @@ -146,7 +146,7 @@ jobs:
} | sudo tee /etc/apt/sources.list
sudo dpkg --add-architecture arm64
sudo apt update
sudo apt install qemu-user gcc-aarch64-linux-gnu libdav1d-dev:arm64
sudo apt install qemu-user gcc-aarch64-linux-gnu meson ninja-build nasm
- name: Generate Cargo.version for cache key
run: |
cargo --version > Cargo.version
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
- name: Run dav1d tests (arm64)
if: matrix.conf == 'dav1d-tests-arm64'
env:
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER: qemu-aarch64
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER: qemu-aarch64 -L /usr/aarch64-linux-gnu
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS: -Clinker=aarch64-linux-gnu-gcc
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
PKG_CONFIG_SYSROOT_DIR: /
Expand Down
21 changes: 10 additions & 11 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 Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ num-derive = "0.4"
paste = "1.0"
noop_proc_macro = "0.3.0"
serde = { version = "1.0", features = ["derive"], optional = true }
dav1d-sys = { version = "0.7.1", optional = true }
dav1d-sys = { version = "0.5.3", package = "libdav1d-sys", optional = true }
aom-sys = { version = "0.3.2", optional = true }
scan_fmt = { version = "0.2.6", optional = true, default-features = false }
ivf = { version = "0.1", path = "ivf/", optional = true }
Expand Down

0 comments on commit 77d2a08

Please sign in to comment.