ci: Force fallback for glib when building gstreamer

Also canonicalize some argument passing in install-gst.sh

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1506>
This commit is contained in:
Nirbheek Chauhan 2024-08-19 12:52:03 +05:30 committed by Backport Bot
parent 7e1ba0b40f
commit d01c3e65a5
3 changed files with 23 additions and 20 deletions

View file

@ -143,8 +143,9 @@ trigger:
libtiff-dev libpng-dev libjpeg-dev libepoxy-dev libsass-dev sassc libtiff-dev libpng-dev libjpeg-dev libepoxy-dev libsass-dev sassc
libcsound64-dev llvm clang nasm libsodium-dev libwebp-dev libcsound64-dev llvm clang nasm libsodium-dev libwebp-dev
libflac-dev libmysofa-dev libflac-dev libmysofa-dev
# glib in bookworm is too old, need 2.76 for gtk-4.14
FDO_DISTRIBUTION_EXEC: >- FDO_DISTRIBUTION_EXEC: >-
bash ci/install-gst.sh && bash ci/install-gst.sh --force-fallback-for=glib &&
bash ci/install-dav1d.sh && bash ci/install-dav1d.sh &&
pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates && pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates &&
pip3 install --break-system-packages tomli pip3 install --break-system-packages tomli

View file

@ -1,5 +1,5 @@
variables: variables:
GST_RS_IMG_TAG: "2024-08-19.0" GST_RS_IMG_TAG: "2024-08-19.1"
GST_RS_STABLE: "1.80.1" GST_RS_STABLE: "1.80.1"
GST_RS_MSRV: "1.71.1" GST_RS_MSRV: "1.71.1"
# The branch we use to build GStreamer from in the docker images # The branch we use to build GStreamer from in the docker images

View file

@ -16,13 +16,15 @@ git clone https://gitlab.freedesktop.org/gstreamer/gstreamer.git \
cd gstreamer cd gstreamer
# plugins required by tests # plugins required by tests
PLUGINS="-D gst-plugins-base:ogg=enabled \ PLUGINS=(
-D gst-plugins-base:vorbis=enabled \ -Dgst-plugins-base:ogg=enabled
-D gst-plugins-base:theora=enabled \ -Dgst-plugins-base:vorbis=enabled
-D gst-plugins-good:matroska=enabled \ -Dgst-plugins-base:theora=enabled
-D gst-plugins-good:vpx=enabled \ -Dgst-plugins-good:matroska=enabled
-D gst-plugins-bad:opus=enabled \ -Dgst-plugins-good:vpx=enabled
-D gst-plugins-ugly:x264=enabled" -Dgst-plugins-bad:opus=enabled
-Dgst-plugins-ugly:x264=enabled
)
meson setup build \ meson setup build \
-Dprefix=/usr/local \ -Dprefix=/usr/local \
@ -35,7 +37,7 @@ meson setup build \
-Dlibav=disabled \ -Dlibav=disabled \
-Dpython=disabled \ -Dpython=disabled \
-Dvaapi=disabled \ -Dvaapi=disabled \
$PLUGINS "${PLUGINS[@]}" "$@"
meson compile -C build meson compile -C build
meson install -C build meson install -C build
ldconfig ldconfig