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

Jump to bottom

Fail if compiling against dav1d newer than 1.2.1 #82

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Fail if compiling against dav1d newer than 1.2.1 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d447237
Build dav1d 1.2.1 when using the bundled version and on the CI
sdroege Oct 24, 2023
5ecf2f0
Fail if compiling against dav1d newer than 1.2.1
sdroege Oct 24, 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/dav1d.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
DAV1D_DIR: dav1d_dir
LIB_PATH: lib/x86_64-linux-gnu
run: |
git clone --branch 1.1.0 --depth 1 https://code.videolan.org/videolan/dav1d.git
git clone --branch 1.2.1 --depth 1 https://code.videolan.org/videolan/dav1d.git
cd dav1d
meson build -Dprefix=$HOME/$DAV1D_DIR -Denable_tools=false -Denable_examples=false --buildtype release
ninja -C build
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:

- name: Build dav1d
run: |
git clone --branch 1.1.0 --depth 1 https://code.videolan.org/videolan/dav1d.git
git clone --branch 1.2.1 --depth 1 https://code.videolan.org/videolan/dav1d.git
cd dav1d
meson build -Dprefix=C:\build -Denable_tools=false -Denable_examples=false --buildtype release
ninja -C build
Expand Down
1 change: 1 addition & 0 deletions dav1d-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ build = "build.rs"

[build-dependencies]
system-deps = "6.0"
pkg-config = "0.3"

[dependencies]
libc = "0.2"
Expand Down
7 changes: 6 additions & 1 deletion dav1d-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mod build {
use std::process::{Command, Stdio};

const REPO: &str = "https://code.videolan.org/videolan/dav1d.git";
const TAG: &str = "1.1.0";
const TAG: &str = "1.2.1";

macro_rules! runner {
($cmd:expr, $($arg:expr),*) => {
Expand Down Expand Up @@ -76,4 +76,9 @@ fn main() {
.add_build_internal("dav1d", build::build_from_src)
.probe()
.unwrap();

pkg_config::Config::new()
.range_version("1.0.0"..="1.2.1")
.probe("dav1d")
.unwrap();
}