From 2c06dce3c8ca8d2d4bb9200b8d0e69599b11c763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 5 Dec 2022 15:00:40 +0200 Subject: [PATCH] ci: Update Windows docker base image Part-of: --- ci/images_template.yml | 2 +- ci/windows-docker/Dockerfile | 2 +- ci/windows-docker/install_gst.ps1 | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/images_template.yml b/ci/images_template.yml index 62e4f5513..d28132492 100644 --- a/ci/images_template.yml +++ b/ci/images_template.yml @@ -1,4 +1,4 @@ variables: - GST_RS_IMG_TAG: '2022-12-07.0' + GST_RS_IMG_TAG: '2022-12-09.0' GST_RS_STABLE: '1.65.0' GST_RS_MSRV: '1.63.0' diff --git a/ci/windows-docker/Dockerfile b/ci/windows-docker/Dockerfile index e44558aec..63cb07a57 100644 --- a/ci/windows-docker/Dockerfile +++ b/ci/windows-docker/Dockerfile @@ -1,6 +1,6 @@ # escape=` -FROM "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2022-09-23.0-main" +FROM "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2022-11-18.0-main" # Make sure any failure in PowerShell is fatal ENV ErrorActionPreference='Stop' diff --git a/ci/windows-docker/install_gst.ps1 b/ci/windows-docker/install_gst.ps1 index c5de87421..9de8a6bed 100644 --- a/ci/windows-docker/install_gst.ps1 +++ b/ci/windows-docker/install_gst.ps1 @@ -33,6 +33,7 @@ $env:MESON_ARGS = "--prefix=C:\gst-install\ " + "-Dffmpeg:tests=disabled " + "-Dopenh264:tests=disabled " + "-Dpygobject:tests=false " + + "-Dgpl=enabled " + "-Dugly=enabled " + "-Dbad=enabled " + "-Dges=enabled " + @@ -44,7 +45,7 @@ $env:MESON_ARGS = "--prefix=C:\gst-install\ " + "-Dvaapi=disabled " + "-Dgst-plugins-base:pango=enabled " + "-Dgst-plugins-good:cairo=enabled " + - "-Dgpl=enabled " + "-Dgst-plugins-good:lame=disabled " Write-Output "Building gst" cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson _build $env:MESON_ARGS && meson compile -C _build && ninja -C _build install"