diff options
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | ci/install-dav1d.sh | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc68c8a0f..d95b0a6da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: .debian:10: variables: FDO_DISTRIBUTION_VERSION: 10 - FDO_DISTRIBUTION_TAG: '$RUST_VERSION-${GST_RS_IMG_TAG}_2020-04-27.0' + FDO_DISTRIBUTION_TAG: '$RUST_VERSION-${GST_RS_IMG_TAG}_2020-04-28.0' # Only stuff inside the repo directory can be cached # Override the CARGO_HOME variable to force its location CARGO_HOME: "${CI_PROJECT_DIR}/.cargo_home" @@ -49,6 +49,7 @@ stages: stage: prep variables: FDO_DISTRIBUTION_PACKAGES: "libcsound64-dev llvm clang nasm libsodium-dev" + FDO_DISTRIBUTION_EXEC: 'bash ci/install-dav1d.sh' rules: - if: '$UPDATE_IMG == null' @@ -98,11 +99,6 @@ update-nightly: - "${CARGO_HOME}" variables: SODIUM_USE_PKG_CONFIG: "true" - # The build feature is required for the dav1d plugin for building and - # statically linking the C dav1d library into the dav1d-rs bindings. - # FIXME: The feature name should explicitly mention the dav1d plugin but - # Cargo currently doesn't support passthrough for that scenario. - RUSTFLAGS: "--cfg feature=\"build\"" after_script: - rm -rf target diff --git a/ci/install-dav1d.sh b/ci/install-dav1d.sh new file mode 100644 index 000000000..be806bc4d --- /dev/null +++ b/ci/install-dav1d.sh @@ -0,0 +1,8 @@ +RELEASE=0.6.0 + +git clone https://code.videolan.org/videolan/dav1d.git --branch $RELEASE +cd dav1d +meson build -D prefix=/usr/local +ninja -C build +ninja -C build install +cd .. |