diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01db29853..9e89648cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -143,8 +143,9 @@ trigger: libtiff-dev libpng-dev libjpeg-dev libepoxy-dev libsass-dev sassc libcsound64-dev llvm clang nasm libsodium-dev libwebp-dev libflac-dev libmysofa-dev + # glib in bookworm is too old, need 2.76 for gtk-4.14 FDO_DISTRIBUTION_EXEC: >- - bash ci/install-gst.sh && + bash ci/install-gst.sh --force-fallback-for=glib && bash ci/install-dav1d.sh && pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates && pip3 install --break-system-packages tomli diff --git a/ci/images_template.yml b/ci/images_template.yml index ab5b6d1f7..fa19be9bf 100644 --- a/ci/images_template.yml +++ b/ci/images_template.yml @@ -1,5 +1,5 @@ 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_MSRV: "1.71.1" # The branch we use to build GStreamer from in the docker images diff --git a/ci/install-gst.sh b/ci/install-gst.sh index 941de059a..bc109fc63 100755 --- a/ci/install-gst.sh +++ b/ci/install-gst.sh @@ -16,26 +16,28 @@ git clone https://gitlab.freedesktop.org/gstreamer/gstreamer.git \ cd gstreamer # plugins required by tests -PLUGINS="-D gst-plugins-base:ogg=enabled \ - -D gst-plugins-base:vorbis=enabled \ - -D gst-plugins-base:theora=enabled \ - -D gst-plugins-good:matroska=enabled \ - -D gst-plugins-good:vpx=enabled \ - -D gst-plugins-bad:opus=enabled \ - -D gst-plugins-ugly:x264=enabled" +PLUGINS=( + -Dgst-plugins-base:ogg=enabled + -Dgst-plugins-base:vorbis=enabled + -Dgst-plugins-base:theora=enabled + -Dgst-plugins-good:matroska=enabled + -Dgst-plugins-good:vpx=enabled + -Dgst-plugins-bad:opus=enabled + -Dgst-plugins-ugly:x264=enabled +) meson setup build \ - -D prefix=/usr/local \ - -D gpl=enabled \ - -D ugly=enabled \ - -D gtk=enabled \ - -D examples=disabled \ - -D gtk_doc=disabled \ - -D introspection=disabled \ - -D libav=disabled \ - -D python=disabled \ - -D vaapi=disabled \ - $PLUGINS + -Dprefix=/usr/local \ + -Dgpl=enabled \ + -Dugly=enabled \ + -Dgtk=enabled \ + -Dexamples=disabled \ + -Dgtk_doc=disabled \ + -Dintrospection=disabled \ + -Dlibav=disabled \ + -Dpython=disabled \ + -Dvaapi=disabled \ + "${PLUGINS[@]}" "$@" meson compile -C build meson install -C build ldconfig