CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Tue Apr 27 04:01:42 UTC 2021 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h version-config.h xorg-config.h xorg-server.h Log Message: update for xorg-server 1.20.11. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.11 -r1.12 \ xsrc/external/mit/xorg-server/include/version-config.h cvs rdiff -u -r1.21 -r1.22 \ xsrc/external/mit/xorg-server/include/xorg-config.h \ 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.40 xsrc/external/mit/xorg-server/include/dix-config.h:1.41 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.40 Sat Dec 5 22:44:37 2020 +++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Apr 27 04:01:42 2021 @@ -125,9 +125,6 @@ /* Define to 1 if you have the `m' library (-lm). */ #define HAVE_LIBM 1 -/* Define to 1 if you have the libdispatch (GCD) available */ -/* #undef HAVE_LIBDISPATCH */ - /* Define to 1 if you have the header file. */ /* #undef HAVE_LINUX_AGPGART_H */ @@ -358,7 +355,7 @@ #define XINERAMA 1 /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((11) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1 Index: xsrc/external/mit/xorg-server/include/version-config.h diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.11 xsrc/external/mit/xorg-server/include/version-config.h:1.12 --- xsrc/external/mit/xorg-server/include/version-config.h:1.11 Sat Dec 5 22:44:37 2020 +++ xsrc/external/mit/xorg-server/include/version-config.h Tue Apr 27 04:01:42 2021 @@ -5,13 +5,13 @@ #define VERSION_CONFIG_H /* Vendor man version */ -#define VENDOR_MAN_VERSION "Version 1.20.10" +#define VENDOR_MAN_VERSION "Version 1.20.11" /* Vendor name */ /* #define VENDOR_NAME "The X.Org Foundation" */ /* Vendor release */ -#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0) +#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((11) * 1000) + 0) #endif /* VERSION_CONFIG_H */ Index: xsrc/external/mit/xorg-server/include/xorg-config.h diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.21 xsrc/external/mit/xorg-server/include/xorg-config.h:1.22 --- xsrc/external/mit/xorg-server/include/xorg-config.h:1.21 Sat Dec 5 22:44:37 2020 +++ xsrc/external/mit/xorg-server/include/xorg-config.h Tue Apr 27 04:01:42 2021 @@ -17,7 +17,7 @@ #define XORGSERVER 1 /* Current X.Org version. */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((11) * 1000) + 0) /* Name of X server. */ #define __XSERVERNAME__ "Xorg" Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.21 xsrc/external/mit/xorg-server/include/xorg-server.h:1.22 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.21 Sat Dec 5 22:44:37 2020 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Tue Apr 27 04:01:42 2021 @@ -140,7 +140,7 @@ #define XORGSERVER 1 /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((11) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Sat Dec 5 22:44:37 UTC 2020 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h version-config.h xorg-config.h xorg-server.h Log Message: bump version for xorg-server 1.20.10. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.10 -r1.11 \ xsrc/external/mit/xorg-server/include/version-config.h cvs rdiff -u -r1.20 -r1.21 \ xsrc/external/mit/xorg-server/include/xorg-config.h \ 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.39 xsrc/external/mit/xorg-server/include/dix-config.h:1.40 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.39 Sat Dec 5 20:34:05 2020 +++ xsrc/external/mit/xorg-server/include/dix-config.h Sat Dec 5 22:44:37 2020 @@ -358,7 +358,7 @@ #define XINERAMA 1 /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1 Index: xsrc/external/mit/xorg-server/include/version-config.h diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.10 xsrc/external/mit/xorg-server/include/version-config.h:1.11 --- xsrc/external/mit/xorg-server/include/version-config.h:1.10 Sun Feb 23 11:09:41 2020 +++ xsrc/external/mit/xorg-server/include/version-config.h Sat Dec 5 22:44:37 2020 @@ -5,13 +5,13 @@ #define VERSION_CONFIG_H /* Vendor man version */ -#define VENDOR_MAN_VERSION "Version 1.20.6" +#define VENDOR_MAN_VERSION "Version 1.20.10" /* Vendor name */ /* #define VENDOR_NAME "The X.Org Foundation" */ /* Vendor release */ -#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0) +#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0) #endif /* VERSION_CONFIG_H */ Index: xsrc/external/mit/xorg-server/include/xorg-config.h diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.20 xsrc/external/mit/xorg-server/include/xorg-config.h:1.21 --- xsrc/external/mit/xorg-server/include/xorg-config.h:1.20 Sun Feb 23 10:26:56 2020 +++ xsrc/external/mit/xorg-server/include/xorg-config.h Sat Dec 5 22:44:37 2020 @@ -17,7 +17,7 @@ #define XORGSERVER 1 /* Current X.Org version. */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0) /* Name of X server. */ #define __XSERVERNAME__ "Xorg" Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.20 xsrc/external/mit/xorg-server/include/xorg-server.h:1.21 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.20 Sun Feb 23 10:58:12 2020 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Sat Dec 5 22:44:37 2020 @@ -140,7 +140,7 @@ #define XORGSERVER 1 /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Sun Feb 23 11:09:41 UTC 2020 Modified Files: xsrc/external/mit/xorg-server/include: version-config.h Log Message: and one more version here too.. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/xorg-server/include/version-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/version-config.h diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.9 xsrc/external/mit/xorg-server/include/version-config.h:1.10 --- xsrc/external/mit/xorg-server/include/version-config.h:1.9 Sat Jun 1 06:55:44 2019 +++ xsrc/external/mit/xorg-server/include/version-config.h Sun Feb 23 11:09:41 2020 @@ -5,13 +5,13 @@ #define VERSION_CONFIG_H /* Vendor man version */ -#define VENDOR_MAN_VERSION "Version 1.20.5" +#define VENDOR_MAN_VERSION "Version 1.20.6" /* Vendor name */ /* #define VENDOR_NAME "The X.Org Foundation" */ /* Vendor release */ -#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((5) * 1000) + 0) +#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0) #endif /* VERSION_CONFIG_H */
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Sun Feb 23 10:58:12 UTC 2020 Modified Files: xsrc/external/mit/xorg-server/include: xorg-server.h Log Message: update version here too. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 \ 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/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.19 xsrc/external/mit/xorg-server/include/xorg-server.h:1.20 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.19 Sat Jun 1 06:55:44 2019 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Sun Feb 23 10:58:12 2020 @@ -140,7 +140,7 @@ #define XORGSERVER 1 /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((5) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Sun Feb 23 10:42:57 UTC 2020 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h Log Message: missed one version update. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 xsrc/external/mit/xorg-server/include/dix-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.37 xsrc/external/mit/xorg-server/include/dix-config.h:1.38 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.37 Sun Feb 23 10:39:59 2020 +++ xsrc/external/mit/xorg-server/include/dix-config.h Sun Feb 23 10:42:56 2020 @@ -358,7 +358,7 @@ #define XINERAMA 1 /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((5) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Sun Feb 23 10:39:59 UTC 2020 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h Log Message: fix merge botch in previous To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 xsrc/external/mit/xorg-server/include/dix-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.36 xsrc/external/mit/xorg-server/include/dix-config.h:1.37 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.36 Sun Feb 23 10:26:56 2020 +++ xsrc/external/mit/xorg-server/include/dix-config.h Sun Feb 23 10:39:59 2020 @@ -137,7 +137,7 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_LINUX_FB_H */ -+ /* Define to 1 if you have the `memfd_create' function. */ +/* Define to 1 if you have the `memfd_create' function. */ /* #undef HAVE_MEMFD_CREATE */ /* Define to 1 if you have the `mkostemp' function. */
CVS commit: xsrc/external/mit/xorg-server/include
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 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) * 1000) + ((20) * 10) + ((5) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0) /* Name of X server. */ #define __XSERVERNAME__ "Xorg"
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 22:43:54 UTC 2019 Modified Files: xsrc/external/mit/xorg-server/include: xf86Build.h Log Message: make BUILD_TIME be something that can have existed :-) To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/include/xf86Build.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/xf86Build.h diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.9 xsrc/external/mit/xorg-server/include/xf86Build.h:1.10 --- xsrc/external/mit/xorg-server/include/xf86Build.h:1.9 Sun Mar 3 22:01:09 2019 +++ xsrc/external/mit/xorg-server/include/xf86Build.h Sun Mar 3 22:43:54 2019 @@ -1,2 +1,2 @@ #define BUILD_DATE 20190303 -#define BUILD_TIME 01010101 +#define BUILD_TIME 71123
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Fri Jan 18 23:06:21 UTC 2019 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xorg-config.h Log Message: define HAVE_BACKTRACE 1. now X server crashes have backtraces in the log. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.16 -r1.17 \ 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.31 xsrc/external/mit/xorg-server/include/dix-config.h:1.32 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.31 Thu Jan 3 23:24:49 2019 +++ xsrc/external/mit/xorg-server/include/dix-config.h Fri Jan 18 23:06:21 2019 @@ -61,7 +61,7 @@ #define HAS_SHM 1 /* Has backtrace support */ -/* #undef HAVE_BACKTRACE */ +#define HAVE_BACKTRACE 1 /* Has libunwind support */ /* #undef HAVE_LIBUNWIND */ Index: xsrc/external/mit/xorg-server/include/xorg-config.h diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.16 xsrc/external/mit/xorg-server/include/xorg-config.h:1.17 --- xsrc/external/mit/xorg-server/include/xorg-config.h:1.16 Mon Dec 31 09:50:03 2018 +++ xsrc/external/mit/xorg-server/include/xorg-config.h Fri Jan 18 23:06:21 2019 @@ -116,7 +116,7 @@ /* #undef HAS_APERTURE_DRV */ /* Has backtrace support */ -/* #undef HAVE_BACKTRACE */ +#define HAVE_BACKTRACE 1 /* Name of the period field in struct kbd_repeat */ /* #undef LNX_KBD_PERIOD_NAME */
CVS commit: xsrc/external/mit/xorg-server/include
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
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Mon Dec 31 10:21:51 UTC 2018 Modified Files: xsrc/external/mit/xorg-server/include: version-config.h Log Message: comment VENDOR_NAME here. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/xorg-server/include/version-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/version-config.h diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.6 xsrc/external/mit/xorg-server/include/version-config.h:1.7 --- xsrc/external/mit/xorg-server/include/version-config.h:1.6 Mon Dec 31 09:50:03 2018 +++ xsrc/external/mit/xorg-server/include/version-config.h Mon Dec 31 10:21:50 2018 @@ -8,7 +8,7 @@ #define VENDOR_MAN_VERSION "Version 1.20.3" /* Vendor name */ -#define VENDOR_NAME "The X.Org Foundation" +/* #define VENDOR_NAME "The X.Org Foundation" */ /* Vendor release */ #define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((3) * 1000) + 0)
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Mon Dec 31 10:19:09 UTC 2018 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xorg-server.h Log Message: disable local reallocarray() for now. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.15 -r1.16 \ 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.28 xsrc/external/mit/xorg-server/include/dix-config.h:1.29 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.28 Mon Dec 31 09:50:03 2018 +++ xsrc/external/mit/xorg-server/include/dix-config.h Mon Dec 31 10:19:09 2018 @@ -153,7 +153,7 @@ /* #undef HAVE_NDIR_H */ /* Define to 1 if you have the `reallocarray' function. */ -#define HAVE_REALLOCARRAY 1 +/* #define HAVE_REALLOCARRAY 1 */ /* Define to 1 if you have the `arc4random_buf' function. */ #define HAVE_ARC4RANDOM_BUF 1 Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.15 xsrc/external/mit/xorg-server/include/xorg-server.h:1.16 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.15 Mon Dec 31 09:50:03 2018 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Mon Dec 31 10:19:09 2018 @@ -46,7 +46,7 @@ #define HAS_SHM 1 /* Define to 1 if you have the `reallocarray' function. */ -#define HAVE_REALLOCARRAY 1 +/* #define HAVE_REALLOCARRAY 1 */ /* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Mon Dec 31 09:53:40 UTC 2018 Modified Files: xsrc/external/mit/xorg-server/include: xf86Build.h Log Message: update for xorg-server 1.20 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/include/xf86Build.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/xf86Build.h diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.7 xsrc/external/mit/xorg-server/include/xf86Build.h:1.8 --- xsrc/external/mit/xorg-server/include/xf86Build.h:1.7 Sun Aug 14 03:44:46 2016 +++ xsrc/external/mit/xorg-server/include/xf86Build.h Mon Dec 31 09:53:40 2018 @@ -1,2 +1,2 @@ -#define BUILD_DATE 20160814 -#define BUILD_TIME 1012929 +#define BUILD_DATE 20181225 +#define BUILD_TIME 1131031
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: snj Date: Thu Nov 17 07:58:09 UTC 2016 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h Log Message: comment out COMPILEDDEFAULTFONTPATH as in olden days, happy golden days To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 xsrc/external/mit/xorg-server/include/dix-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.24 xsrc/external/mit/xorg-server/include/dix-config.h:1.25 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.24 Wed Sep 21 22:11:16 2016 +++ xsrc/external/mit/xorg-server/include/dix-config.h Thu Nov 17 07:58:08 2016 @@ -20,7 +20,7 @@ #define BUILDERSTRING "" /* Default font path */ -#define COMPILEDDEFAULTFONTPATH "/usr/X11R7/share/fonts/X11/misc,/usr/X11R7/share/fonts/X11/TTF,/usr/X11R7/share/fonts/X11/OTF,/usr/X11R7/share/fonts/X11/Type1,/usr/X11R7/share/fonts/X11/100dpi,/usr/X11R7/share/fonts/X11/75dpi,/usr/X11R7/share/fonts/X11/cyrillic,/usr/X11R7/lib/X11/fonts/misc,/usr/X11R7/lib/X11/fonts/TTF,/usr/X11R7/lib/X11/fonts/OTF,/usr/X11R7/lib/X11/fonts/Type1,/usr/X11R7/lib/X11/fonts/100dpi,/usr/X11R7/lib/X11/fonts/75dpi,/usr/X11R7/lib/X11/fonts/cyrillic" +/* #define COMPILEDDEFAULTFONTPATH "/usr/X11R7/share/fonts/X11/misc,/usr/X11R7/share/fonts/X11/TTF,/usr/X11R7/share/fonts/X11/OTF,/usr/X11R7/share/fonts/X11/Type1,/usr/X11R7/share/fonts/X11/100dpi,/usr/X11R7/share/fonts/X11/75dpi,/usr/X11R7/share/fonts/X11/cyrillic,/usr/X11R7/lib/X11/fonts/misc,/usr/X11R7/lib/X11/fonts/TTF,/usr/X11R7/lib/X11/fonts/OTF,/usr/X11R7/lib/X11/fonts/Type1,/usr/X11R7/lib/X11/fonts/100dpi,/usr/X11R7/lib/X11/fonts/75dpi,/usr/X11R7/lib/X11/fonts/cyrillic" */ /* Miscellaneous server configuration files path */ #define SERVER_MISC_CONFIG_PATH "/usr/X11R7/lib/xorg"
CVS commit: xsrc/external/mit/xorg-server/include
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
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Tue Aug 16 08:19:16 UTC 2016 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h Log Message: don't define _XTYPEDEF_POINTER or _XITYPEDEF_POINTER for now. XXX: old drivers To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 xsrc/external/mit/xorg-server/include/dix-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.21 xsrc/external/mit/xorg-server/include/dix-config.h:1.22 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.21 Sun Aug 14 03:44:46 2016 +++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Aug 16 08:19:16 2016 @@ -491,10 +491,10 @@ #define SHMDIR "/var/shm" /* Don't let Xdefs.h define 'pointer' */ -#define _XTYPEDEF_POINTER 1 +/* #define _XTYPEDEF_POINTER 1 */ /* Don't let XIproto define 'Pointer' */ -#define _XITYPEDEF_POINTER 1 +/* #define _XITYPEDEF_POINTER 1 */ /* Ask fontsproto to make font path element names const */ #define FONT_PATH_ELEMENT_NAME_CONST1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Sun Aug 14 03:44:46 UTC 2016 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h version-config.h xf86Build.h xkb-config.h xorg-config.h xorg-server.h Log Message: update for xorg-server 1.18.4. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/xorg-server/include/version-config.h cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/include/xf86Build.h cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/include/xkb-config.h cvs rdiff -u -r1.13 -r1.14 \ xsrc/external/mit/xorg-server/include/xorg-config.h cvs rdiff -u -r1.11 -r1.12 \ 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.20 xsrc/external/mit/xorg-server/include/dix-config.h:1.21 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.20 Mon Jun 3 08:57:43 2013 +++ xsrc/external/mit/xorg-server/include/dix-config.h Sun Aug 14 03:44:46 2016 @@ -8,19 +8,19 @@ #define BIGREQS 1 /* Builder address */ -/* #define BUILDERADDR "x...@lists.freedesktop.org" */ +/* #define BUILDERADDR "tech-...@netbsd.org" */ /* Operating System Name */ -/* #define OSNAME "NetBSD 5.99.40 amd64" */ +/* #define OSNAME "NetBSD-7.99.35-i386" */ /* Operating System Vendor */ -/* #define OSVENDOR "" */ +/* #define OSVENDOR "The NetBSD Foundation" */ /* Builder string */ #define BUILDERSTRING "" /* Default font path */ -/* #define COMPILEDDEFAULTFONTPATH "/usr/local/lib/X11/fonts/misc/,/usr/local/lib/X11/fonts/TTF/,/usr/local/lib/X11/fonts/OTF,/usr/local/lib/X11/fonts/Type1/,/usr/local/lib/X11/fonts/100dpi/,/usr/local/lib/X11/fonts/75dpi/" */ +#define COMPILEDDEFAULTFONTPATH "/usr/X11R7/share/fonts/X11/misc,/usr/X11R7/share/fonts/X11/TTF,/usr/X11R7/share/fonts/X11/OTF,/usr/X11R7/share/fonts/X11/Type1,/usr/X11R7/share/fonts/X11/100dpi,/usr/X11R7/share/fonts/X11/75dpi,/usr/X11R7/share/fonts/X11/cyrillic,/usr/X11R7/lib/X11/fonts/misc,/usr/X11R7/lib/X11/fonts/TTF,/usr/X11R7/lib/X11/fonts/OTF,/usr/X11R7/lib/X11/fonts/Type1,/usr/X11R7/lib/X11/fonts/100dpi,/usr/X11R7/lib/X11/fonts/75dpi,/usr/X11R7/lib/X11/fonts/cyrillic" /* Miscellaneous server configuration files path */ #define SERVER_MISC_CONFIG_PATH "/usr/X11R7/lib/xorg" @@ -31,9 +31,6 @@ /* Support Damage extension */ #define DAMAGE 1 -/* Build for darwin with Quartz support */ -/* #undef DARWIN_WITH_QUARTZ */ - /* Use OsVendorVErrorF */ /* #undef DDXOSVERRORF */ @@ -43,6 +40,11 @@ /* Build DPMS extension */ #define DPMSExtension 1 +#if 0 /* notyet */ +/* Build DRI3 extension */ +#define DRI3 1 +#endif + /* Build GLX extension */ #define GLXEXT 1 @@ -55,42 +57,28 @@ /* Support XDM-AUTH*-1 */ #define HASXDMAUTH 1 -/* Define to 1 if you have the `getdtablesize' function. */ -#define HAS_GETDTABLESIZE 1 - -/* Define to 1 if you have the `getifaddrs' function. */ -#define HAS_GETIFADDRS 1 - -/* Define to 1 if you have the `getpeereid' function. */ -#define HAS_GETPEEREID 1 - -/* Define to 1 if you have the `getpeerucred' function. */ -/* #undef HAS_GETPEERUCRED */ - -/* Define to 1 if you have the `mmap' function. */ -#define HAS_MMAP 1 - /* Support SHM */ #define HAS_SHM 1 -/* Have the 'strlcpy' function */ -#define HAS_STRLCPY 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ASM_MTRR_H */ - /* Has backtrace support */ /* #undef HAVE_BACKTRACE */ +/* Has libunwind support */ +/* #undef HAVE_LIBUNWIND */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_BYTESWAP_H */ -/* Define to 1 if you have cbrt */ +/* Define to 1 if you have the `cbrt' function. */ #define HAVE_CBRT 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_DBM_H */ +/* Define to 1 if you have the declaration of `program_invocation_short_name', and + to 0 if you don't. */ +#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 0 + /* Define to 1 if you have the header file, and it defines `DIR'. */ #define HAVE_DIRENT_H 1 @@ -98,23 +86,29 @@ /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -/* #undef HAVE_DOPRNT */ - /* Have execinfo.h */ /* #undef HAVE_EXECINFO_H */ /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 -/* Define to 1 if you have the `geteuid' function. */ -#define HAVE_GETEUID 1 +/* Define to 1 if you have the `ffs' function. */ +#define HAVE_FFS 1 + +/* Define to 1 if you have the `getdtablesize' function. */ +#define HAVE_GETDTABLESIZE 1 + +/* Define to 1 if you have the `getifaddrs' function. */ +#define HAVE_GETIFADDRS 1 + +/* Define to 1 if you have the
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Mon Jun 3 08:57:43 UTC 2013 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h version-config.h xorg-config.h xorg-server.h Log Message: update for xorg-server 1.10.6. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xorg-server/include/version-config.h cvs rdiff -u -r1.12 -r1.13 \ xsrc/external/mit/xorg-server/include/xorg-config.h cvs rdiff -u -r1.10 -r1.11 \ 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.19 xsrc/external/mit/xorg-server/include/dix-config.h:1.20 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.19 Tue Aug 2 22:45:52 2011 +++ xsrc/external/mit/xorg-server/include/dix-config.h Mon Jun 3 08:57:43 2013 @@ -349,7 +349,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((6) * 1000) + 0) /* Xorg release date */ #define XORG_DATE 2011-07-08 Index: xsrc/external/mit/xorg-server/include/version-config.h diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.3 xsrc/external/mit/xorg-server/include/version-config.h:1.4 --- xsrc/external/mit/xorg-server/include/version-config.h:1.3 Tue Aug 2 07:22:05 2011 +++ xsrc/external/mit/xorg-server/include/version-config.h Mon Jun 3 08:57:43 2013 @@ -5,13 +5,13 @@ #define VERSION_CONFIG_H /* Vendor man version */ -#define VENDOR_MAN_VERSION Version 1.10.3 +#define VENDOR_MAN_VERSION Version 1.10.6 /* Vendor name */ /* #define VENDOR_NAME The X.Org Foundation */ /* Vendor release */ -#define VENDOR_RELEASE (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) +#define VENDOR_RELEASE (((1) * 1000) + ((10) * 10) + ((6) * 1000) + 0) #endif /* VERSION_CONFIG_H */ Index: xsrc/external/mit/xorg-server/include/xorg-config.h diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.12 xsrc/external/mit/xorg-server/include/xorg-config.h:1.13 --- xsrc/external/mit/xorg-server/include/xorg-config.h:1.12 Tue Aug 2 07:22:05 2011 +++ xsrc/external/mit/xorg-server/include/xorg-config.h Mon Jun 3 08:57:43 2013 @@ -17,7 +17,7 @@ #define XORGSERVER 1 /* Current X.Org version. */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((6) * 1000) + 0) /* Name of X server. */ #define __XSERVERNAME__ Xorg Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.10 xsrc/external/mit/xorg-server/include/xorg-server.h:1.11 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.10 Tue Aug 2 08:13:48 2011 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Mon Jun 3 08:57:43 2013 @@ -120,7 +120,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((6) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Tue Aug 2 07:22:05 UTC 2011 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h version-config.h xf86Build.h xorg-config.h xorg-server.h Log Message: updates for xorg-server 1.10.3. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xorg-server/include/version-config.h cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/include/xf86Build.h cvs rdiff -u -r1.11 -r1.12 \ xsrc/external/mit/xorg-server/include/xorg-config.h cvs rdiff -u -r1.8 -r1.9 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.16 xsrc/external/mit/xorg-server/include/dix-config.h:1.17 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.16 Sun Jul 24 01:41:27 2011 +++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Aug 2 07:22:05 2011 @@ -244,6 +244,9 @@ /* Define to 1 if you have the `vprintf' function. */ #define HAVE_VPRINTF 1 +/* Define to 1 if you have the `vasprintf' function. */ +#define HAVE_VASPRINTF 1 + /* Support IPv6 for TCP connections */ #define IPv6 1 @@ -441,6 +444,9 @@ /* Define to 1 if you have the `ffs' function. */ #define HAVE_FFS 1 +/* If the compiler supports a TLS storage class define it to that here */ +/* #undef TLS */ + /* Correctly set _XSERVER64 for OSX fat binaries */ #ifdef __APPLE__ #include dix-config-apple-verbatim.h Index: xsrc/external/mit/xorg-server/include/version-config.h diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.2 xsrc/external/mit/xorg-server/include/version-config.h:1.3 --- xsrc/external/mit/xorg-server/include/version-config.h:1.2 Sun Jul 24 01:41:27 2011 +++ xsrc/external/mit/xorg-server/include/version-config.h Tue Aug 2 07:22:05 2011 @@ -5,13 +5,13 @@ #define VERSION_CONFIG_H /* Vendor man version */ -#define VENDOR_MAN_VERSION Version 1.9.5 +#define VENDOR_MAN_VERSION Version 1.10.3 /* Vendor name */ /* #define VENDOR_NAME The X.Org Foundation */ /* Vendor release */ -#define VENDOR_RELEASE (((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0) +#define VENDOR_RELEASE (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) #endif /* VERSION_CONFIG_H */ Index: xsrc/external/mit/xorg-server/include/xf86Build.h diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.5 xsrc/external/mit/xorg-server/include/xf86Build.h:1.6 --- xsrc/external/mit/xorg-server/include/xf86Build.h:1.5 Sun Jul 24 01:41:27 2011 +++ xsrc/external/mit/xorg-server/include/xf86Build.h Tue Aug 2 07:22:05 2011 @@ -1,2 +1,2 @@ -#define BUILD_DATE 20110723 -#define BUILD_TIME 1013305 +#define BUILD_DATE 20110801 +#define BUILD_TIME 1010100 Index: xsrc/external/mit/xorg-server/include/xorg-config.h diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.11 xsrc/external/mit/xorg-server/include/xorg-config.h:1.12 --- xsrc/external/mit/xorg-server/include/xorg-config.h:1.11 Sun Jul 24 01:41:27 2011 +++ xsrc/external/mit/xorg-server/include/xorg-config.h Tue Aug 2 07:22:05 2011 @@ -17,7 +17,7 @@ #define XORGSERVER 1 /* Current X.Org version. */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) /* Name of X server. */ #define __XSERVERNAME__ Xorg Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.8 xsrc/external/mit/xorg-server/include/xorg-server.h:1.9 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.8 Sun Jul 24 01:41:27 2011 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Tue Aug 2 07:22:05 2011 @@ -158,11 +158,6 @@ /* Name of X server */ #define __XSERVERNAME__ Xorg -#if defined(_LP64) -/* Define to 1 if unsigned long is 64 bits. */ -#define _XSERVER64 1 -#endif - /* Building vgahw module */ #define WITH_VGAHW 1 @@ -190,4 +185,8 @@ /* X Access Control Extension */ #define XACE 1 +#ifdef _LP64 +#define _XSERVER64 1 +#endif + #endif /* _XORG_SERVER_H_ */
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Tue Aug 2 08:13:48 UTC 2011 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xorg-server.h Log Message: finish updating these for xorg-server 1.10.3 To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.9 -r1.10 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.17 xsrc/external/mit/xorg-server/include/dix-config.h:1.18 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.17 Tue Aug 2 07:22:05 2011 +++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Aug 2 08:13:48 2011 @@ -349,7 +349,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) /* Xorg release date */ #define XORG_DATE 2010-10-30 @@ -394,7 +394,9 @@ /* #undef ROOTLESS */ /* Define to 1 if unsigned long is 64 bits. */ +#ifdef _LP64 #define _XSERVER64 1 +#endif /* System is BSD-like */ #define CSRG_BASED 1 Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.9 xsrc/external/mit/xorg-server/include/xorg-server.h:1.10 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.9 Tue Aug 2 07:22:05 2011 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Tue Aug 2 08:13:48 2011 @@ -120,7 +120,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Tue Aug 2 22:45:52 UTC 2011 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h Log Message: fix the XORG_DATE. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xorg-server/include/dix-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.18 xsrc/external/mit/xorg-server/include/dix-config.h:1.19 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.18 Tue Aug 2 08:13:48 2011 +++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Aug 2 22:45:52 2011 @@ -352,7 +352,7 @@ #define XORG_VERSION_CURRENT (((1) * 1000) + ((10) * 10) + ((3) * 1000) + 0) /* Xorg release date */ -#define XORG_DATE 2010-10-30 +#define XORG_DATE 2011-07-08 /* Build Xv Extension */ #define XvExtension 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Sun Jul 24 01:41:27 UTC 2011 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h version-config.h xf86Build.h xorg-config.h xorg-server.h Log Message: updates for xorg-server 1.9.5 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.1 -r1.2 \ xsrc/external/mit/xorg-server/include/version-config.h cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/include/xf86Build.h cvs rdiff -u -r1.10 -r1.11 \ xsrc/external/mit/xorg-server/include/xorg-config.h cvs rdiff -u -r1.7 -r1.8 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.15 xsrc/external/mit/xorg-server/include/dix-config.h:1.16 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.15 Mon Jan 17 20:56:09 2011 +++ xsrc/external/mit/xorg-server/include/dix-config.h Sun Jul 24 01:41:27 2011 @@ -346,7 +346,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((2) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0) /* Xorg release date */ #define XORG_DATE 2010-10-30 Index: xsrc/external/mit/xorg-server/include/version-config.h diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.1 xsrc/external/mit/xorg-server/include/version-config.h:1.2 --- xsrc/external/mit/xorg-server/include/version-config.h:1.1 Tue Nov 23 08:16:26 2010 +++ xsrc/external/mit/xorg-server/include/version-config.h Sun Jul 24 01:41:27 2011 @@ -5,13 +5,13 @@ #define VERSION_CONFIG_H /* Vendor man version */ -#define VENDOR_MAN_VERSION Version 1.9.2 +#define VENDOR_MAN_VERSION Version 1.9.5 /* Vendor name */ /* #define VENDOR_NAME The X.Org Foundation */ /* Vendor release */ -#define VENDOR_RELEASE (((1) * 1000) + ((9) * 10) + ((2) * 1000) + 0) +#define VENDOR_RELEASE (((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0) #endif /* VERSION_CONFIG_H */ Index: xsrc/external/mit/xorg-server/include/xf86Build.h diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.4 xsrc/external/mit/xorg-server/include/xf86Build.h:1.5 --- xsrc/external/mit/xorg-server/include/xf86Build.h:1.4 Tue Nov 23 08:16:26 2010 +++ xsrc/external/mit/xorg-server/include/xf86Build.h Sun Jul 24 01:41:27 2011 @@ -1,2 +1,2 @@ -#define BUILD_DATE 20101123 +#define BUILD_DATE 20110723 #define BUILD_TIME 1013305 Index: xsrc/external/mit/xorg-server/include/xorg-config.h diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.10 xsrc/external/mit/xorg-server/include/xorg-config.h:1.11 --- xsrc/external/mit/xorg-server/include/xorg-config.h:1.10 Tue Nov 23 08:16:26 2010 +++ xsrc/external/mit/xorg-server/include/xorg-config.h Sun Jul 24 01:41:27 2011 @@ -17,7 +17,7 @@ #define XORGSERVER 1 /* Current X.Org version. */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((2) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0) /* Name of X server. */ #define __XSERVERNAME__ Xorg Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.7 xsrc/external/mit/xorg-server/include/xorg-server.h:1.8 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.7 Tue Nov 23 08:16:26 2010 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Sun Jul 24 01:41:27 2011 @@ -120,7 +120,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((2) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((5) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: jmcneill Date: Mon Jan 17 20:56:09 UTC 2011 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h Log Message: Comment out '#define DEBUG 1', ok mrg and macallan To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xorg-server/include/dix-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.14 xsrc/external/mit/xorg-server/include/dix-config.h:1.15 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.14 Tue Nov 23 08:16:26 2010 +++ xsrc/external/mit/xorg-server/include/dix-config.h Mon Jan 17 20:56:09 2011 @@ -254,7 +254,7 @@ #define MITSHM 1 /* Enable some debugging code */ -#define DEBUG 1 +/* #undef DEBUG */ /* Name of package */ #ifndef PACKAGE
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Tue Nov 23 08:16:26 UTC 2010 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xf86Build.h xkb-config.h xorg-config.h xorg-server.h Added Files: xsrc/external/mit/xorg-server/include: version-config.h Log Message: update these for xorg-server 1.9.2 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xorg-server/include/version-config.h cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/include/xf86Build.h cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/include/xkb-config.h cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/include/xorg-config.h cvs rdiff -u -r1.6 -r1.7 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.13 xsrc/external/mit/xorg-server/include/dix-config.h:1.14 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.13 Mon Nov 9 07:43:21 2009 +++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Nov 23 08:16:26 2010 @@ -11,7 +11,7 @@ /* #define BUILDERADDR x...@lists.freedesktop.org */ /* Operating System Name */ -/* #define OSNAME NetBSD 5.0_STABLE amd64 */ +/* #define OSNAME NetBSD 5.99.40 amd64 */ /* Operating System Vendor */ /* #define OSVENDOR */ @@ -19,10 +19,8 @@ /* Builder string */ #define BUILDERSTRING -#ifndef COMPILEDDEFAULTFONTPATH /* Default font path */ -#define COMPILEDDEFAULTFONTPATH /usr/local/lib/X11/fonts/misc/,/usr/local/lib/X11/fonts/TTF/,/usr/local/lib/X11/fonts/OTF,/usr/local/lib/X11/fonts/Type1/,/usr/local/lib/X11/fonts/100dpi/,/usr/local/lib/X11/fonts/75dpi/ -#endif +/* #define COMPILEDDEFAULTFONTPATH /usr/local/lib/X11/fonts/misc/,/usr/local/lib/X11/fonts/TTF/,/usr/local/lib/X11/fonts/OTF,/usr/local/lib/X11/fonts/Type1/,/usr/local/lib/X11/fonts/100dpi/,/usr/local/lib/X11/fonts/75dpi/ */ /* Miscellaneous server configuration files path */ #define SERVER_MISC_CONFIG_PATH /usr/X11R7/lib/xorg @@ -127,6 +125,12 @@ /* Have Quartz */ /* #undef XQUARTZ */ +/* Support application updating through sparkle. */ +/* #undef XQUARTZ_SPARKLE */ + +/* Prefix to use for launchd identifiers */ +#define LAUNCHD_ID_PREFIX org.x + /* Build a standalone xpbproxy */ /* #undef STANDALONE_XPBPROXY */ @@ -157,9 +161,21 @@ /* Define to 1 if you have the rpcsvc/dbm.h header file. */ /* #undef HAVE_RPCSVC_DBM_H */ -/* Define to use libmd SHA1 functions instead of OpenSSL libcrypto */ +/* Define to use libc SHA1 functions */ +#define HAVE_SHA1_IN_LIBC 1 + +/* Define to use CommonCrypto SHA1 functions */ +/* #undef HAVE_SHA1_IN_COMMONCRYPTO */ + +/* Define to use libmd SHA1 functions */ /* #undef HAVE_SHA1_IN_LIBMD */ +/* Define to use libgcrypt SHA1 functions */ +/* #undef HAVE_SHA1_IN_LIBGCRYPT */ + +/* Define to use libsha1 for SHA1 */ +/* #undef HAVE_SHA1_IN_LIBSHA1 */ + /* Define to 1 if you have the `shmctl64' function. */ /* #undef HAVE_SHMCTL64 */ @@ -207,6 +223,9 @@ /* Define to 1 if you have the sys/types.h header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the sys/utsname.h header file. */ +#define HAVE_SYS_UTSNAME_H 1 + /* Define to 1 if you have the sys/vm86.h header file. */ /* #undef HAVE_SYS_VM86_H */ @@ -216,6 +235,9 @@ /* Define to 1 if you have the unistd.h header file. */ #define HAVE_UNISTD_H 1 +/* Define to 1 if you have the fnmatch.h header file. */ +#define HAVE_FNMATCH_H 1 + /* Have /dev/urandom */ /* #undef HAVE_URANDOM */ @@ -232,10 +254,10 @@ #define MITSHM 1 /* Enable some debugging code */ -/* #undef DEBUG */ +#define DEBUG 1 -#ifndef PACKAGE /* Name of package */ +#ifndef PACKAGE #define PACKAGE xorg-server #endif @@ -249,7 +271,7 @@ #define RANDR 1 /* Support Record extension */ -/* #undef XRECORD */ +#define XRECORD 1 /* Support RENDER extension */ #define RENDER 1 @@ -320,23 +342,14 @@ /* Support Xinerama extension */ #define XINERAMA 1 -/* Build XKB */ -#define XKB 1 - -/* Enable XKB per default */ -#define XKB_DFLT_DISABLED 0 - -/* Build XKB server */ -#define XKB_IN_SERVER 1 - /* Vendor release */ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((5) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((9) * 10) + ((2) * 1000) + 0) /* Xorg release date */ -#define XORG_DATE 2009-10-12 +#define XORG_DATE 2010-10-30 /* Build Xv Extension */ #define XvExtension 1 @@ -353,9 +366,6 @@ /* Support Xv extension */ #define XV 1 -/* Build Multibuffer extension */ -/* #undef MULTIBUFFER */ - /* Support DRI extension */ #define XF86DRI 1 @@ -380,10 +390,8 @@ /* Build Rootless code */ /* #undef
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 07:43:21 UTC 2009 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xf86Build.h xorg-config.h xorg-server.h Log Message: update for xorg-server 1.6.5 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/include/xf86Build.h cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/include/xorg-config.h cvs rdiff -u -r1.5 -r1.6 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.12 xsrc/external/mit/xorg-server/include/dix-config.h:1.13 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.12 Sat Aug 22 01:40:37 2009 +++ xsrc/external/mit/xorg-server/include/dix-config.h Mon Nov 9 07:43:21 2009 @@ -333,10 +333,10 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((3) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((5) * 1000) + 0) /* Xorg release date */ -#define XORG_DATE 2009-7-7 +#define XORG_DATE 2009-10-12 /* Build Xv Extension */ #define XvExtension 1 Index: xsrc/external/mit/xorg-server/include/xf86Build.h diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.2 xsrc/external/mit/xorg-server/include/xf86Build.h:1.3 --- xsrc/external/mit/xorg-server/include/xf86Build.h:1.2 Thu Jul 9 07:30:54 2009 +++ xsrc/external/mit/xorg-server/include/xf86Build.h Mon Nov 9 07:43:21 2009 @@ -1,2 +1,2 @@ -#define BUILD_DATE 20090709 +#define BUILD_DATE 20091012 #define BUILD_TIME 1001403 Index: xsrc/external/mit/xorg-server/include/xorg-config.h diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.8 xsrc/external/mit/xorg-server/include/xorg-config.h:1.9 --- xsrc/external/mit/xorg-server/include/xorg-config.h:1.8 Sat Aug 22 01:40:37 2009 +++ xsrc/external/mit/xorg-server/include/xorg-config.h Mon Nov 9 07:43:21 2009 @@ -17,7 +17,7 @@ #define XORGSERVER 1 /* Current X.Org version. */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((3) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((5) * 1000) + 0) /* Name of X server. */ #define __XSERVERNAME__ Xorg Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.5 xsrc/external/mit/xorg-server/include/xorg-server.h:1.6 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.5 Sat Aug 22 01:40:37 2009 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Mon Nov 9 07:43:21 2009 @@ -126,7 +126,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((3) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((5) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Sat Aug 22 01:40:37 UTC 2009 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xorg-config.h xorg-server.h Log Message: update for xorg-server 1.6.3. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/include/xorg-config.h cvs rdiff -u -r1.4 -r1.5 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.11 xsrc/external/mit/xorg-server/include/dix-config.h:1.12 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.11 Thu Jul 9 07:30:54 2009 +++ xsrc/external/mit/xorg-server/include/dix-config.h Sat Aug 22 01:40:37 2009 @@ -333,7 +333,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((2) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((3) * 1000) + 0) /* Xorg release date */ #define XORG_DATE 2009-7-7 Index: xsrc/external/mit/xorg-server/include/xorg-config.h diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.7 xsrc/external/mit/xorg-server/include/xorg-config.h:1.8 --- xsrc/external/mit/xorg-server/include/xorg-config.h:1.7 Thu Jul 9 07:30:54 2009 +++ xsrc/external/mit/xorg-server/include/xorg-config.h Sat Aug 22 01:40:37 2009 @@ -17,7 +17,7 @@ #define XORGSERVER 1 /* Current X.Org version. */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((2) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((3) * 1000) + 0) /* Name of X server. */ #define __XSERVERNAME__ Xorg Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.4 xsrc/external/mit/xorg-server/include/xorg-server.h:1.5 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.4 Thu Jul 9 07:30:54 2009 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Sat Aug 22 01:40:37 2009 @@ -126,7 +126,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((2) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((3) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Thu Jul 9 07:30:54 UTC 2009 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xf86Build.h xorg-config.h xorg-server.h Log Message: update these for xorg-server 1.6.2. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/include/xf86Build.h cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/include/xorg-config.h cvs rdiff -u -r1.3 -r1.4 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.10 xsrc/external/mit/xorg-server/include/dix-config.h:1.11 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.10 Tue Jun 16 00:25:39 2009 +++ xsrc/external/mit/xorg-server/include/dix-config.h Thu Jul 9 07:30:54 2009 @@ -11,7 +11,7 @@ /* #define BUILDERADDR x...@lists.freedesktop.org */ /* Operating System Name */ -/* #define OSNAME NetBSD 5.0 amd64 */ +/* #define OSNAME NetBSD 5.0_STABLE amd64 */ /* Operating System Vendor */ /* #define OSVENDOR */ @@ -333,10 +333,10 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((1) * 1000) + 901) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((2) * 1000) + 0) /* Xorg release date */ -#define XORG_DATE 2009-5-8 +#define XORG_DATE 2009-7-7 /* Build Xv Extension */ #define XvExtension 1 Index: xsrc/external/mit/xorg-server/include/xf86Build.h diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.1 xsrc/external/mit/xorg-server/include/xf86Build.h:1.2 --- xsrc/external/mit/xorg-server/include/xf86Build.h:1.1 Fri Jun 12 01:54:48 2009 +++ xsrc/external/mit/xorg-server/include/xf86Build.h Thu Jul 9 07:30:54 2009 @@ -1,2 +1,2 @@ -#define BUILD_DATE 20090610 -#define BUILD_TIME 00 +#define BUILD_DATE 20090709 +#define BUILD_TIME 1001403 Index: xsrc/external/mit/xorg-server/include/xorg-config.h diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.6 xsrc/external/mit/xorg-server/include/xorg-config.h:1.7 --- xsrc/external/mit/xorg-server/include/xorg-config.h:1.6 Tue Jun 16 00:25:39 2009 +++ xsrc/external/mit/xorg-server/include/xorg-config.h Thu Jul 9 07:30:54 2009 @@ -17,7 +17,7 @@ #define XORGSERVER 1 /* Current X.Org version. */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((1) * 1000) + 901) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((2) * 1000) + 0) /* Name of X server. */ #define __XSERVERNAME__ Xorg @@ -85,8 +85,8 @@ /* BSD /dev/io */ /* #undef USE_DEV_IO */ -/* BSD i386 iopl */ #if defined(__i386__) || defined(__x86_64__) +/* BSD i386 iopl */ #define USE_I386_IOPL 1 #endif Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.3 xsrc/external/mit/xorg-server/include/xorg-server.h:1.4 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.3 Thu Jun 11 04:56:54 2009 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Thu Jul 9 07:30:54 2009 @@ -126,7 +126,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((1) * 1000) + 901) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((2) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Tue Jun 16 00:25:39 UTC 2009 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xorg-config.h Log Message: fix paths with /usr/local in them To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.5 -r1.6 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.9 xsrc/external/mit/xorg-server/include/dix-config.h:1.10 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.9 Fri Jun 12 01:53:51 2009 +++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Jun 16 00:25:39 2009 @@ -25,7 +25,7 @@ #endif /* Miscellaneous server configuration files path */ -#define SERVER_MISC_CONFIG_PATH /usr/local/lib/xorg +#define SERVER_MISC_CONFIG_PATH /usr/X11R7/lib/xorg /* Support Composite Extension */ #define COMPOSITE 1 @@ -52,7 +52,7 @@ /* #undef GLX_DRI */ /* Path to DRI drivers */ -#define DRI_DRIVER_PATH /usr/local/lib/dri +#define DRI_DRIVER_PATH /usr/X11R7/lib/modules/dri /* Support XDM-AUTH*-1 */ #define HASXDMAUTH 1 Index: xsrc/external/mit/xorg-server/include/xorg-config.h diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.5 xsrc/external/mit/xorg-server/include/xorg-config.h:1.6 --- xsrc/external/mit/xorg-server/include/xorg-config.h:1.5 Thu Jun 11 04:56:54 2009 +++ xsrc/external/mit/xorg-server/include/xorg-config.h Tue Jun 16 00:25:39 2009 @@ -38,13 +38,13 @@ #define __XCONFIGFILE__ xorg.conf /* Path to loadable modules. */ -#define DEFAULT_MODULE_PATH /usr/local/lib/xorg/modules +#define DEFAULT_MODULE_PATH /usr/X11R7/lib/modules /* Path to installed libraries. */ -#define DEFAULT_LIBRARY_PATH /usr/local/lib +#define DEFAULT_LIBRARY_PATH /usr/X11R7/lib /* Path to server log file. */ -#define DEFAULT_LOGPREFIX /usr/local/var/log/Xorg. +#define DEFAULT_LOGPREFIX /var/log/Xorg. /* Building DRI-capable DDX. */ #define XF86DRI 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 08:31:56 UTC 2009 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h Log Message: turn on BUILTIN_FONTS, as it is required with libXfont 1.4.0. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/include/dix-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.5 xsrc/external/mit/xorg-server/include/dix-config.h:1.6 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.5 Thu Aug 28 07:31:50 2008 +++ xsrc/external/mit/xorg-server/include/dix-config.h Wed Jun 10 08:31:56 2009 @@ -491,7 +491,7 @@ /* #undef CONFIG_HAL */ /* Use only built-in fonts */ -/* #undef BUILTIN_FONTS */ +#define BUILTIN_FONTS 1 /* Avoid using font servers */ /* #undef NOFONTSERVERACCESS */
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Thu Jun 11 04:56:54 UTC 2009 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xorg-config.h xorg-server.h Removed Files: xsrc/external/mit/xorg-server/include: xgl-config.h Log Message: update these with xorg-server 1.6.1.901 versions. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.1 -r0 xsrc/external/mit/xorg-server/include/xgl-config.h cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/include/xorg-config.h cvs rdiff -u -r1.2 -r1.3 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.6 xsrc/external/mit/xorg-server/include/dix-config.h:1.7 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.6 Wed Jun 10 08:31:56 2009 +++ xsrc/external/mit/xorg-server/include/dix-config.h Thu Jun 11 04:56:54 2009 @@ -8,10 +8,10 @@ #define BIGREQS 1 /* Builder address */ -/* #define BUILDERADDR x...@lists.freedesktop.org */ +#define BUILDERADDR x...@lists.freedesktop.org /* Operating System Name */ -/* #define OSNAME NetBSD 4.99.67 amd64 */ +/* #define OSNAME NetBSD 5.0 amd64 */ /* Operating System Vendor */ /* #define OSVENDOR */ @@ -24,32 +24,18 @@ #define COMPILEDDEFAULTFONTPATH /usr/local/lib/X11/fonts/misc/,/usr/local/lib/X11/fonts/TTF/,/usr/local/lib/X11/fonts/OTF,/usr/local/lib/X11/fonts/Type1/,/usr/local/lib/X11/fonts/100dpi/,/usr/local/lib/X11/fonts/75dpi/ #endif +/* Miscellaneous server configuration files path */ +#define SERVER_MISC_CONFIG_PATH /usr/local/lib/xorg + /* Support Composite Extension */ #define COMPOSITE 1 -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - /* Support Damage extension */ #define DAMAGE 1 /* Build for darwin with Quartz support */ /* #undef DARWIN_WITH_QUARTZ */ -/* Use OsVendorInit */ -#define DDXOSINIT 1 - -/* Use GetTimeInMillis */ -/* #undef DDXTIME */ - -/* Use OsVendorFatalError */ -/* #undef DDXOSFATALERROR */ - /* Use OsVendorVErrorF */ /* #undef DDXOSVERRORF */ @@ -60,7 +46,7 @@ #define DPMSExtension 1 /* Build GLX extension */ -/* #undef GLXEXT */ +#define GLXEXT 1 /* Build GLX DRI loader */ /* #undef GLX_DRI */ @@ -68,9 +54,6 @@ /* Path to DRI drivers */ #define DRI_DRIVER_PATH /usr/local/lib/dri -/* Include handhelds.org h3600 touchscreen driver */ -/* #undef H3600_TS */ - /* Support XDM-AUTH*-1 */ #define HASXDMAUTH 1 @@ -92,16 +75,15 @@ /* Support SHM */ #define HAS_SHM 1 -/* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define to 1 if you have alloca.h and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ +/* Have the 'strlcpy' function */ +#define HAS_STRLCPY 1 /* Define to 1 if you have the asm/mtrr.h header file. */ /* #undef HAVE_ASM_MTRR_H */ +/* Has backtrace support */ +/* #undef HAVE_BACKTRACE */ + /* Define to 1 if you have the byteswap.h header file. */ /* #undef HAVE_BYTESWAP_H */ @@ -121,6 +103,9 @@ /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ /* #undef HAVE_DOPRNT */ +/* Have execinfo.h */ +/* #undef HAVE_EXECINFO_H */ + /* Define to 1 if you have the fcntl.h header file. */ #define HAVE_FCNTL_H 1 @@ -130,20 +115,20 @@ /* Define to 1 if you have the `getisax' function. */ /* #undef HAVE_GETISAX */ -/* Define to 1 if you have the `getopt' function. */ -#define HAVE_GETOPT 1 - -/* Define to 1 if you have the `getopt_long' function. */ -#define HAVE_GETOPT_LONG 1 - /* Define to 1 if you have the `getuid' function. */ #define HAVE_GETUID 1 +/* Define to 1 if you have the `getzoneid' function. */ +/* #undef HAVE_GETZONEID */ + /* Define to 1 if you have the inttypes.h header file. */ #define HAVE_INTTYPES_H 1 -/* Define to 1 if you have version 2.2 (or newer) of the drm library */ -#define HAVE_LIBDRM_2_2 1 +/* Have Quartz */ +/* #undef XQUARTZ */ + +/* Build a standalone xpbproxy */ +/* #undef STANDALONE_XPBPROXY */ /* Define to 1 if you have the `m' library (-lm). */ #define HAVE_LIBM 1 @@ -160,18 +145,6 @@ /* Define to 1 if you have the linux/fb.h header file. */ /* #undef HAVE_LINUX_FB_H */ -/* Define to 1 if you have the linux/h3600_ts.h header file. */ -/* #undef HAVE_LINUX_H3600_TS_H */ - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the memory.h header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `memset' function. */ -#define HAVE_MEMSET 1 - /*
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Thu Jun 11 05:09:53 UTC 2009 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h Log Message: avoid HAL and dbus To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/include/dix-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.7 xsrc/external/mit/xorg-server/include/dix-config.h:1.8 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.7 Thu Jun 11 04:56:54 2009 +++ xsrc/external/mit/xorg-server/include/dix-config.h Thu Jun 11 05:09:53 2009 @@ -392,16 +392,16 @@ #define BSD44SOCKETS 1 /* Support D-Bus */ -#define HAVE_DBUS 1 +/* #define HAVE_DBUS 1 */ /* Use D-Bus for input hotplug */ -#define CONFIG_NEED_DBUS 1 +/* #define CONFIG_NEED_DBUS 1 */ /* Support the D-Bus hotplug API */ /* #undef CONFIG_DBUS_API */ /* Support HAL for hotplug */ -#define CONFIG_HAL 1 +/* #define CONFIG_HAL 1 */ /* Use only built-in fonts */ /* #undef BUILTIN_FONTS */
