From 4f2d974aa65225c7f549976a10e900cd17a4611e Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 29 Sep 2022 03:49:42 +0300 Subject: [PATCH] ci/windows: Install pango explicitly Instead of relying on the subproject Part-of: --- ci/windows-docker/Dockerfile | 3 ++- ci/windows-docker/install_gtk.ps1 | 6 +++--- ci/windows-docker/install_pango.ps1 | 27 +++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 ci/windows-docker/install_pango.ps1 diff --git a/ci/windows-docker/Dockerfile b/ci/windows-docker/Dockerfile index 8f83dede1..e44558aec 100644 --- a/ci/windows-docker/Dockerfile +++ b/ci/windows-docker/Dockerfile @@ -15,7 +15,8 @@ RUN choco install -y pkgconfiglite nasm llvm RUN setx PATH '%PATH%;C:\Program Files\NASM;C:\gst-install\bin' ENV PKG_CONFIG_PATH="C:\gst-install\lib\pkgconfig" -COPY install_gst.ps1 install_gtk.ps1 install_dav1d.ps1 C:\ +COPY install_pango.ps1 install_gst.ps1 install_gtk.ps1 install_dav1d.ps1 C:\ +RUN C:\install_pango.ps1 RUN C:\install_gst.ps1 RUN C:\install_gtk.ps1 RUN C:\install_dav1d.ps1 diff --git a/ci/windows-docker/install_gtk.ps1 b/ci/windows-docker/install_gtk.ps1 index 6150c5f51..22de90339 100644 --- a/ci/windows-docker/install_gtk.ps1 +++ b/ci/windows-docker/install_gtk.ps1 @@ -1,6 +1,8 @@ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; -# Download gstreamer and all its subprojects +$env:MESON_ARGS = "--prefix=C:\gst-install\" + +# Download gtk and all its subprojects git clone -b 4.8.1 --depth 1 https://gitlab.gnome.org/gnome/gtk.git C:\gtk if (!$?) { Write-Host "Failed to clone gtk" @@ -9,8 +11,6 @@ if (!$?) { Set-Location C:\gtk -$env:MESON_ARGS = "--prefix=C:\gst-install\" - Write-Output "Building gtk" 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" diff --git a/ci/windows-docker/install_pango.ps1 b/ci/windows-docker/install_pango.ps1 new file mode 100644 index 000000000..c8928bb4d --- /dev/null +++ b/ci/windows-docker/install_pango.ps1 @@ -0,0 +1,27 @@ +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; + +$env:MESON_ARGS = "--prefix=C:\gst-install\" + +# Download pango all its subprojects +git clone -b main --depth 1 https://gitlab.gnome.org/gnome/pango.git C:\pango +if (!$?) { + Write-Host "Failed to clone pango" + Exit 1 +} + +Set-Location C:\pango + +Write-Output "Building pango" +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" + +if (!$?) { + Write-Host "Failed to build and install pango" + Exit 1 +} + +cd C:\ +cmd /c rmdir /s /q C:\pango +if (!$?) { + Write-Host "Failed to remove gtk checkout" + Exit 1 +}