From 77d2a083b5dfba888df073dd007f776288d5e560 Mon Sep 17 00:00:00 2001
From: Kornel <kornel@geekhood.net>
Date: Sun, 1 Oct 2023 00:54:57 +0100
Subject: [PATCH] Use the other libdav1d bindings to build from source

---
 .github/workflows/rav1e.yml |  8 ++++----
 Cargo.lock                  | 21 ++++++++++-----------
 Cargo.toml                  |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/rav1e.yml b/.github/workflows/rav1e.yml
index ff5ea5713d..ab43661840 100644
--- a/.github/workflows/rav1e.yml
+++ b/.github/workflows/rav1e.yml
@@ -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:
@@ -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
@@ -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
@@ -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: /
diff --git a/Cargo.lock b/Cargo.lock
index bb8b87bc6e..5300f749d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -555,16 +555,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "dav1d-sys"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "615542bb14c18b795f46aba92258902168218d714090f5fff47e68c9a352ea2d"
-dependencies = [
- "libc",
- "system-deps",
-]
-
 [[package]]
 name = "diff"
 version = "0.1.13"
@@ -878,6 +868,15 @@ version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
+[[package]]
+name = "libdav1d-sys"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c21d55fe0bdbb33a65c97ce3351366a1b9edb8e5677bcff64114c4a9ad184b7c"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "libfuzzer-sys"
 version = "0.4.6"
@@ -1298,13 +1297,13 @@ dependencies = [
  "console",
  "criterion",
  "crossbeam",
- "dav1d-sys",
  "fern",
  "image",
  "interpolate_name",
  "itertools 0.11.0",
  "ivf",
  "libc",
+ "libdav1d-sys",
  "libfuzzer-sys",
  "log",
  "maybe-rayon",
diff --git a/Cargo.toml b/Cargo.toml
index d3fb81a163..9a1aa5fce1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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 }