From 92327be3b1494f268589d6bbdf48b1740bc8147d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 17 Jul 2023 10:29:20 +0300 Subject: [PATCH] ci: Add various missing dependencies to the Linux image Part-of: --- .gitlab-ci.yml | 23 +++++++++++++++-------- ci/images_template.yml | 2 +- ci/install-gtk4.sh | 3 +++ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 56775accf..ed8c33e20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,14 +134,21 @@ trigger: stage: container-base variables: FDO_DISTRIBUTION_PACKAGES: >- - build-essential curl python3-setuptools liborc-0.4-dev libglib2.0-dev - libxml2-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 python3-gi libavcodec-dev libavformat-dev - libavutil-dev libavfilter-dev libswscale-dev yasm libx264-dev + build-essential curl python3-setuptools liborc-0.4-dev libglib2.0-dev + libxml2-dev libdrm-dev libegl1-mesa-dev libgl1-mesa-dev libgbm-dev + libgles2-mesa-dev libgl1-mesa-dri libegl-dev 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 wayland-protocols python3-gi libavcodec-dev + libavformat-dev libavutil-dev libavfilter-dev libswscale-dev yasm + libx264-dev libfontconfig-dev libfreetype-dev libxkbcommon-dev libxi-dev + libxcb-render0-dev libxcb-shm0-dev libxcb1-dev libxext-dev + libxrender-dev libxrandr-dev libxcursor-dev libxdamage-dev libxfixes-dev + libxinerama-dev libgudev-1.0-dev libpango1.0-dev libcairo2-dev + libjson-glib-dev libgdk-pixbuf-2.0-dev libtiff-dev libpng-dev + libjpeg-dev libepoxy-dev libsass-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 fc964f351..c66c746b5 100644 --- a/ci/images_template.yml +++ b/ci/images_template.yml @@ -1,4 +1,4 @@ variables: - GST_RS_IMG_TAG: "2023-07-13.0" + GST_RS_IMG_TAG: "2023-07-17.0" GST_RS_STABLE: "1.71.0" GST_RS_MSRV: "1.66.0" diff --git a/ci/install-gtk4.sh b/ci/install-gtk4.sh index cc711734f..a4377ec49 100644 --- a/ci/install-gtk4.sh +++ b/ci/install-gtk4.sh @@ -9,6 +9,9 @@ cd gtk meson setup build \ -D prefix=/usr/local \ + -Ddemos=false \ + -Dbuild-testsuite=false \ + -Dbuild-examples=false \ -Dbuild-tests=false \ -Dwayland-protocols:tests=false meson compile -C build