xserver - fix build

6 files changed, 23 insertions, 29 deletions

diff --git a/xorg/xserver/BUILD b/xorg/xserver/BUILD
index ba0c526ad1..86a7a6485f 100755
--- a/xorg/xserver/BUILD
+++ b/xorg/xserver/BUILD
@@ -6,6 +6,7 @@ OPTS+=" xorg=$XSERVER_XORG \
         xephyr=$XSERVER_XEPHYR \
         dmx=$XSERVER_DMX \
         glamor=$XSERVER_GLAMOR \
+        listen_tcp=$XSERVER_TCP \
         log_dir=${INSTALL_ROOT}/var/log \
         xkb_bin_dir=$INSTALL_ROOT/usr/bin \
         os_vendor='SourceMage'"
diff --git a/xorg/xserver/CONFIGURE b/xorg/xserver/CONFIGURE
index b04ebf442a..35815f5838 100755
--- a/xorg/xserver/CONFIGURE
+++ b/xorg/xserver/CONFIGURE
@@ -12,3 +12,4 @@ config_query_option XSERVER_XVFB    "Build Xvfb server?" n true false
 config_query_option XSERVER_XEPHYR  "Build Xephyr nested X server?" n true false
 config_query_option XSERVER_DMX     "Build DMX nested X server?" n true false
 config_query_option XSERVER_GLAMOR  "build Glamor" y true false
+config_query_option XSERVER_TCP     "listen on TCP" n true false
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index 8ae6f3e44a..168944a289 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,9 @@
+2018-08-07 Treeve Jelbert <treeve@sourcemage.org>
+	* BUILD CONFIGURE: enable listen tcp
+	* PRE_BUILD: delete hack
+	* patches/xwayland-config.patch: added, provide missing file
+	* patches/0003-automake-fixes-for-smgl.patch: deleted, redundant
+
 2018-08-07 Pavel Vinogradov <public@sourcemage.org>
 	* DETAILS: version 1.20.1
 
diff --git a/xorg/xserver/PRE_BUILD b/xorg/xserver/PRE_BUILD
index 386aae9588..922c0ab256 100755
--- a/xorg/xserver/PRE_BUILD
+++ b/xorg/xserver/PRE_BUILD
@@ -1,6 +1,3 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches &&
-
-# Dirty hack for 1.19.99.905
-cp include/xwayland-config.h.in include/xwayland-config.h.meson.in
+apply_patch_dir patches
diff --git a/xorg/xserver/patches/0003-automake-fixes-for-smgl.patch b/xorg/xserver/patches/0003-automake-fixes-for-smgl.patch
deleted file mode 100644
index 25d407cd30..0000000000
--- a/xorg/xserver/patches/0003-automake-fixes-for-smgl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 20d214cddfc9b5ed4a64e8d3a5610256813b0f00 Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve@sourcemage.org>
-Date: Fri, 9 Feb 2018 14:04:21 +0100
-Subject: [PATCH 3/3] automake fixes for smgl
-
----
- hw/xfree86/dixmods/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
-index 856659f..e156043 100644
---- a/hw/xfree86/dixmods/Makefile.am
-+++ b/hw/xfree86/dixmods/Makefile.am
-@@ -8,7 +8,7 @@ module_LTLIBRARIES = libfb.la \
-                      libwfb.la \
-                      libshadow.la
- 
--extsmoduledir = $(moduledir)/extensions
-+extsmoduledir = $(moduledir)/extensions/.mesa
- extsmodule_LTLIBRARIES = $(GLXMODS)
- 
- AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
--- 
-2.16.1
-
diff --git a/xorg/xserver/patches/xwayland-config.patch b/xorg/xserver/patches/xwayland-config.patch
new file mode 100644
index 0000000000..82c2082941
--- /dev/null
+++ b/xorg/xserver/patches/xwayland-config.patch
@@ -0,0 +1,14 @@
+--- /dev/null	2018-08-08 08:41:18.087999984 +0200
++++ a/include/xwayland-config.h.meson.in	2018-04-27 13:18:04.000000000 +0200
+@@ -0,0 +1,11 @@
++/* xwayland-config.h.meson.in: not at all generated */
++
++#pragma once
++
++#include <dix-config.h>
++
++/* Build glamor support for Xwayland */
++#mesondefine XWL_HAS_GLAMOR
++
++/* Build eglstream support for Xwayland */
++#mesondefine XWL_HAS_EGLSTREAM