Module Name: xsrc
Committed By: mrg
Date: Thu Jan 3 23:24:50 UTC 2019
Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h xorg-server.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/xorg-server/include/xorg-server.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.30 xsrc/external/mit/xorg-server/include/dix-config.h:1.31
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.30 Mon Dec 31 22:17:21 2018
+++ xsrc/external/mit/xorg-server/include/dix-config.h Thu Jan 3 23:24:49 2019
@@ -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"
Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.16 xsrc/external/mit/xorg-server/include/xorg-server.h:1.17
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.16 Mon Dec 31 10:19:09 2018
+++ xsrc/external/mit/xorg-server/include/xorg-server.h Thu Jan 3 23:24:49 2019
@@ -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
