From d1eafd2b805cc75b94a948898761a118493e8925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= <scerveau@igalia.com>
Date: Fri, 21 Apr 2023 12:23:23 +0200
Subject: [PATCH] ci: remove gst build from windows docker

Build gstreamer as a subproject
---
 ci/images_template.yml            |  2 +-
 ci/windows-docker/Dockerfile      | 10 +++++++---
 ci/windows-docker/install_gtk.ps1 |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ci/images_template.yml b/ci/images_template.yml
index 4ae3a5f..553f17b 100644
--- a/ci/images_template.yml
+++ b/ci/images_template.yml
@@ -1,4 +1,4 @@
 variables:
-  GST_RS_IMG_TAG: '2023-04-12.1'
+  GST_RS_IMG_TAG: '2023-04-21.0'
   GST_RS_STABLE: '1.67.0'
   GST_RS_MSRV: '1.63.0'
diff --git a/ci/windows-docker/Dockerfile b/ci/windows-docker/Dockerfile
index 9c5b95b..7d7d4cd 100644
--- a/ci/windows-docker/Dockerfile
+++ b/ci/windows-docker/Dockerfile
@@ -6,7 +6,7 @@ FROM "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2023-03-20.0-ma
 ENV ErrorActionPreference='Stop'
 SHELL ["powershell","-NoLogo", "-NonInteractive", "-Command"]
 
-ARG DEFAULT_GST_BRANCH="1.22"
+#ARG DEFAULT_GST_BRANCH="1.22"
 ARG DEFAULT_GTK_BRANCH="4.8.2"
 ARG DEFAULT_PANGO_BRANCH="1.50.14"
 ARG RUST_VERSION="invalid"
@@ -17,11 +17,15 @@ RUN choco install -y pkgconfiglite nasm llvm
 RUN setx PATH '%PATH%;C:\Program Files\NASM;C:\gst-install\bin;c:\Program Files\gettext-iconv\bin'
 ENV PKG_CONFIG_PATH="C:\gst-install\lib\pkgconfig"
 
-COPY install_pango.ps1 install_gst.ps1 install_gtk.ps1 C:\
+
+COPY install_pango.ps1 C:\
 RUN C:\install_pango.ps1
-RUN C:\install_gst.ps1
+# COPY install_gst.ps1  C:\
+# RUN C:\install_gst.ps1
+COPY install_gtk.ps1 C:\
 RUN C:\install_gtk.ps1
 
+
 RUN Invoke-WebRequest -Uri https://win.rustup.rs/x86_64 -OutFile C:\rustup-init.exe
 RUN C:\rustup-init.exe -y --profile minimal --default-toolchain $env:RUST_VERSION
 
diff --git a/ci/windows-docker/install_gtk.ps1 b/ci/windows-docker/install_gtk.ps1
index 561e337..c38de6f 100644
--- a/ci/windows-docker/install_gtk.ps1
+++ b/ci/windows-docker/install_gtk.ps1
@@ -1,6 +1,6 @@
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
 
-$env:MESON_ARGS = "--prefix=C:\gst-install\"
+$env:MESON_ARGS = "-Dmedia-gstreamer=disabled --prefix=C:\gst-install\"
 
 # Download gtk and all its subprojects
 git clone -b $env:DEFAULT_GTK_BRANCH --depth 1 https://gitlab.gnome.org/gnome/gtk.git C:\gtk