From bed4b8644bfe00b8b351e097f036c8f79ce8c5c4 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Fri, 16 Dec 2022 10:05:43 +0200 Subject: [PATCH] ci: Include x264 in the gst build Part-of: --- .gitlab-ci.yml | 3 ++- ci/images_template.yml | 2 +- ci/install-gst.sh | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 628c238ff..d27a10ee9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -140,7 +140,8 @@ trigger: 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 + libjpeg-dev libwayland-dev python3-gi libavcodec-dev libavformat-dev + libavutil-dev libavfilter-dev libswscale-dev yasm libx264-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 74a3f3a9c..cda4f3ecc 100644 --- a/ci/images_template.yml +++ b/ci/images_template.yml @@ -1,4 +1,4 @@ variables: - GST_RS_IMG_TAG: '2022-12-16.0' + GST_RS_IMG_TAG: '2022-12-16.1' GST_RS_STABLE: '1.66.0' GST_RS_MSRV: '1.63.0' diff --git a/ci/install-gst.sh b/ci/install-gst.sh index b5371e357..b943a0d6f 100755 --- a/ci/install-gst.sh +++ b/ci/install-gst.sh @@ -9,9 +9,9 @@ git clone --depth 1 https://gitlab.freedesktop.org/gstreamer/gstreamer.git --bra 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" +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" -meson build -D prefix=/usr/local -D gpl=enabled -D examples=disabled -D gtk_doc=disabled -D introspection=disabled -D libav=disabled -D python=disabled -D ugly=disabled -D vaapi=disabled $PLUGINS +meson build -D prefix=/usr/local -D gpl=enabled -D ugly=enabled -D examples=disabled -D gtk_doc=disabled -D introspection=disabled -D libav=disabled -D python=disabled -D vaapi=disabled $PLUGINS ninja -C build ninja -C build install