xserver: Branch 'server-1.20-branch' - 3 commits

[GitLab Mirror]

 .gitlab-ci.yml                      |   10 ++++++----
 configure.ac                        |    6 +++---
 hw/xquartz/mach-startup/Makefile.am |    4 ++++
 hw/xwin/glx/Makefile.am             |    3 ++-
 meson.build                         |    2 +-
 5 files changed, 16 insertions(+), 9 deletions(-)

New commits:
commit 94f036d412f4f426abe950b57b9ec99b78068c39
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Feb 25 13:31:13 2019 -0500

    xserver 1.20.4
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/configure.ac b/configure.ac
index c079ca476..30544218a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.20.3, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2018-10-25"
-RELEASE_NAME="Harissa Roasted Carrots"
+AC_INIT([xorg-server], 1.20.4, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2019-02-25"
+RELEASE_NAME="Chestnut Tortelloni"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff --git a/meson.build b/meson.build
index ec9a24be6..999c40891 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '1.20.3',
+        version: '1.20.4',
         meson_version: '>= 0.42.0',
 )
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')
commit 9850d20c2aa2d8380f2e9c4521ef3c46a6c8fb00
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Feb 22 10:22:49 2019 +0100

    gitlab-ci: Run make distcheck in autotools build & test job
    
    We don't set the PIGLIT_DIR and XTS_DIR environment variables for make
    distcheck for now, otherwise it complains about files left behind by
    piglit.
    
    (cherry picked from commit 432fad04e7aaad1f10d732a51665ecbe934246c6)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e9df00d3..4cb5e7d33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,8 +64,6 @@ debian-testing:
             - ccache/
     variables:
         LC_ALL: C.UTF-8
-        PIGLIT_DIR: /root/piglit
-        XTEST_DIR: /root/xts
     before_script:
         - export CCACHE_BASEDIR="$PWD"
         - export CCACHE_DIR="$PWD/ccache"
@@ -81,9 +79,10 @@ autotools-build-and-test:
     script:
         - mkdir build/
         - cd build/
+        - ../autogen.sh --prefix=/usr
+        - make -j$(nproc) distcheck
         - |
-          ../autogen.sh --prefix=/usr
-          make -j$(nproc) install
+          export PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts
           set +e
           set -x
           make -j$(nproc) check
@@ -93,6 +92,9 @@ autotools-build-and-test:
 
 meson-build-and-test:
     extends: .common-build-and-test
+    variables:
+        PIGLIT_DIR: /root/piglit
+        XTEST_DIR: /root/xts
     script:
         - meson -Dprefix=/usr build/
         - |
commit fcac9b10c90c8a06c60f563f5ad8da1d4e49b7fc
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Feb 22 10:21:27 2019 +0100

    glx,xquartz: Fix make distcheck
    
    Guard BUILT_SOURCES and CLEANFILES by XWIN_GLX_WINDOWS/XQUARTZ.
    
    (cherry picked from commit f9bbc9d5ead5cf298f0e3e0b7ac5229af830f6e7)

diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index a0f9e9fe4..b2c446af8 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -76,6 +76,8 @@ nodist_Xquartz_SOURCES = \
 Xquartz_LDFLAGS =  \
 	-Wl,-framework,CoreServices
 
+if XQUARTZ
+
 BUILT_SOURCES = \
 	mach_startupServer.c \
 	mach_startupUser.c \
@@ -88,6 +90,8 @@ CLEANFILES = \
 $(BUILT_SOURCES): $(srcdir)/mach_startup.defs
 	mig -sheader mach_startupServer.h $(srcdir)/mach_startup.defs
 
+endif
+
 EXTRA_DIST = \
 	launchd_fd.h \
 	mach_startup.defs \
diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am
index 1fc57f239..119fee404 100644
--- a/hw/xwin/glx/Makefile.am
+++ b/hw/xwin/glx/Makefile.am
@@ -62,9 +62,10 @@ generated_gl_thunks.ic: $(srcdir)/gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/gl.xml
 
 generated_gl_thunks.def: $(srcdir)/gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/gl.xml $(KHRONOS_SPEC_DIR)/reg.py
 	$(AM_V_GEN)PYTHONPATH=$(KHRONOS_SPEC_DIR) $(PYTHON3) $(srcdir)/gen_gl_wrappers.py -registry $(KHRONOS_SPEC_DIR)/gl.xml -thunkdefs $(GENGLWRAPPERSOPTS) -outfile $@
-endif
 
 BUILT_SOURCES = generated_gl_shim.ic generated_gl_thunks.ic generated_gl_thunks.def generated_wgl_wrappers.ic
 CLEANFILES = $(BUILT_SOURCES)
 
+endif
+
 EXTRA_DIST = gen_gl_wrappers.py