Module Name:    xsrc
Committed By:   mrg
Date:           Sun Feb 23 10:26:56 UTC 2020

Modified Files:
        xsrc/external/mit/xorg-server/include: dix-config.h xf86Build.h
            xorg-config.h

Log Message:
updates for xorg-server 1.20.6.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/include/xf86Build.h
cvs rdiff -u -r1.19 -r1.20 \
    xsrc/external/mit/xorg-server/include/xorg-config.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.35 xsrc/external/mit/xorg-server/include/dix-config.h:1.36
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.35	Sat Jun  1 06:55:44 2019
+++ xsrc/external/mit/xorg-server/include/dix-config.h	Sun Feb 23 10:26:56 2020
@@ -137,6 +137,9 @@
 /* Define to 1 if you have the <linux/fb.h> header file. */
 /* #undef HAVE_LINUX_FB_H */
 
++ /* Define to 1 if you have the `memfd_create' function. */
+/* #undef HAVE_MEMFD_CREATE */
+
 /* Define to 1 if you have the `mkostemp' function. */
 #define HAVE_MKOSTEMP 1
 
@@ -473,9 +476,6 @@
 /* Wrap SIGBUS to catch MIT-SHM faults */
 #define BUSFAULT 1
 
-/* Directory for shared memory temp files */
-#define SHMDIR "/var/shm"
-
 /* Don't let Xdefs.h define 'pointer' */
 #define _XTYPEDEF_POINTER
 
@@ -532,4 +532,7 @@
 /* Have epoll_create1() */
 /* #undef HAVE_EPOLL_CREATE1 */
 
+/* Have isastream */
+/* #undef HAVE_ISASTREAM */
+
 #endif /* _DIX_CONFIG_H_ */

Index: xsrc/external/mit/xorg-server/include/xf86Build.h
diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.10 xsrc/external/mit/xorg-server/include/xf86Build.h:1.11
--- xsrc/external/mit/xorg-server/include/xf86Build.h:1.10	Sun Mar  3 22:43:54 2019
+++ xsrc/external/mit/xorg-server/include/xf86Build.h	Sun Feb 23 10:26:56 2020
@@ -1,2 +1,2 @@
-#define BUILD_DATE 20190303
+#define BUILD_DATE 20200223
 #define BUILD_TIME 71123

Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.19 xsrc/external/mit/xorg-server/include/xorg-config.h:1.20
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.19	Sat Jun  1 06:55:44 2019
+++ xsrc/external/mit/xorg-server/include/xorg-config.h	Sun Feb 23 10:26:56 2020
@@ -17,7 +17,7 @@
 #define XORGSERVER 1
 
 /* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((20) * 100000) + ((5) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((20) * 100000) + ((6) * 1000) + 0)
 
 /* Name of X server. */
 #define __XSERVERNAME__ "Xorg"

Reply via email to