diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13c25c6d3..2f93e2073 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,7 +101,7 @@ stages: - .fdo.container-build@debian stage: container-base variables: - FDO_DISTRIBUTION_PACKAGES: "build-essential curl python3-setuptools liborc-0.4-dev libglib2.0-dev libxml2-dev libgtk-3-dev libegl1-mesa libgles2-mesa libgl1-mesa-dri libgl1-mesa-glx libwayland-egl1-mesa xz-utils libssl-dev git wget ca-certificates ninja-build python3-pip flex bison libglib2.0-dev libx11-dev libx11-xcb-dev libsoup2.4-dev libvorbis-dev libogg-dev libtheora-dev libmatroska-dev libvpx-dev libopus-dev libgraphene-1.0-dev" + FDO_DISTRIBUTION_PACKAGES: "build-essential curl python3-setuptools liborc-0.4-dev libglib2.0-dev libxml2-dev libgtk-3-dev libegl1-mesa libgles2-mesa libgl1-mesa-dri libgl1-mesa-glx libwayland-egl1-mesa xz-utils libssl-dev git wget ca-certificates ninja-build python3-pip flex bison libglib2.0-dev libx11-dev libx11-xcb-dev libsoup2.4-dev libvorbis-dev libogg-dev libtheora-dev libmatroska-dev libvpx-dev libopus-dev libgraphene-1.0-dev libjpeg-dev libwayland-dev" FDO_DISTRIBUTION_EXEC: >- bash ci/install-gst.sh && bash ci/install-gtk4.sh && diff --git a/ci/images_template.yml b/ci/images_template.yml index 854efeb83..b60874015 100644 --- a/ci/images_template.yml +++ b/ci/images_template.yml @@ -1,4 +1,4 @@ variables: - GST_RS_IMG_TAG: '2022-02-24.0' + GST_RS_IMG_TAG: '2022-03-15.0' GST_RS_STABLE: '1.59.0' GST_RS_MSRV: '1.57.0' diff --git a/ci/install-gst.sh b/ci/install-gst.sh index b80085cf7..41623a01f 100755 --- a/ci/install-gst.sh +++ b/ci/install-gst.sh @@ -1,6 +1,6 @@ set -e -pip3 install meson==0.60.3 +pip3 install meson==0.61.3 # gstreamer-rs already has a 'gstreamer' directory so don't clone there pushd . diff --git a/ci/install-gtk4.sh b/ci/install-gtk4.sh index 0fee20d70..c1f9e0f17 100644 --- a/ci/install-gtk4.sh +++ b/ci/install-gtk4.sh @@ -1,6 +1,6 @@ set -eux -BRANCH=gtk-4-4 +BRANCH=gtk-4-6 git clone https://gitlab.gnome.org/GNOME/gtk.git --branch $BRANCH --depth=1 cd gtk