diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2021-11-01 14:22:07 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2021-11-04 13:03:25 +0000 |
| commit | d7d6e6a4edb646b239b4b9037eb40b23091711a1 (patch) | |
| tree | 837821a56055bff7313403f9480879dca81cd9f5 /.appveyor.yml | |
| parent | 8218c2383ccaabb3d3bb7d84c0f5a4c53fd193cc (diff) | |
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.
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 80032b867..c023790cf 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"' |