diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-08-30 22:59:17 +0300 |
|---|---|---|
| committer | Sebastian Dröge <slomo@coaxion.net> | 2022-09-03 01:00:57 +0300 |
| commit | 4ac60165a83933452965d3ade3adbb6917d2f553 (patch) | |
| tree | 825d4531ee16d402c26aba1988fe82efd18f1504 /.gitlab-ci.yml | |
| parent | ad48d5e8f2444236305b604d0b39db9e9a8f5d94 (diff) | |
meson: Define gst_plugins with list of dependencies
This is needed to link gst-full with Rust plugins. The script requires
either python11 or the tomli module.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 428e3b921..751a829d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ stages: .debian:11-stable: extends: .debian:11 variables: - FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-${GST_RS_IMG_TAG}_2022-07-19.0' + FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-${GST_RS_IMG_TAG}_2022-08-31.1' FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/bullseye-slim:$GST_RS_STABLE-$GST_RS_IMG_TAG" .debian:11-msrv: @@ -63,11 +63,12 @@ stages: - .fdo.container-build@debian stage: prep variables: - FDO_DISTRIBUTION_PACKAGES: "libcsound64-dev llvm clang nasm libsodium-dev" + FDO_DISTRIBUTION_PACKAGES: "libcsound64-dev llvm clang nasm libsodium-dev libwebp-dev python3-pip" FDO_DISTRIBUTION_EXEC: >- bash ci/install-dav1d.sh && apt clean && - bash ./ci/install-rust-ext.sh + bash ./ci/install-rust-ext.sh && + pip install tomli rules: - if: '$UPDATE_IMG == null' @@ -216,6 +217,22 @@ gst-build: - if: $CI_PIPELINE_SOURCE == "merge_request_event" when: 'manual' allow_failure: true + variables: + MESON_ARGS: > + -Domx=disabled + -Dpython=disabled + -Dlibav=disabled + -Dlibnice=disabled + -Dugly=disabled + -Dbad=disabled + -Ddevtools=disabled + -Dges=disabled + -Drtsp_server=disabled + -Dvaapi=disabled + -Dsharp=disabled + -Dgst-examples=disabled + -Drs=enabled + -Dgst-plugins-rs:sodium=system script: - P=$(pwd) - cd .. @@ -223,13 +240,18 @@ gst-build: - git clone --depth 1 https://gitlab.freedesktop.org/gstreamer/gstreamer.git --branch main - cd gstreamer - ln -s $P subprojects/gst-plugins-rs - - meson build -Domx=disabled -Dpython=disabled -Dlibav=disabled -Dlibnice=disabled -Dugly=disabled -Dbad=disabled -Ddevtools=disabled -Dges=disabled -Drtsp_server=disabled -Dvaapi=disabled -Dsharp=disabled -Dgst-examples=disabled -Drs=enabled -Dgst-plugins-rs:sodium=system + - meson build $MESON_ARGS - ninja -C build + # Check static Rust plugins can be linked into gst-full + - meson build-gst-full --default-library=static $MESON_ARGS + - ninja -C build-gst-full + - meson devenv -C build-gst-full gst-inspect-1.0 rsaudiofx artifacts: expire_in: '7 days' when: always paths: - 'build/meson-logs/' + - 'build-gst-full/meson-logs/' rustfmt: extends: .img-stable |