xserver: Branch 'master' - 2 commits

[Adam Jackson]

 .appveyor.yml      |   29 +++++++++++++++++++++++++++++
 hw/dmx/Makefile.am |    3 +--
 2 files changed, 30 insertions(+), 2 deletions(-)

New commits:
commit de3b61869140768335daed0e855a5ae4bdb75020
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Fri Sep 15 14:36:52 2017 +0100

    Add an .appveyor.yml for AppVeyor CI
    
    This currently does an autotools build using Cygwin.
    
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 000000000..c638d2320
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,29 @@
+version: '{build}'
+skip_tags: true
+environment:
+  CYGWIN_MIRROR: http://cygwin.mirror.constant.com
+  CACHE: C:\cache
+  matrix:
+  - BUILD: i686-pc-cygwin
+  - BUILD: x86_64-pc-cygwin
+install:
+- if "%BUILD%"=="x86_64-pc-cygwin" set SETUP=setup-x86_64.exe && set CYGWIN_ROOT=C:\cygwin64
+- 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,bigreqsproto,compositeproto,damageproto,dmxproto,fixesproto,fontsproto,glproto,inputproto,kbproto,presentproto,randrproto,recordproto,renderproto,resourceproto,scrnsaverproto,windowsdriproto,xcmiscproto,xextproto,xf86bigfontproto,xineramaproto,xproto,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"'
+- 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"'
+test_script:
+- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; make check"'
+after_test:
+- '%CYGWIN_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; make install DESTDIR=$(pwd)/staging"'
+artifacts:
+- path: staging
+deploy: off
commit 7d0728d6c42f9200b90c58e0357776018de18496
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Fri Sep 15 14:36:51 2017 +0100

    Revert "dmx: fix linking"
    
    Since commit 3ef16dfb9830bd6b41ae428f4f213ae0c35c1056, "dmx: fix
    linking", linking dmx is broken for me:
    
      CCLD     Xdmx.exe
    ../../render/.libs/librender.a(glyph.o): In function `HashGlyph':
    /wip/xserver/build.x86_64/../render/glyph.c:168: undefined reference to `x_sha1_init'
    /wip/xserver/build.x86_64/../render/glyph.c:174: undefined reference to `x_sha1_update'
    /wip/xserver/build.x86_64/../render/glyph.c:177: undefined reference to `x_sha1_update'
    /wip/xserver/build.x86_64/../render/glyph.c:180: undefined reference to `x_sha1_final'
    ../../render/.libs/librender.a(mipict.o): In function `miClipPictureReg':
    /wip/xserver/build.x86_64/../render/mipict.c:233: undefined reference to `pixman_region_n_rects'
    /wip/xserver/build.x86_64/../render/mipict.c:234: undefined reference to `pixman_region_n_rects'
    /wip/xserver/build.x86_64/../render/mipict.c:235: undefined reference to `pixman_region_rectangles'
    /wip/xserver/build.x86_64/../render/mipict.c:236: undefined reference to `pixman_region_rectangles'
    /wip/xserver/build.x86_64/../render/mipict.c:248: undefined reference to `pixman_region_init'
    /wip/xserver/build.x86_64/../render/mipict.c:251: undefined reference to `pixman_region_not_empty'
    /wip/xserver/build.x86_64/../render/mipict.c:261: undefined reference to `pixman_region_not_empty'
    ../../render/.libs/librender.a(mipict.o): In function `miComputeCompositeRegion':
    /wip/xserver/build.x86_64/../render/mipict.c:340: undefined reference to `pixman_region_init'
    
    The change this was fixing appears to be effectively reverted by
    542d9f6807ac06b70f564ccab10af69fa21a1221, so just revert commit
    3ef16dfb9830bd6b41ae428f4f213ae0c35c1056.
    
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 38d6ac409..eef84cb66 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -80,8 +80,7 @@ XDMX_LIBS = \
 
 Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 Xdmx_DEPENDENCIES= $(XDMX_LIBS)
-Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS) \
-             $(top_builddir)/render/librender.la
+Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS)
 
 relink:
 	$(AM_V_at)rm -f Xdmx$(EXEEXT) && $(MAKE) Xdmx$(EXEEXT)