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 "[email protected]" */
+/* #define BUILDERADDR "[email protected]" */
/* 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 <asm/mtrr.h> 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 <byteswap.h> 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 <dbm.h> 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 <dirent.h> header file, and it defines `DIR'.
*/
#define HAVE_DIRENT_H 1
@@ -98,23 +86,29 @@
/* Define to 1 if you have the <dlfcn.h> 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 <fcntl.h> 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 `getpeereid' function. */
+#define HAVE_GETPEEREID 1
-/* Define to 1 if you have the `getisax' function. */
-/* #undef HAVE_GETISAX */
+/* Define to 1 if you have the `getpeerucred' function. */
+/* #undef HAVE_GETPEERUCRED */
-/* Define to 1 if you have the `getuid' function. */
-#define HAVE_GETUID 1
+/* Define to 1 if you have the `getprogname' function. */
+#define HAVE_GETPROGNAME 1
/* Define to 1 if you have the `getzoneid' function. */
/* #undef HAVE_GETZONEID */
@@ -128,8 +122,8 @@
/* Support application updating through sparkle. */
/* #undef XQUARTZ_SPARKLE */
-/* Prefix to use for launchd identifiers */
-#define LAUNCHD_ID_PREFIX "org.x"
+/* Prefix to use for bundle identifiers */
+#define BUNDLE_ID_PREFIX ""
/* Build a standalone xpbproxy */
/* #undef STANDALONE_XPBPROXY */
@@ -137,8 +131,8 @@
/* Define to 1 if you have the `m' library (-lm). */
#define HAVE_LIBM 1
-/* Define to 1 if you have the `link' function. */
-#define HAVE_LINK 1
+/* Define to 1 if you have the libdispatch (GCD) available */
+/* #undef HAVE_LIBDISPATCH */
/* Define to 1 if you have the <linux/agpgart.h> header file. */
/* #undef HAVE_LINUX_AGPGART_H */
@@ -149,8 +143,8 @@
/* Define to 1 if you have the <linux/fb.h> header file. */
/* #undef HAVE_LINUX_FB_H */
-/* Define to 1 if you have the `mkstemp' function. */
-#define HAVE_MKSTEMP 1
+/* Define to 1 if you have the `mmap' function. */
+#define HAVE_MMAP 1
/* Define to 1 if you have the <ndbm.h> header file. */
#define HAVE_NDBM_H 1
@@ -158,6 +152,9 @@
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
/* #undef HAVE_NDIR_H */
+/* Define to 1 if you have the `reallocarray' function. */
+/* #undef HAVE_REALLOCARRAY */
+
/* Define to 1 if you have the <rpcsvc/dbm.h> header file. */
/* #undef HAVE_RPCSVC_DBM_H */
@@ -167,26 +164,41 @@
/* Define to use CommonCrypto SHA1 functions */
/* #undef HAVE_SHA1_IN_COMMONCRYPTO */
+/* Define to use CryptoAPI SHA1 functions */
+/* #undef HAVE_SHA1_IN_CRYPTOAPI */
+
/* 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 libnettle SHA1 functions */
+/* #undef HAVE_SHA1_IN_LIBNETTLE */
+
/* Define to use libsha1 for SHA1 */
/* #undef HAVE_SHA1_IN_LIBSHA1 */
/* 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
-
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
-/* Define to 1 if you have the `strchr' function. */
-#define HAVE_STRCHR 1
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the `strcasestr' function. */
+#define HAVE_STRCASESTR 1
+
+/* Define to 1 if you have the `strncasecmp' function. */
+#define HAVE_STRNCASECMP 1
+
+/* Define to 1 if you have the `strlcat' function. */
+#define HAVE_STRLCAT 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+#define HAVE_STRLCPY 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
@@ -194,11 +206,11 @@
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
-/* Define to 1 if you have the `strrchr' function. */
-#define HAVE_STRRCHR 1
+/* Define to 1 if you have the `strndup' function. */
+#define HAVE_STRNDUP 1
-/* Define to 1 if you have the `strtol' function. */
-#define HAVE_STRTOL 1
+/* Define to 1 if libsystemd-daemon is available */
+/* #undef HAVE_SYSTEMD_DAEMON */
/* Define to 1 if SYSV IPC is available */
#define HAVE_SYSV_IPC 1
@@ -210,9 +222,6 @@
*/
/* #undef HAVE_SYS_DIR_H */
-/* Define to 1 if you have the <sys/io.h> header file. */
-/* #undef HAVE_SYS_IO_H */
-
/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
*/
/* #undef HAVE_SYS_NDIR_H */
@@ -226,9 +235,6 @@
/* 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 */
-
/* Define to 1 if you have the <tslib.h> header file. */
/* #undef HAVE_TSLIB_H */
@@ -241,9 +247,6 @@
/* Have /dev/urandom */
/* #undef HAVE_URANDOM */
-/* 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
@@ -260,15 +263,16 @@
/* #undef DEBUG */
/* Name of package */
-#ifndef PACKAGE
#define PACKAGE "xorg-server"
-#endif
/* Internal define for Xinerama */
#define PANORAMIX 1
+/* Support Present extension */
+#define PRESENT 1
+
/* Overall prefix */
-/* #define PROJECTROOT "/usr/local" */
+/* #define PROJECTROOT "/usr/X11R7" */
/* Support RANDR extension */
#define RANDR 1
@@ -282,6 +286,9 @@
/* Support X resource extension */
#define RES 1
+/* Support client ID tracking in X resource extension */
+#define CLIENTIDS 1
+
/* Support MIT-SCREEN-SAVER extension */
#define SCREENSAVER 1
@@ -291,15 +298,18 @@
/* Support SHAPE extension */
#define SHAPE 1
+/* Where to install Xorg.bin and Xorg.wrap */
+/* #undef SUID_WRAPPER_DIR */
+
/* Define to 1 on systems derived from System V Release 4 */
/* #undef SVR4 */
+/* sysconfdir */
+#define SYSCONFDIR "/usr/X11R7/etc"
+
/* Support TCP socket connections */
#define TCPCONN 1
-/* Enable touchscreen support */
-/* #undef TOUCHSCREEN */
-
/* Support tslib touchscreen abstraction library */
/* #undef TSLIB */
@@ -313,7 +323,7 @@
/* #undef WORKING_UNALIGNED_INT */
/* Build X string registry */
-#define XREGISTRY 1
+/* #undef XREGISTRY */
/* Build X-ACE extension */
#define XACE 1
@@ -349,10 +359,10 @@
/* #undef XORG_RELEASE */
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((10) * 100000) + ((6) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((18) * 100000) + ((4) * 1000) + 0)
/* Xorg release date */
-#define XORG_DATE "2011-07-08"
+#define XORG_DATE "2016-07-19"
/* Build Xv Extension */
#define XvExtension 1
@@ -381,8 +391,14 @@
/* Vendor name */
#define XVENDORNAME "The X.Org Foundation"
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
/* Enable GNU and other extensions to the C environment for GLIBC */
-/* #undef _GNU_SOURCE */
+#define _GNU_SOURCE 1
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
@@ -410,15 +426,24 @@
/* Use libudev for input hotplug */
/* #undef CONFIG_UDEV */
-/* Use D-Bus for input hotplug */
-/* #undef CONFIG_NEED_DBUS */
+/* Use libudev for kms enumeration */
+/* #undef CONFIG_UDEV_KMS */
+
+/* Use udev_monitor_filter_add_match_tag() */
+/* #undef HAVE_UDEV_MONITOR_FILTER_ADD_MATCH_TAG */
-/* Support the D-Bus hotplug API */
-/* #undef CONFIG_DBUS_API */
+/* Use udev_enumerate_add_match_tag() */
+/* #undef HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG */
+
+/* Enable D-Bus core */
+/* #undef NEED_DBUS */
/* Support HAL for hotplug */
/* #undef CONFIG_HAL */
+/* Enable systemd-logind integration */
+/* #undef SYSTEMD_LOGIND */
+
/* Have a monotonic clock from clock_gettime() */
#define MONOTONIC_CLOCK 1
@@ -434,24 +459,75 @@
/* Define to 64-bit byteswap macro */
#define bswap_64 bswap64
-/* Need the strcasecmp function. */
-/* #undef NEED_STRCASECMP */
-
-/* Need the strncasecmp function. */
-/* #undef NEED_STRNCASECMP */
+/* Define to 1 if typeof works with your compiler. */
+#define HAVE_TYPEOF 1
-/* Need the strcasestr function. */
-/* #undef NEED_STRCASESTR */
-
-/* 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 */
+/* Define to __typeof__ if your compiler spells it that way. */
+/* #undef typeof */
/* Correctly set _XSERVER64 for OSX fat binaries */
#ifdef __APPLE__
#include "dix-config-apple-verbatim.h"
#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+/* Defined if needed to expose struct msghdr.msg_control */
+/* #undef _XOPEN_SOURCE */
+
+/* Have support for X shared memory fence library (xshmfence) */
+#define HAVE_XSHMFENCE 1
+
+/* Use XTrans FD passing support */
+#define XTRANS_SEND_FDS 1
+
+/* 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 1
+
+/* Don't let XIproto define 'Pointer' */
+#define _XITYPEDEF_POINTER 1
+
+/* Ask fontsproto to make font path element names const */
+#define FONT_PATH_ELEMENT_NAME_CONST 1
+
+#if 0 /* not yet! */
+/* Build GLAMOR */
+#define GLAMOR 1
+
+/* Build glamor's GBM-based EGL support */
+#define GLAMOR_HAS_GBM 1
+
+/* Build glamor/gbm has linear support */
+#define GLAMOR_HAS_GBM_LINEAR 1
+#endif
+
+#if 0
+/* byte order */
+#define X_BYTE_ORDER X_LITTLE_ENDIAN
+#endif
+
+/* Listen on TCP socket */
+/* #undef LISTEN_TCP */
+
+/* Listen on Unix socket */
+#define LISTEN_UNIX 1
+
+/* Listen on local socket */
+#define LISTEN_LOCAL 1
+
+/* Define if no local socket credentials interface exists */
+/* #undef NO_LOCAL_CLIENT_CRED */
+
+/* Have posix_fallocate() */
+#define HAVE_POSIX_FALLOCATE 1
+
#endif /* _DIX_CONFIG_H_ */
Index: xsrc/external/mit/xorg-server/include/version-config.h
diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.4 xsrc/external/mit/xorg-server/include/version-config.h:1.5
--- xsrc/external/mit/xorg-server/include/version-config.h:1.4 Mon Jun 3 08:57:43 2013
+++ xsrc/external/mit/xorg-server/include/version-config.h Sun Aug 14 03:44:46 2016
@@ -5,13 +5,13 @@
#define VERSION_CONFIG_H
/* Vendor man version */
-#define VENDOR_MAN_VERSION "Version 1.10.6"
+#define VENDOR_MAN_VERSION "Version 1.18.4"
/* Vendor name */
/* #define VENDOR_NAME "The X.Org Foundation" */
/* Vendor release */
-#define VENDOR_RELEASE (((1) * 10000000) + ((10) * 100000) + ((6) * 1000) + 0)
+#define VENDOR_RELEASE (((1) * 10000000) + ((18) * 100000) + ((4) * 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.6 xsrc/external/mit/xorg-server/include/xf86Build.h:1.7
--- xsrc/external/mit/xorg-server/include/xf86Build.h:1.6 Tue Aug 2 07:22:05 2011
+++ xsrc/external/mit/xorg-server/include/xf86Build.h Sun Aug 14 03:44:46 2016
@@ -1,2 +1,2 @@
-#define BUILD_DATE 20110801
-#define BUILD_TIME 1010100
+#define BUILD_DATE 20160814
+#define BUILD_TIME 1012929
Index: xsrc/external/mit/xorg-server/include/xkb-config.h
diff -u xsrc/external/mit/xorg-server/include/xkb-config.h:1.3 xsrc/external/mit/xorg-server/include/xkb-config.h:1.4
--- xsrc/external/mit/xorg-server/include/xkb-config.h:1.3 Tue Nov 23 08:16:26 2010
+++ xsrc/external/mit/xorg-server/include/xkb-config.h Sun Aug 14 03:44:46 2016
@@ -22,15 +22,12 @@
#define XKB_DFLT_OPTIONS ""
/* Path to XKB definitions. */
-/* #define XKB_BASE_DIRECTORY "/usr/local/share/X11/xkb" */
+/* #define XKB_BASE_DIRECTORY "/usr/pkg/share/X11/xkb" */
/* Path to xkbcomp. */
-/* #define XKB_BIN_DIRECTORY "/usr/local/bin" */
+/* #define XKB_BIN_DIRECTORY "/usr/pkg/bin" */
/* XKB output dir for compiled keymaps. */
-/* #define XKM_OUTPUT_DIR "/usr/local/share/X11/xkb/compiled/" */
-
-/* Do not have `strcasecmp'. */
-/* #undef NEED_STRCASECMP */
+/* #define XKM_OUTPUT_DIR "/var/db/xkb/" */
#endif /* _XKB_CONFIG_H_ */
Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.13 xsrc/external/mit/xorg-server/include/xorg-config.h:1.14
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.13 Mon Jun 3 08:57:43 2013
+++ xsrc/external/mit/xorg-server/include/xorg-config.h Sun Aug 14 03:44:46 2016
@@ -17,7 +17,7 @@
#define XORGSERVER 1
/* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((10) * 100000) + ((6) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((18) * 100000) + ((4) * 1000) + 0)
/* Name of X server. */
#define __XSERVERNAME__ "Xorg"
@@ -41,13 +41,22 @@
#define __XCONFIGDIR__ "xorg.conf.d"
/* Path to loadable modules. */
-#define DEFAULT_MODULE_PATH "/usr/X11R7/lib/modules"
+/* #define DEFAULT_MODULE_PATH "/usr/X11R7/lib/xorg/modules" */
/* Path to installed libraries. */
-#define DEFAULT_LIBRARY_PATH "/usr/X11R7/lib"
+/* #define DEFAULT_LIBRARY_PATH "/usr/X11R7/lib" */
-/* Path to server log file. */
-#define DEFAULT_LOGPREFIX "/var/log/Xorg."
+/* Default log location */
+#define DEFAULT_LOGDIR "/var/log"
+
+/* Default logfile prefix */
+#define DEFAULT_LOGPREFIX "Xorg."
+
+/* Default XDG_DATA dir under HOME */
+#define DEFAULT_XDG_DATA_HOME ".local/share"
+
+/* Default log dir under XDG_DATA_HOME */
+#define DEFAULT_XDG_DATA_HOME_LOGDIR "xorg"
/* Building DRI-capable DDX. */
#define XF86DRI 1
@@ -68,20 +77,12 @@
xorg_backtrace in hw/xfree86/common/xf86Events.c */
/* #undef HAVE_WALKCONTEXT */
-#if defined(_LP64)
/* Define to 1 if unsigned long is 64 bits. */
-#define _XSERVER64 1
-#endif
+/* #undef _XSERVER64 */
/* Building vgahw module */
#define WITH_VGAHW 1
-/* Define to 1 if NetBSD built-in MTRR support is available */
-#define HAS_MTRR_BUILTIN 1
-
-/* Define to 1 if BSD MTRR support is available */
-/* #undef HAS_MTRR_SUPPORT */
-
/* NetBSD PIO alpha IO */
/* #undef USE_ALPHA_PIO */
@@ -91,10 +92,8 @@
/* BSD /dev/io */
/* #undef USE_DEV_IO */
-#if defined(__i386__) || defined(__x86_64__)
/* BSD i386 iopl */
#define USE_I386_IOPL 1
-#endif
/* System is BSD-like */
#define CSRG_BASED 1
@@ -123,17 +122,8 @@
/* Have execinfo.h */
/* #undef HAVE_EXECINFO_H */
-/* 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 */
-#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
+/* Define to 1 if you have the <sys/mkdev.h> header file. */
+/* #undef HAVE_SYS_MKDEV_H */
/* Path to text files containing PCI IDs */
#define PCI_TXT_IDS_PATH ""
@@ -141,10 +131,25 @@
/* 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
+/* Use libpciaccess */
+#define XSERVER_LIBPCIACCESS 1
+
+/* Have setugid */
+#define HAVE_ISSETUGID 1
+
+/* Have getresuid */
+/* #undef HAVE_GETRESUID */
+
+/* Have X server platform bus support */
+/* #undef XSERVER_PLATFORM_BUS */
+
+/* Define to 1 if you have the `seteuid' function. */
+#define HAVE_SETEUID 1
+
+/* Support APM/ACPI power management in the server */
+/* #undef XF86PM */
+
#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.11 xsrc/external/mit/xorg-server/include/xorg-server.h:1.12
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.11 Mon Jun 3 08:57:43 2013
+++ xsrc/external/mit/xorg-server/include/xorg-server.h Sun Aug 14 03:44:46 2016
@@ -17,11 +17,15 @@
#ifndef _XORG_SERVER_H_
#define _XORG_SERVER_H_
+#ifdef HAVE_XORG_CONFIG_H
+#error Include xorg-config.h when building the X server
+#endif
+
/* Support BigRequests extension */
#define BIGREQS 1
/* 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/pkg/share/fonts/X11/misc,/usr/pkg/share/fonts/X11/TTF,/usr/pkg/share/fonts/X11/OTF,/usr/pkg/share/fonts/X11/Type1,/usr/pkg/share/fonts/X11/100dpi,/usr/pkg/share/fonts/X11/75dpi,/usr/pkg/share/fonts/X11/cyrillic,/usr/pkg/lib/X11/fonts/misc,/usr/pkg/lib/X11/fonts/TTF,/usr/pkg/lib/X11/fonts/OTF,/usr/pkg/lib/X11/fonts/Type1,/usr/pkg/lib/X11/fonts/100dpi,/usr/pkg/lib/X11/fonts/75dpi,/usr/pkg/lib/X11/fonts/cyrillic" */
/* Support Composite Extension */
#define COMPOSITE 1
@@ -29,6 +33,9 @@
/* Build DPMS extension */
#define DPMSExtension 1
+/* Build DRI3 extension */
+#define DRI3 1
+
/* Build GLX extension */
#define GLXEXT 1
@@ -38,6 +45,30 @@
/* Support SHM */
#define HAS_SHM 1
+/* Define to 1 if you have the `ffs' function. */
+#define HAVE_FFS 1
+
+/* Define to 1 if you have the `reallocarray' function. */
+/* #undef HAVE_REALLOCARRAY */
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the `strcasestr' function. */
+#define HAVE_STRCASESTR 1
+
+/* Define to 1 if you have the `strlcat' function. */
+#define HAVE_STRLCAT 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+#define HAVE_STRLCPY 1
+
+/* Define to 1 if you have the `strncasecmp' function. */
+#define HAVE_STRNCASECMP 1
+
+/* Define to 1 if you have the `strndup' function. */
+#define HAVE_STRNDUP 1
+
/* Support IPv6 for TCP connections */
#define IPv6 1
@@ -47,6 +78,9 @@
/* Internal define for Xinerama */
#define PANORAMIX 1
+/* Support Present extension */
+#define PRESENT 1
+
/* Support RANDR extension */
#define RANDR 1
@@ -68,9 +102,6 @@
/* Support TCP socket connections */
#define TCPCONN 1
-/* Enable touchscreen support */
-/* #undef TOUCHSCREEN */
-
/* Support tslib touchscreen abstraction library */
/* #undef TSLIB */
@@ -120,7 +151,7 @@
/* #undef XORG_RELEASE */
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((10) * 100000) + ((6) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((18) * 100000) + ((4) * 1000) + 0)
/* Build Xv Extension */
#define XvExtension 1
@@ -177,7 +208,7 @@
#define WSCONS_SUPPORT 1
/* Loadable XFree86 server awesomeness */
-#define XFree86LOADER 1
+#define XFree86LOADER
/* Use libpciaccess */
#define XSERVER_LIBPCIACCESS 1
@@ -185,8 +216,25 @@
/* X Access Control Extension */
#define XACE 1
+/* Have X server platform bus support */
+/* #undef XSERVER_PLATFORM_BUS */
+
#ifdef _LP64
#define _XSERVER64 1
#endif
+/* Have support for X shared memory fence library (xshmfence) */
+#define HAVE_XSHMFENCE 1
+
+/* Use XTrans FD passing support */
+#define XTRANS_SEND_FDS 1
+
+/* Ask fontsproto to make font path element names const */
+#define FONT_PATH_ELEMENT_NAME_CONST 1
+
+#if 0
+/* byte order */
+#define X_BYTE_ORDER X_LITTLE_ENDIAN
+#endif
+
#endif /* _XORG_SERVER_H_ */
