From d7d6e6a4edb646b239b4b9037eb40b23091711a1 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon, 1 Nov 2021 14:22:07 +0000
Subject: [PATCH] appveyor: Add libxcvt build dep

Install libxcvt build dep on appveyor.

Explicitly install python3.8 lxml to ensure it matches python version
installed (to workaround issues with Cygwin installer).

Drop explicit configuration of hal and udev, as meson.build now knows to
turn those off for Cygwin.
---
 .appveyor.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 80032b8675..c023790cfc 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,7 +26,7 @@ gcc-core,\
 meson,\
 ninja,\
 pkg-config,\
-python3,\
+python38,\
 windowsdriproto,\
 xorgproto,\
 libepoxy-devel,\
@@ -58,10 +58,11 @@ libxcb-render-util-devel,\
 libxcb-shape-devel,\
 libxcb-util-devel,\
 libxcb-xkb-devel,\
+libxcvt-devel,\
 libxkbfile-devel,\
 font-util,\
 khronos-opengl-registry,\
-python3-lxml,\
+python38-lxml,\
 xkbcomp-devel,\
 xkeyboard-config,\
 xtrans"
@@ -72,7 +73,7 @@ cache:
 - '%CYGWIN_ROOT%\home\%USERNAME%\.ccache'
 build_script:
 - SET PATH=%CYGWIN_ROOT%/bin
-- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson setup --prefix=/usr -Dxv=false -Dxf86bigfont=true -Dxephyr=true -Dxnest=true -Dxvfb=true -Dxwin=true -Dxorg=true -Dhal=false -Dudev=false -Dpciaccess=false -Dint10=false build"'
+- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson setup --prefix=/usr -Dxv=false -Dxf86bigfont=true -Dxephyr=true -Dxnest=true -Dxvfb=true -Dxwin=true -Dxorg=true -Dpciaccess=false -Dint10=false -Dglamor=false build"'
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson configure build"'
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build"'
 - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ccache -s"'
-- 
GitLab