frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jon Turney 2021-11-01 14:22:07 +00:00
parent 8218c2383c
commit d7d6e6a4ed
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.appveyor.yml
View File

@ -26,7 +26,7 @@ gcc-core,\
meson,\ meson,\
ninja,\ ninja,\
pkg-config,\ pkg-config,\
python3,\ python38,\
windowsdriproto,\ windowsdriproto,\
xorgproto,\ xorgproto,\
libepoxy-devel,\ libepoxy-devel,\
@ -58,10 +58,11 @@ libxcb-render-util-devel,\
libxcb-shape-devel,\ libxcb-shape-devel,\
libxcb-util-devel,\ libxcb-util-devel,\
libxcb-xkb-devel,\ libxcb-xkb-devel,\
libxcvt-devel,\
libxkbfile-devel,\ libxkbfile-devel,\
font-util,\ font-util,\
khronos-opengl-registry,\ khronos-opengl-registry,\
python3-lxml,\ python38-lxml,\
xkbcomp-devel,\ xkbcomp-devel,\
xkeyboard-config,\ xkeyboard-config,\
xtrans" xtrans"
@ -72,7 +73,7 @@ cache:
- '%CYGWIN_ROOT%\home\%USERNAME%\.ccache' - '%CYGWIN_ROOT%\home\%USERNAME%\.ccache'
build_script: build_script:
- SET PATH=%CYGWIN_ROOT%/bin - 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; meson configure build"'
- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build"' - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build"'
- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ccache -s"' - '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ccache -s"'