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 "[email protected]" */
/* 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) * 10000000) + ((6) * 100000) + ((5) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((9) * 100000) + ((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 ROOTLESS */
-#if defined(_LP64)
/* Define to 1 if unsigned long is 64 bits. */
#define _XSERVER64 1
-#endif
/* System is BSD-like */
#define CSRG_BASED 1
@@ -392,22 +400,19 @@
#define BSD44SOCKETS 1
/* Support D-Bus */
-/* #define HAVE_DBUS 1 */
+/* #undef HAVE_DBUS */
+
+/* Use libudev for input hotplug */
+/* #undef CONFIG_UDEV */
/* Use D-Bus for input hotplug */
-/* #define CONFIG_NEED_DBUS 1 */
+/* #undef CONFIG_NEED_DBUS */
/* Support the D-Bus hotplug API */
/* #undef CONFIG_DBUS_API */
/* Support HAL for hotplug */
-/* #define CONFIG_HAL 1 */
-
-/* Use only built-in fonts */
-/* #undef BUILTIN_FONTS */
-
-/* Use an empty root cursor */
-/* #undef NULL_ROOT_CURSOR */
+/* #undef CONFIG_HAL */
/* Have a monotonic clock from clock_gettime() */
#define MONOTONIC_CLOCK 1
@@ -441,6 +446,4 @@
#include "dix-config-apple-verbatim.h"
#endif
-/* #undef HAVE_AVC_NETLINK_ACQUIRE_FD */
-
#endif /* _DIX_CONFIG_H_ */
Index: xsrc/external/mit/xorg-server/include/xf86Build.h
diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.3 xsrc/external/mit/xorg-server/include/xf86Build.h:1.4
--- xsrc/external/mit/xorg-server/include/xf86Build.h:1.3 Mon Nov 9 07:43:21 2009
+++ xsrc/external/mit/xorg-server/include/xf86Build.h Tue Nov 23 08:16:26 2010
@@ -1,2 +1,2 @@
-#define BUILD_DATE 20091012
-#define BUILD_TIME 1001403
+#define BUILD_DATE 20101123
+#define BUILD_TIME 1013305
Index: xsrc/external/mit/xorg-server/include/xkb-config.h
diff -u xsrc/external/mit/xorg-server/include/xkb-config.h:1.2 xsrc/external/mit/xorg-server/include/xkb-config.h:1.3
--- xsrc/external/mit/xorg-server/include/xkb-config.h:1.2 Sun Aug 3 10:41:55 2008
+++ xsrc/external/mit/xorg-server/include/xkb-config.h Tue Nov 23 08:16:26 2010
@@ -7,12 +7,19 @@
#define _XKB_CONFIG_H_
/* Default set of XKB rules. */
-#define __XKBDEFRULES__ "xorg"
+#define XKB_DFLT_RULES "base"
-/*
- * the following definitions are provided by a combination of
- * bsd.x11.mk and external/mit/xorg/server/xorg-server/xkb/Makefile
- */
+/* Default XKB model. */
+#define XKB_DFLT_MODEL "pc105"
+
+/* Default XKB layout. */
+#define XKB_DFLT_LAYOUT "us"
+
+/* Default XKB variant. */
+#define XKB_DFLT_VARIANT ""
+
+/* Default XKB options. */
+#define XKB_DFLT_OPTIONS ""
/* Path to XKB definitions. */
/* #define XKB_BASE_DIRECTORY "/usr/local/share/X11/xkb" */
Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.9 xsrc/external/mit/xorg-server/include/xorg-config.h:1.10
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.9 Mon Nov 9 07:43:21 2009
+++ xsrc/external/mit/xorg-server/include/xorg-config.h Tue Nov 23 08:16:26 2010
@@ -17,13 +17,13 @@
#define XORGSERVER 1
/* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((5) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((9) * 100000) + ((2) * 1000) + 0)
/* Name of X server. */
#define __XSERVERNAME__ "Xorg"
/* URL to go to for support. */
-#define __VENDORDWEBSUPPORT__ "http://wiki.x.org";
+/* #define __VENDORDWEBSUPPORT__ "http://wiki.x.org"; */
/* Built-in output drivers. */
/* #undef DRIVERS */
@@ -37,6 +37,9 @@
/* Path to configuration file. */
#define __XCONFIGFILE__ "xorg.conf"
+/* Name of configuration directory. */
+#define __XCONFIGDIR__ "xorg.conf.d"
+
/* Path to loadable modules. */
#define DEFAULT_MODULE_PATH "/usr/X11R7/lib/modules"
@@ -52,12 +55,15 @@
/* Build DRI2 extension */
#define DRI2 1
-/* Solaris 8 or later? */
-/* #undef __SOL8__ */
+/* Define to 1 if you have the <stropts.h> header file. */
+/* #undef HAVE_STROPTS_H */
/* Define to 1 if you have the <sys/kd.h> header file. */
/* #undef HAVE_SYS_KD_H */
+/* Define to 1 if you have the <sys/vt.h> header file. */
+/* #undef HAVE_SYS_VT_H */
+
/* Define to 1 if you have the `walkcontext' function (used on Solaris for
xorg_backtrace in hw/xfree86/common/xf86Events.c */
/* #undef HAVE_WALKCONTEXT */
@@ -118,12 +124,27 @@
/* #undef HAVE_EXECINFO_H */
/* Have pci_system_init_dev_mem() */
-/* #undef HAVE_PCI_SYSTEM_INIT_DEV_MEM */
+#define HAVE_PCI_SYSTEM_INIT_DEV_MEM 1
+
+/* Define to 1 if you have the `pci_device_is_boot_vga' function. */
+#define HAVE_PCI_DEVICE_IS_BOOT_VGA 1
/* Have pci_enable_device */
-/* #undef HAVE_PCI_DEVICE_ENABLE */
+#define HAVE_PCI_DEVICE_ENABLE 1
+
+/* Define to 1 if you have the `pci_device_vgaarb_init' function. */
+#define HAVE_PCI_DEVICE_VGAARB_INIT 1
/* Path to text files containing PCI IDs */
-/* #define PCI_TXT_IDS_PATH "" */
+#define PCI_TXT_IDS_PATH ""
+
+/* Use SIGIO handlers for input device events by default */
+#define USE_SIGIO_BY_DEFAULT TRUE
+
+/* Support PC98 */
+/* #undef SUPPORT_PC98 */
+
+/* Build with libdrm support */
+#define WITH_LIBDRM 1
#endif /* _XORG_CONFIG_H_ */
Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.6 xsrc/external/mit/xorg-server/include/xorg-server.h:1.7
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.6 Mon Nov 9 07:43:21 2009
+++ xsrc/external/mit/xorg-server/include/xorg-server.h Tue Nov 23 08:16:26 2010
@@ -101,14 +101,8 @@
/* Support X Input extension */
#define XINPUT 1
-/* Build XKB */
-#define XKB 1
-
-/* Enable XKB per default */
-#define XKB_DFLT_DISABLED 0
-
-/* Build XKB server */
-#define XKB_IN_SERVER 1
+/* XKB default rules */
+#define XKB_DFLT_RULES "base"
/* Support loadable input and output drivers */
/* #undef XLOADABLE */
@@ -126,7 +120,7 @@
/* #undef XORG_RELEASE */
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((5) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((9) * 100000) + ((2) * 1000) + 0)
/* Build Xv Extension */
#define XvExtension 1
@@ -161,9 +155,6 @@
/* Location of configuration file */
#define __XCONFIGFILE__ "xorg.conf"
-/* XKB default rules */
-#define __XKBDEFRULES__ "xorg"
-
/* Name of X server */
#define __XSERVERNAME__ "Xorg"
@@ -178,9 +169,6 @@
/* System is BSD-like */
#define CSRG_BASED 1
-/* Solaris 8 or later? */
-/* #undef __SOL8__ */
-
/* System has PC console */
#define PCCONS_SUPPORT 1
@@ -199,4 +187,7 @@
/* Use libpciaccess */
#define XSERVER_LIBPCIACCESS 1
+/* X Access Control Extension */
+#define XACE 1
+
#endif /* _XORG_SERVER_H_ */
Added files:
Index: xsrc/external/mit/xorg-server/include/version-config.h
diff -u /dev/null xsrc/external/mit/xorg-server/include/version-config.h:1.1
--- /dev/null Tue Nov 23 08:16:26 2010
+++ xsrc/external/mit/xorg-server/include/version-config.h Tue Nov 23 08:16:26 2010
@@ -0,0 +1,17 @@
+/* include/version-config.h. Generated from version-config.h.in by configure. */
+/* version-config.h.in: not generated */
+
+#ifndef VERSION_CONFIG_H
+#define VERSION_CONFIG_H
+
+/* Vendor man version */
+#define VENDOR_MAN_VERSION "Version 1.9.2"
+
+/* Vendor name */
+/* #define VENDOR_NAME "The X.Org Foundation" */
+
+/* Vendor release */
+#define VENDOR_RELEASE (((1) * 10000000) + ((9) * 100000) + ((2) * 1000) + 0)
+
+#endif /* VERSION_CONFIG_H */
+
