From ccb9e3a7f82ce626883633ea00e84554d73c4aaa Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Thu, 22 Sep 2022 18:19:18 +0300
Subject: [PATCH] ci: Update gtk to 4.8.1

And follow release tags instead of branches.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1110>
---
 ci/images_template.yml            | 2 +-
 ci/install-gtk4.sh                | 7 +++++--
 ci/windows-docker/install_gtk.ps1 | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ci/images_template.yml b/ci/images_template.yml
index d6592cee2..d24e1dcda 100644
--- a/ci/images_template.yml
+++ b/ci/images_template.yml
@@ -1,4 +1,4 @@
 variables:
-  GST_RS_IMG_TAG: '2022-09-22.0'
+  GST_RS_IMG_TAG: '2022-09-23.0'
   GST_RS_STABLE: '1.64.0'
   GST_RS_MSRV: '1.63.0'
diff --git a/ci/install-gtk4.sh b/ci/install-gtk4.sh
index c3dc2ccb5..9ac5e71bf 100644
--- a/ci/install-gtk4.sh
+++ b/ci/install-gtk4.sh
@@ -1,10 +1,13 @@
+#! /bin/sh
+
 set -eux
 
-BRANCH=gtk-4-6
+BRANCH=4.8.1
 
 git clone https://gitlab.gnome.org/GNOME/gtk.git --branch $BRANCH --depth=1
 cd gtk
-meson build -D prefix=/usr/local -Dbuild-tests=false
+
+meson build -D prefix=/usr/local -Dbuild-tests=false -Dwayland-protocols:tests=false
 ninja -C build
 ninja -C build install
 cd ..
diff --git a/ci/windows-docker/install_gtk.ps1 b/ci/windows-docker/install_gtk.ps1
index 03c034e85..6150c5f51 100644
--- a/ci/windows-docker/install_gtk.ps1
+++ b/ci/windows-docker/install_gtk.ps1
@@ -1,7 +1,7 @@
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
 
 # Download gstreamer and all its subprojects
-git clone -b gtk-4-6 --depth 1 https://gitlab.gnome.org/gnome/gtk.git C:\gtk
+git clone -b 4.8.1 --depth 1 https://gitlab.gnome.org/gnome/gtk.git C:\gtk
 if (!$?) {
   Write-Host "Failed to clone gtk"
   Exit 1