xserver: Branch 'master' - 2 commits

[Adam Jackson]

 configure.ac          |    6 +++---
 glx/Makefile.am       |    6 ++++--
 hw/xfree86/sdksyms.sh |    4 ++++
 meson.build           |    2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit cf485c659d93c92b26c4390402575f061eb175f6
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Feb 28 12:18:28 2018 -0500

    xserver 1.20 RC 1
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/configure.ac b/configure.ac
index 4d7c24fa9..439d42390 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.19.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2016-11-18"
-RELEASE_NAME="Shrimp-and-grits"
+AC_INIT([xorg-server], 1.19.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2018-02-28"
+RELEASE_NAME="Broccoli Rabe Lasagna"
 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 77d3c9def..4748724e3 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '1.19.99.1',
+        version: '1.19.99.901',
         meson_version: '>= 0.42.0',
 )
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')
commit afccb266edc8b2ca014aec5b2a67bb1627f29fe9
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Feb 28 12:26:26 2018 -0500

    glx: Add vndserver.h to the SDK
    
    Also unbreak 'make distcheck', sigh autotools.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/glx/Makefile.am b/glx/Makefile.am
index cb71a3763..0f652356d 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -12,8 +12,7 @@ AM_CFLAGS = \
 	@GLX_DEFINES@ \
 	@GLX_ARCH_DEFINES@
 
-# none yet
-#sdk_HEADERS =
+sdk_HEADERS = vndserver.h
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/hw/xfree86/os-support \
@@ -88,4 +87,7 @@ libglxvnd_la_SOURCES = \
 	vndcmds.c \
 	vndext.c \
 	vndservermapping.c \
+	vndservervendor.h \
 	vndservervendor.c
+
+EXTRA_DIST = vnd_dispatch_stubs.c
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 9aa1eec4f..d927fcd16 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -63,6 +63,10 @@ cat > sdksyms.c << EOF
 # include "panoramiX.h"
 #endif
 
+/* glx/Makefile.am */
+#ifdef GLX
+#include "vndserver.h"
+#endif
 
 /* hw/xfree86/int10/Makefile.am -- module */
 /*