From d920cb46297ca42a5d5c5ec28de2399bbbc085dc Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Sat, 17 Aug 2024 13:48:48 +0530
Subject: [PATCH] ci: Rely on the monorepo's gtk subproject support

The monorepo now ensures that the gtk subproject keeps building on
windows and macOS via its own CI.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1506>
---
 ci/install-gst.sh                 | 2 +-
 ci/windows-docker/install_gst.ps1 | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ci/install-gst.sh b/ci/install-gst.sh
index 1ec7a61c5..941de059a 100755
--- a/ci/install-gst.sh
+++ b/ci/install-gst.sh
@@ -24,11 +24,11 @@ PLUGINS="-D gst-plugins-base:ogg=enabled \
          -D gst-plugins-bad:opus=enabled \
          -D gst-plugins-ugly:x264=enabled"
 
-echo "subproject('gtk')" >> meson.build
 meson setup build \
     -D prefix=/usr/local \
     -D gpl=enabled \
     -D ugly=enabled \
+    -D gtk=enabled \
     -D examples=disabled \
     -D gtk_doc=disabled \
     -D introspection=disabled \
diff --git a/ci/windows-docker/install_gst.ps1 b/ci/windows-docker/install_gst.ps1
index 10fdfa83a..bac0599f3 100644
--- a/ci/windows-docker/install_gst.ps1
+++ b/ci/windows-docker/install_gst.ps1
@@ -38,14 +38,12 @@ $MESON_ARGS = @(`
   "-Dpython=disabled", `
   "-Dlibav=disabled", `
   "-Dvaapi=disabled", `
+  "-Dgtk=enabled", `
   "-Dgst-plugins-base:pango=enabled", `
   "-Dgst-plugins-good:cairo=enabled", `
   "-Dgst-plugins-good:lame=disabled"
 )
 
-$PSDefaultParameterValues['Out-File:Encoding'] = 'utf8'
-echo "subproject('gtk')" >> meson.build
-
 Write-Output "Building gstreamer"
 meson setup --vsenv $MESON_ARGS _build
 if (!$?) {