From 7def5fffae47f407d31b63257e8c38f404a1fbeb Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven Date: Wed, 13 Jan 2021 15:15:03 +0100 Subject: [PATCH 1/5] Update rav1e.cmd and docker/build.sh to use rav1e 0.4 Switches both rav1e.cmd and docker/build.sh to update from the rav1e 0.3 maintenance branch to the 0.4 maintenance branch --- CHANGELOG.md | 1 + ext/rav1e.cmd | 2 +- tests/docker/build.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8edb77e6b5..370ca3fe71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed * Update dav1d.cmd to point at the 0.8.1 tag +* Update rav1e.cmd to point at the 0.4 maintenance branch ## [0.8.4] - 2020-11-23 diff --git a/ext/rav1e.cmd b/ext/rav1e.cmd index 9956b0b14d..30c30e0d30 100755 --- a/ext/rav1e.cmd +++ b/ext/rav1e.cmd @@ -11,7 +11,7 @@ : # Also, the error that "The target windows-msvc is not supported yet" can safely be ignored provided that rav1e/target/release : # contains rav1e.h and rav1e.lib. -git clone -b 0.3 --depth 1 https://github.com/xiph/rav1e.git +git clone -b 0.4 --depth 1 https://github.com/xiph/rav1e.git cd rav1e cargo install cbindgen diff --git a/tests/docker/build.sh b/tests/docker/build.sh index c52cf35d49..62e682e2b0 100644 --- a/tests/docker/build.sh +++ b/tests/docker/build.sh @@ -63,7 +63,7 @@ ninja install # rav1e cd -git clone -b 0.3 --depth 1 https://github.com/xiph/rav1e.git +git clone -b 0.4 --depth 1 https://github.com/xiph/rav1e.git cd rav1e cargo cinstall --prefix=/usr --release From 9860c73c0c7d9e880758d7342da0a92ba4a5ba66 Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven Date: Sat, 16 Jan 2021 14:53:10 +0100 Subject: [PATCH 2/5] rav1e.cmd: Use new install method for C-API rav1e switched from cbindgen to cargo-c some time ago. With 0.4 the old method broke, so this commit replaces it with the new one. See: https://github.com/xiph/rav1e#building-the-c-api --- ext/rav1e.cmd | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ext/rav1e.cmd b/ext/rav1e.cmd index 30c30e0d30..56dc2fb24b 100755 --- a/ext/rav1e.cmd +++ b/ext/rav1e.cmd @@ -14,8 +14,6 @@ git clone -b 0.4 --depth 1 https://github.com/xiph/rav1e.git cd rav1e -cargo install cbindgen -cbindgen -c cbindgen.toml -l C -o target/release/include/rav1e/rav1e.h --crate rav1e . - -cargo build --lib --release --features capi +cargo install cargo-c +cargo cinstall --release cd .. From 2d69ca409654b6bdfb737a6bf246647ab754be69 Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven Date: Sat, 16 Jan 2021 15:34:42 +0100 Subject: [PATCH 3/5] CI: Install build-essential with apt --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4d8c9ff80..1c547ac1d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: - name: Install dependencies run: | DEBIAN_FRONTEND=noninteractive sudo apt-get update || true - DEBIAN_FRONTEND=noninteractive sudo apt-get install -y ninja-build gcc-10 g++-10 + DEBIAN_FRONTEND=noninteractive sudo apt-get install -y ninja-build gcc-10 g++-10 build-essential pip install --upgrade pip pip install setuptools pip install meson From 10bcadbf25359eef1e06bc252b5f4c820463a491 Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven Date: Mon, 18 Jan 2021 13:02:42 +0100 Subject: [PATCH 4/5] CMakeList: Fix rav1e path --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6df511575..81e148540d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -309,7 +309,7 @@ if(AVIF_CODEC_RAV1E) endif() set(AVIF_CODEC_INCLUDES ${AVIF_CODEC_INCLUDES} - "${CMAKE_CURRENT_SOURCE_DIR}/ext/rav1e/target/release/include" + "${CMAKE_CURRENT_SOURCE_DIR}/ext/rav1e/target/release" ) set(AVIF_CODEC_LIBRARIES ${AVIF_CODEC_LIBRARIES} ${LIB_FILENAME}) else() From 7849aae88f17adb19b2611b85897f944131d4998 Mon Sep 17 00:00:00 2001 From: Ewout ter Hoeven Date: Mon, 18 Jan 2021 13:04:13 +0100 Subject: [PATCH 5/5] fix include rav1e.h path --- src/codec_rav1e.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/codec_rav1e.c b/src/codec_rav1e.c index c672b8f762..654d7e8fa8 100644 --- a/src/codec_rav1e.c +++ b/src/codec_rav1e.c @@ -3,7 +3,7 @@ #include "avif/internal.h" -#include "rav1e/rav1e.h" +#include "rav1e.h" #include