xserver: Branch 'master' - 2 commits

[Adam Jackson]

 .appveyor.yml |   13 +++++++------
 meson.build   |    1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 1519475a4382066707276d7463c7c6e52c382caa
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Mar 14 15:29:15 2018 -0400

    appveyor: use meson
    
    i686 cygwin build time with autotools:  16:22
    i686 cygwin build time with meson:       6:56
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/.appveyor.yml b/.appveyor.yml
index 05bf6bf2d..e81261038 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,6 +3,7 @@ branches:
     - /travis.*/
 version: '{build}'
 skip_tags: true
+clone_depth: 8
 environment:
   CYGWIN_MIRROR: http://cygwin.mirror.constant.com
   CACHE: C:\cache
@@ -14,19 +15,19 @@ install:
 - if "%BUILD%"=="i686-pc-cygwin" set SETUP=setup-x86.exe && set CYGWIN_ROOT=C:\cygwin
 - curl -fsSL https://gist.githubusercontent.com/jon-turney/0338af595313f598bfab15a0ac0df847/raw/bd0eeca6be899e7846aa988fbcf15e4e12f5f842/zp_libtool_cleanlafiles.sh -o %CYGWIN_ROOT%\etc\postinstall\zp_libtool_cleanlafiles.sh
 - echo Updating Cygwin and installing build prerequisites
-- '%CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -l "%CACHE%" -g -P "autoconf,automake,binutils,bison,bzip2,diffutils,fileutils,findutils,flex,gawk,gcc-core,libtool,make,patch,pkg-config,python3,sed,tar,xorgproto,libdmx-devel,libfontenc-devel,libfreetype-devel,libGL-devel,libpixman1-devel,libX11-devel,libXRes-devel,libXau-devel,libXaw-devel,libXdmcp-devel,libXext-devel,libXfont2-devel,libXi-devel,libXinerama-devel,libXmu-devel,libXpm-devel,libXrender-devel,libXtst-devel,libxcb-ewmh-devel,libxcb-icccm-devel,libxcb-image-devel,libxcb-keysyms-devel,libxcb-randr-devel,libxcb-render-devel,libxcb-render-util-devel,libxcb-shape-devel,libxcb-util-devel,libxcb-xkb-devel,libxkbfile-devel,zlib,font-util,khronos-opengl-registry,python3-lxml,xorg-util-macros,xtrans,xkbcomp,xkeyboard-config"'
+- '%CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -l "%CACHE%" -g -P "meson,binutils,bison,bzip2,diffutils,fileutils,findutils,flex,gawk,gcc-core,make,patch,pkg-config,python3,sed,tar,xorgproto,windowsdriproto,libdmx-devel,libfontenc-devel,libfreetype-devel,libGL-devel,libpixman1-devel,libX11-devel,libXRes-devel,libXau-devel,libXaw-devel,libXdmcp-devel,libXext-devel,libXfont2-devel,libXi-devel,libXinerama-devel,libXmu-devel,libXpm-devel,libXrender-devel,libXtst-devel,libxcb-ewmh-devel,libxcb-icccm-devel,libxcb-image-devel,libxcb-keysyms-devel,libxcb-randr-devel,libxcb-render-devel,libxcb-render-util-devel,libxcb-shape-devel,libxcb-util-devel,libxcb-xkb-devel,libxkbfile-devel,zlib,font-util,khronos-opengl-registry,python3-lxml,xorg-util-macros,xtrans,xkbcomp,xkeyboard-config,libnettle-devel,libepoxy-devel,libtirpc-devel"'
 - echo Install done
 cache:
 - C:\cache
 build_script:
 - SET PATH=%CYGWIN_ROOT%/bin
-- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; autoreconf -fvi"'
-- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ./configure --prefix=/usr --disable-xv --disable-glamor --enable-xf86bigfont --enable-dmx --enable-kdrive --enable-xephyr --enable-xnest --enable-xvfb --enable-xwin --enable-xorg"'
-- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; make"'
+- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; meson setup --prefix=/usr -Dxv=false -Dxf86bigfont=true -Ddmx=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 configure build"'
+- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build"'
 test_script:
-- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; make check"'
+- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build test"'
 after_test:
-- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; make install DESTDIR=$(pwd)/staging"'
+- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; ninja -C build install"'
 artifacts:
 - path: staging
 deploy: off
commit 2415ef5b228f5a235377decde95cb146c6642ea9
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Mar 20 14:00:33 2018 -0400

    meson: Add the x(org)proto headers to the include path
    
    Without this meson won't properly use headers installed into a
    non-default location.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/meson.build b/meson.build
index 32d72045b..47385ab03 100644
--- a/meson.build
+++ b/meson.build
@@ -455,6 +455,7 @@ inc = include_directories(
     'randr',
     'render',
     'xfixes',
+    xproto_dep.get_pkgconfig_variable('includedir')
 )
 
 glx_inc = include_directories('glx')