[xsrc/trunk]: xsrc/external/mit/xorg-server/include revert some of the previo...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/596789cf660b
branches:  trunk
changeset: 10074:596789cf660b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jan 03 23:24:49 2019 +0000

description:
revert some of the previous update to xorg-server 1.20.  i forgot
that some of them were moved into makefiles so that Xx68k could
build without them being defined.

diffstat:

 external/mit/xorg-server/include/dix-config.h  |  10 ++++++++++
 external/mit/xorg-server/include/xorg-server.h |   6 ++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diffs (96 lines):

diff -r 7e018829dfe2 -r 596789cf660b external/mit/xorg-server/include/dix-config.h
--- a/external/mit/xorg-server/include/dix-config.h     Thu Jan 03 10:27:30 2019 +0000
+++ b/external/mit/xorg-server/include/dix-config.h     Thu Jan 03 23:24:49 2019 +0000
@@ -269,7 +269,9 @@
 #define PANORAMIX 1
 
 /* Support Present extension */
+#if 0
 #define PRESENT 1
+#endif
 
 /* Overall prefix */
 /* #define PROJECTROOT "/usr/X11R7" */
@@ -278,7 +280,9 @@
 #define RANDR 1
 
 /* Support Record extension */
+#if 0
 #define XRECORD 1
+#endif
 
 /* Support RENDER extension */
 #define RENDER 1
@@ -334,14 +338,18 @@
 /* Build XFree86 BigFont extension */
 /* #undef XF86BIGFONT */
 
+#if 0
 /* Support XFree86 Video Mode extension */
 #define XF86VIDMODE 1
+#endif
 
 /* Support XFixes extension */
 #define XFIXES 1
 
+#if 0
 /* Build XDGA support */
 #define XFreeXDGA 1
+#endif
 
 /* Support Xinerama extension */
 #define XINERAMA 1
@@ -371,7 +379,9 @@
 #define DRI2 1
 
 /* Build DBE support */
+#if 0
 #define DBE 1
+#endif
 
 /* Vendor name */
 #define XVENDORNAME "The X.Org Foundation"
diff -r 7e018829dfe2 -r 596789cf660b external/mit/xorg-server/include/xorg-server.h
--- a/external/mit/xorg-server/include/xorg-server.h    Thu Jan 03 10:27:30 2019 +0000
+++ b/external/mit/xorg-server/include/xorg-server.h    Thu Jan 03 23:24:49 2019 +0000
@@ -75,8 +75,10 @@
 /* Internal define for Xinerama */
 #define PANORAMIX 1
 
+#if 0
 /* Support Present extension */
 #define PRESENT 1
+#endif
 
 /* Support RANDR extension */
 #define RANDR 1
@@ -111,6 +113,7 @@
 /* Build XFree86 BigFont extension */
 /* #undef XF86BIGFONT */
 
+#if 0
 /* Support XFree86 Video Mode extension */
 #define XF86VIDMODE 1
 
@@ -122,6 +125,7 @@
 
 /* Support X Input extension */
 #define XINPUT 1
+#endif
 
 /* XKB default rules */
 #define XKB_DFLT_RULES "base"
@@ -192,11 +196,13 @@
 /* System has wscons console */
 #define WSCONS_SUPPORT 1
 
+#if 0
 /* Loadable XFree86 server awesomeness */
 #define XFree86LOADER
 
 /* Use libpciaccess */
 #define XSERVER_LIBPCIACCESS 1
+#endif
 
 /* X Access Control Extension */
 #define XACE 1