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 "[email protected]" */
+#define BUILDERADDR "[email protected]"
/* 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
-
/* Define to 1 if you have the `mkstemp' function. */
#define HAVE_MKSTEMP 1
@@ -184,6 +157,12 @@
/* 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 */
+/* #undef HAVE_SHA1_IN_LIBMD */
+
+/* Define to 1 if you have the `shmctl64' function. */
+/* #undef HAVE_SHMCTL64 */
+
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
@@ -237,6 +216,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
+/* Have /dev/urandom */
+/* #undef HAVE_URANDOM */
+
/* Define to 1 if you have the `vprintf' function. */
#define HAVE_VPRINTF 1
@@ -246,15 +228,9 @@
/* Support os-specific local connections */
/* #undef LOCALCONN */
-/* Support MIT Misc extension */
-#define MITMISC 1
-
/* Support MIT-SHM Extension */
#define MITSHM 1
-/* Disable some debugging code */
-#define NDEBUG 1
-
/* Enable some debugging code */
/* #undef DEBUG */
@@ -266,9 +242,6 @@
/* Internal define for Xinerama */
#define PANORAMIX 1
-/* Support pixmap privates */
-#define PIXPRIV 1
-
/* Overall prefix */
/* #define PROJECTROOT "/usr/local" */
@@ -276,7 +249,7 @@
#define RANDR 1
/* Support Record extension */
-#define XRECORD 1
+/* #undef XRECORD */
/* Support RENDER extension */
#define RENDER 1
@@ -290,26 +263,9 @@
/* Support Secure RPC ("SUN-DES-1") authentication for X11 clients */
/* #undef SECURE_RPC */
-/* Use a lock to prevent multiple servers on a display */
-#define SERVER_LOCK 1
-
/* Support SHAPE extension */
#define SHAPE 1
-/* Include time-based scheduler */
-#define SMART_SCHEDULE 1
-
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
/* Define to 1 on systems derived from System V Release 4 */
/* #undef SVR4 */
@@ -325,38 +281,32 @@
/* Support UNIX socket connections */
#define UNIXCONN 1
-/* Use builtin rgb color database */
-/* #undef USE_RGB_BUILTIN */
-
-/* Use rgb.txt directly */
-#define USE_RGB_TXT 1
-
/* Define to use byteswap macros from <sys/endian.h> */
#define USE_SYS_ENDIAN_H 1
/* unaligned word accesses behave as expected */
/* #undef WORKING_UNALIGNED_INT */
+/* Build X string registry */
+#define XREGISTRY 1
+
/* Build X-ACE extension */
#define XACE 1
+/* Build SELinux extension */
+/* #undef XSELINUX */
+
/* Support XCMisc extension */
#define XCMISC 1
/* Build Security extension */
-#define XCSECURITY 1
+/* #undef XCSECURITY */
/* Support Xdmcp */
#define XDMCP 1
-/* Build XEvIE extension */
-#define XEVIE 1
-
/* Build XFree86 BigFont extension */
-#define XF86BIGFONT 1
-
-/* Support XFree86 miscellaneous extensions */
-#define XF86MISC 1
+/* #undef XF86BIGFONT */
/* Support XFree86 Video Mode extension */
#define XF86VIDMODE 1
@@ -370,9 +320,6 @@
/* Support Xinerama extension */
#define XINERAMA 1
-/* Support X Input extension */
-#define XINPUT 1
-
/* Build XKB */
#define XKB 1
@@ -386,10 +333,10 @@
/* #undef XORG_RELEASE */
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((4) * 100000) + ((2) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((1) * 1000) + 901)
/* Xorg release date */
-#define XORG_DATE "11 June 2008"
+#define XORG_DATE "2009-5-8"
/* Build Xv Extension */
#define XvExtension 1
@@ -397,59 +344,30 @@
/* Build XvMC Extension */
#define XvMCExtension 1
-/* Build XRes extension */
-#define XResExtension 1
-
/* Support XSync extension */
#define XSYNC 1
/* Support XTest extension */
#define XTEST 1
-/* Support XTrap extension */
-#define XTRAP 1
-
/* Support Xv extension */
#define XV 1
-/* Build APPGROUP extension */
-#define XAPPGROUP 1
-
-/* Build TOG-CUP extension */
-#define TOGCUP 1
-
-/* Build Extended-Visual-Information extension */
-#define EVI 1
-
/* Build Multibuffer extension */
/* #undef MULTIBUFFER */
/* Support DRI extension */
#define XF86DRI 1
+/* Build DRI2 extension */
+#define DRI2 1
+
/* Build DBE support */
#define DBE 1
/* Vendor name */
#define XVENDORNAME "The X.Org Foundation"
-/* Endian order */
-#if 0
-#define _X_BYTE_ORDER X_LITTLE_ENDIAN
-/* Deal with multiple architecture compiles on Mac OS X */
-#ifndef __APPLE_CC__
-#define X_BYTE_ORDER _X_BYTE_ORDER
-#else
-#ifdef __BIG_ENDIAN__
-#define X_BYTE_ORDER X_BIG_ENDIAN
-#else
-#define X_BYTE_ORDER X_LITTLE_ENDIAN
-#endif
-#endif
-#else
-#include <X11/Xarch.h>
-#endif
-
/* Enable GNU and other extensions to the C environment for GLIBC */
/* #undef _GNU_SOURCE */
@@ -467,34 +385,26 @@
#define _XSERVER64 1
#endif
-#ifndef RGB_DB
-/* Define to location of RGB database */
-#define RGB_DB "/usr/local/share/X11/rgb"
-#endif
-
/* System is BSD-like */
#define CSRG_BASED 1
/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */
#define BSD44SOCKETS 1
-/* Define to 1 if modules should avoid the libcwrapper */
-#define NO_LIBCWRAPPER 1
-
/* Support D-Bus */
-/* #undef HAVE_DBUS */
+#define HAVE_DBUS 1
+
+/* Use D-Bus for input hotplug */
+#define CONFIG_NEED_DBUS 1
/* Support the D-Bus hotplug API */
/* #undef CONFIG_DBUS_API */
/* Support HAL for hotplug */
-/* #undef CONFIG_HAL */
+#define CONFIG_HAL 1
/* Use only built-in fonts */
-#define BUILTIN_FONTS 1
-
-/* Avoid using font servers */
-/* #undef NOFONTSERVERACCESS */
+/* #undef BUILTIN_FONTS */
/* Use an empty root cursor */
/* #undef NULL_ROOT_CURSOR */
@@ -505,11 +415,6 @@
/* Define to 1 if the DTrace Xserver provider probes should be built in */
/* #undef XSERVER_DTRACE */
-/* Path to XErrorDB file */
-#ifndef XERRORDB_PATH
-#define XERRORDB_PATH "/usr/local/share/X11/XErrorDB"
-#endif
-
/* Define to 16-bit byteswap macro */
#define bswap_16 bswap16
@@ -519,4 +424,23 @@
/* Define to 64-bit byteswap macro */
#define bswap_64 bswap64
+/* Need the strcasecmp function. */
+/* #undef NEED_STRCASECMP */
+
+/* Need the strncasecmp function. */
+/* #undef NEED_STRNCASECMP */
+
+/* Need the strcasestr function. */
+/* #undef NEED_STRCASESTR */
+
+/* Define to 1 if you have the `ffs' function. */
+#define HAVE_FFS 1
+
+/* Correctly set _XSERVER64 for OSX fat binaries */
+#ifdef __APPLE__
+#include "dix-config-apple-verbatim.h"
+#endif
+
+/* #undef HAVE_AVC_NETLINK_ACQUIRE_FD */
+
#endif /* _DIX_CONFIG_H_ */
Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.4 xsrc/external/mit/xorg-server/include/xorg-config.h:1.5
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.4 Sat Sep 13 20:00:09 2008
+++ xsrc/external/mit/xorg-server/include/xorg-config.h Thu Jun 11 04:56:54 2009
@@ -17,13 +17,7 @@
#define XORGSERVER 1
/* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((4) * 100000) + ((2) * 1000) + 0)
-
-/* Need XFree86 libc-replacement typedefs. */
-#define NEED_XF86_TYPES 1
-
-/* Need XFree86 libc-replacement functions. */
-#define NEED_XF86_PROTOTYPES 1
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((1) * 1000) + 901)
/* Name of X server. */
#define __XSERVERNAME__ "Xorg"
@@ -32,10 +26,10 @@
#define __VENDORDWEBSUPPORT__ "http://wiki.x.org";
/* Built-in output drivers. */
-#define DRIVERS {}
+/* #undef DRIVERS */
/* Built-in input drivers. */
-#define IDRIVERS {}
+/* #undef IDRIVERS */
/* Path to configuration file. */
#define XF86CONFIGFILE "xorg.conf"
@@ -55,11 +49,14 @@
/* Building DRI-capable DDX. */
#define XF86DRI 1
+/* Build DRI2 extension */
+#define DRI2 1
+
/* Solaris 8 or later? */
/* #undef __SOL8__ */
-/* Whether to use pixmap privates */
-#define PIXPRIV 1
+/* Define to 1 if you have the <sys/kd.h> header file. */
+/* #undef HAVE_SYS_KD_H */
/* Define to 1 if you have the `walkcontext' function (used on Solaris for
xorg_backtrace in hw/xfree86/common/xf86Events.c */
@@ -120,4 +117,13 @@
/* Have execinfo.h */
/* #undef HAVE_EXECINFO_H */
+/* Have pci_system_init_dev_mem() */
+/* #undef HAVE_PCI_SYSTEM_INIT_DEV_MEM */
+
+/* Have pci_enable_device */
+/* #undef HAVE_PCI_DEVICE_ENABLE */
+
+/* Path to text files containing PCI IDs */
+/* #define PCI_TXT_IDS_PATH "" */
+
#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.2 xsrc/external/mit/xorg-server/include/xorg-server.h:1.3
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.2 Thu Aug 28 07:26:09 2008
+++ xsrc/external/mit/xorg-server/include/xorg-server.h Thu Jun 11 04:56:54 2009
@@ -26,20 +26,11 @@
/* Support Composite Extension */
#define COMPOSITE 1
-/* Use OsVendorInit */
-#define DDXOSINIT 1
-
/* Build DPMS extension */
#define DPMSExtension 1
-/* Built-in output drivers */
-#define DRIVERS {}
-
/* Build GLX extension */
-/* #undef GLXEXT */
-
-/* Include handhelds.org h3600 touchscreen driver */
-/* #undef H3600_TS */
+#define GLXEXT 1
/* Support XDM-AUTH*-1 */
#define HASXDMAUTH 1
@@ -47,33 +38,15 @@
/* Support SHM */
#define HAS_SHM 1
-/* Built-in input drivers */
-#define IDRIVERS {}
-
/* Support IPv6 for TCP connections */
#define IPv6 1
-/* Support MIT Misc extension */
-#define MITMISC 1
-
/* Support MIT-SHM Extension */
#define MITSHM 1
-/* Disable some debugging code */
-#define NDEBUG 1
-
-/* Need XFree86 helper functions */
-#define NEED_XF86_PROTOTYPES 1
-
-/* Need XFree86 typedefs */
-#define NEED_XF86_TYPES 1
-
/* Internal define for Xinerama */
#define PANORAMIX 1
-/* Support pixmap privates */
-#define PIXPRIV 1
-
/* Support RANDR extension */
#define RANDR 1
@@ -86,15 +59,9 @@
/* Support MIT-SCREEN-SAVER extension */
#define SCREENSAVER 1
-/* Use a lock to prevent multiple servers on a display */
-#define SERVER_LOCK 1
-
/* Support SHAPE extension */
#define SHAPE 1
-/* Include time-based scheduler */
-#define SMART_SCHEDULE 1
-
/* Define to 1 on systems derived from System V Release 4 */
/* #undef SVR4 */
@@ -110,12 +77,6 @@
/* Support UNIX socket connections */
#define UNIXCONN 1
-/* Use builtin rgb color database */
-/* #undef USE_RGB_BUILTIN */
-
-/* Use rgb.txt directly */
-#define USE_RGB_TXT 1
-
/* unaligned word accesses behave as expected */
/* #undef WORKING_UNALIGNED_INT */
@@ -126,10 +87,7 @@
#define XDMCP 1
/* Build XFree86 BigFont extension */
-#define XF86BIGFONT 1
-
-/* Support XFree86 miscellaneous extensions */
-#define XF86MISC 1
+/* #undef XF86BIGFONT */
/* Support XFree86 Video Mode extension */
#define XF86VIDMODE 1
@@ -158,6 +116,9 @@
/* Build DRI extension */
#define XF86DRI 1
+/* Build DRI2 extension */
+#define DRI2 1
+
/* Build Xorg server */
#define XORGSERVER 1
@@ -165,7 +126,7 @@
/* #undef XORG_RELEASE */
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((4) * 100000) + ((2) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((1) * 1000) + 901)
/* Build Xv Extension */
#define XvExtension 1
@@ -173,46 +134,18 @@
/* Build XvMC Extension */
#define XvMCExtension 1
-/* Build XRes extension */
-#define XResExtension 1
-
/* Support XSync extension */
#define XSYNC 1
/* Support XTest extension */
#define XTEST 1
-/* Support XTrap extension */
-#define XTRAP 1
-
/* Support Xv Extension */
#define XV 1
/* Vendor name */
#define XVENDORNAME "The X.Org Foundation"
-#ifdef __NetBSD__
-#include <sys/endian.h>
-#if _BYTE_ORDER == _BIG_ENDIAN
-#define _X_BYTE_ORDER X_BIG_ENDIAN
-#else
-#define _X_BYTE_ORDER X_LITTLE_ENDIAN
-#endif
-#else
-/* Endian order */
-#define _X_BYTE_ORDER X_LITTLE_ENDIAN
-/* Deal with multiple architecture compiles on Mac OS X */
-#ifndef __APPLE_CC__
-#define X_BYTE_ORDER _X_BYTE_ORDER
-#else
-#ifdef __BIG_ENDIAN__
-#define X_BYTE_ORDER X_BIG_ENDIAN
-#else
-#define X_BYTE_ORDER X_LITTLE_ENDIAN
-#endif
-#endif
-#endif
-
/* BSD-compliant source */
/* #undef _BSD_SOURCE */
@@ -263,4 +196,7 @@
/* Loadable XFree86 server awesomeness */
#define XFree86LOADER 1
+/* Use libpciaccess */
+#define XSERVER_LIBPCIACCESS 1
+
#endif /* _XORG_SERVER_H_ */
