From d245056e7b87ad513638aff075297e755bb8c339 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Tue, 11 Jan 2022 18:03:22 +0200
Subject: [PATCH] ci: add gtk4 to the image

This is a prerequisite to porting the examples to gtk4
---
 .gitlab-ci.yml         |  7 +++++--
 ci/images_template.yml |  2 +-
 ci/install-gtk4.sh     | 10 ++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 ci/install-gtk4.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54a5912de..9040fcb71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,8 +100,11 @@ 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"
-    FDO_DISTRIBUTION_EXEC: 'bash ci/install-gst.sh && pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates'
+    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_EXEC: >-
+      bash ci/install-gst.sh &&
+      bash ci/install-gtk4.sh &&
+      pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
 
 .build-final-image:
   extends:
diff --git a/ci/images_template.yml b/ci/images_template.yml
index fd25869b1..4c2d3cfcc 100644
--- a/ci/images_template.yml
+++ b/ci/images_template.yml
@@ -1,4 +1,4 @@
 variables:
-  GST_RS_IMG_TAG: '2021-12-02.0'
+  GST_RS_IMG_TAG: '2022-01-11.0'
   GST_RS_STABLE: '1.57.0'
   GST_RS_MSRV: '1.56.0'
diff --git a/ci/install-gtk4.sh b/ci/install-gtk4.sh
new file mode 100644
index 000000000..0fee20d70
--- /dev/null
+++ b/ci/install-gtk4.sh
@@ -0,0 +1,10 @@
+set -eux
+
+BRANCH=gtk-4-4
+
+git clone https://gitlab.gnome.org/GNOME/gtk.git --branch $BRANCH --depth=1
+cd gtk
+meson build -D prefix=/usr/local
+ninja -C build
+ninja -C build install
+cd ..