Module Name: xsrc
Committed By: mrg
Date: Tue Aug 30 08:35:24 UTC 2016
Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h xorg-server.h
Log Message:
move some flags from dix-config.h into X11FLAGS.DIX
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.12 -r1.13 \
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.22 xsrc/external/mit/xorg-server/include/dix-config.h:1.23
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.22 Tue Aug 16 08:19:16 2016
+++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Aug 30 08:35:24 2016
@@ -268,8 +268,10 @@
/* Internal define for Xinerama */
#define PANORAMIX 1
+#if 0
/* Support Present extension */
#define PRESENT 1
+#endif
/* Overall prefix */
/* #define PROJECTROOT "/usr/X11R7" */
@@ -277,8 +279,10 @@
/* Support RANDR extension */
#define RANDR 1
+#if 0
/* Support Record extension */
#define XRECORD 1
+#endif
/* Support RENDER extension */
#define RENDER 1
@@ -343,14 +347,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
@@ -385,8 +393,10 @@
/* Build DRI2 extension */
#define DRI2 1
+#if 0
/* Build DBE support */
#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.12 xsrc/external/mit/xorg-server/include/xorg-server.h:1.13
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.12 Sun Aug 14 03:44:46 2016
+++ xsrc/external/mit/xorg-server/include/xorg-server.h Tue Aug 30 08:35:24 2016
@@ -78,8 +78,10 @@
/* Internal define for Xinerama */
#define PANORAMIX 1
+#if 0
/* Support Present extension */
#define PRESENT 1
+#endif
/* Support RANDR extension */
#define RANDR 1
@@ -120,6 +122,7 @@
/* Build XFree86 BigFont extension */
/* #undef XF86BIGFONT */
+#if 0
/* Support XFree86 Video Mode extension */
#define XF86VIDMODE 1
@@ -131,6 +134,7 @@
/* Support X Input extension */
#define XINPUT 1
+#endif
/* XKB default rules */
#define XKB_DFLT_RULES "base"
@@ -207,11 +211,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
