[xsrc/trunk]: xsrc/external/mit/xorg-server/include update these for xorg-ser...

To: source-changes-hg%NetBSD.org@localhost
Subject: [xsrc/trunk]: xsrc/external/mit/xorg-server/include update these for xorg-ser...
From: mrg <mrg%NetBSD.org@localhost>
Date: Fri, 15 Jul 2022 04:33:01 +0000
details:   https://anonhg.NetBSD.org/xsrc/rev/439bcf6c1bd5
branches:  trunk
changeset: 7102:439bcf6c1bd5
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jul 15 04:10:54 2022 +0000

description:
update these for xorg-server 21.1.3.

diffstat:

 external/mit/xorg-server/include/dix-config.h     |  45 +++++++++++++---------
 external/mit/xorg-server/include/version-config.h |   6 +-
 external/mit/xorg-server/include/xf86Build.h      |   2 -
 external/mit/xorg-server/include/xorg-config.h    |   7 +--
 external/mit/xorg-server/include/xorg-server.h    |  14 +++---
 5 files changed, 38 insertions(+), 36 deletions(-)

diffs (242 lines):

diff -r e836ad93635a -r 439bcf6c1bd5 external/mit/xorg-server/include/dix-config.h
--- a/external/mit/xorg-server/include/dix-config.h     Fri Jul 15 04:10:41 2022 +0000
+++ b/external/mit/xorg-server/include/dix-config.h     Fri Jul 15 04:10:54 2022 +0000
@@ -8,19 +8,13 @@
 #define BIGREQS 1
 
 /* Builder address */
-/* #define BUILDERADDR "tech-x11%NetBSD.org@localhost" */
-
-/* Operating System Name */
-/* #define OSNAME "NetBSD-8.99.28-x86_64" */
-
-/* Operating System Vendor */
-/* #define OSVENDOR "The NetBSD Foundation" */
+#define BUILDERADDR "tech-x11%NetBSD.org@localhost"
 
 /* Builder string */
 #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/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/" */
 
 /* Miscellaneous server configuration files path */
 #define SERVER_MISC_CONFIG_PATH "/usr/X11R7/lib/xorg"
@@ -151,7 +145,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
@@ -272,7 +266,9 @@
 #endif
 
 /* Overall prefix */
-/* #define PROJECTROOT "/usr/X11R7" */
+#if 0
+#define PROJECTROOT "/usr/X11R7"
+#endif
 
 /* Support RANDR extension */
 #define RANDR 1
@@ -336,16 +332,16 @@
 /* Build XFree86 BigFont extension */
 /* #undef XF86BIGFONT */
 
+/* Support XFree86 Video Mode extension */
 #if 0
-/* Support XFree86 Video Mode extension */
 #define XF86VIDMODE 1
 #endif
 
 /* Support XFixes extension */
 #define XFIXES 1
 
+/* Build XDGA support */
 #if 0
-/* Build XDGA support */
 #define XFreeXDGA 1
 #endif
 
@@ -353,7 +349,7 @@
 #define XINERAMA 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((20) * 100000) + ((13) * 1000) + 0)
+#define XORG_VERSION_CURRENT ((10000000) + ((21) * 100000) + ((1) * 1000) + 3)
 
 /* Build Xv Extension */
 #define XvExtension 1
@@ -472,7 +468,7 @@
 #define BUSFAULT 1
 
 /* Don't let Xdefs.h define 'pointer' */
-#define _XTYPEDEF_POINTER
+#define _XTYPEDEF_POINTER       1
 
 /* Don't let XIproto define 'Pointer' */
 #define _XITYPEDEF_POINTER      1
@@ -490,17 +486,22 @@
 #define GLAMOR_HAS_GBM_LINEAR 1
 
 /* GBM has modifiers support */
-/* #undef GBM_BO_WITH_MODIFIERS */
+#if 0
+#define GBM_BO_WITH_MODIFIERS 1
+#endif
 
-/* XXXMRG check this and query driver */
 /* Glamor can use eglQueryDmaBuf* functions */
-/* #undef GLAMOR_HAS_EGL_QUERY_DMABUF */
+#if 0
+#define GLAMOR_HAS_EGL_QUERY_DMABUF 1
+#endif
 
 /* Glamor can use EGL_MESA_query_driver functions */
-/* #undef GLAMOR_HAS_EGL_QUERY_DRIVER */
+#if 0
+#define GLAMOR_HAS_EGL_QUERY_DRIVER 1
+#endif
 
+/* byte order */
 #if 0
-/* byte order */
 #define X_BYTE_ORDER X_LITTLE_ENDIAN
 #endif
 
@@ -531,6 +532,12 @@
 /* Have epoll_create1() */
 /* #undef HAVE_EPOLL_CREATE1 */
 
+/* Have <sys/sysmacros.h> header */
+/* #undef HAVE_SYS_SYSMACROS_H */
+
+/* Have sigprocmask */
+#define HAVE_SIGPROCMASK 1
+
 /* Have isastream */
 /* #undef HAVE_ISASTREAM */
 
diff -r e836ad93635a -r 439bcf6c1bd5 external/mit/xorg-server/include/version-config.h
--- a/external/mit/xorg-server/include/version-config.h Fri Jul 15 04:10:41 2022 +0000
+++ b/external/mit/xorg-server/include/version-config.h Fri Jul 15 04:10:54 2022 +0000
@@ -5,13 +5,13 @@
 #define VERSION_CONFIG_H
 
 /* Vendor man version */
-#define VENDOR_MAN_VERSION "Version 1.20.13"
+#define VENDOR_MAN_VERSION "Version 21.1.3"
 
 /* Vendor name */
-/* #define VENDOR_NAME "The X.Org Foundation" */
+#define VENDOR_NAME "The X.Org Foundation"
 
 /* Vendor release */
-#define VENDOR_RELEASE (((1) * 10000000) + ((20) * 100000) + ((13) * 1000) + 0)
+#define VENDOR_RELEASE ((10000000) + ((21) * 100000) + ((1) * 1000) + 3)
 
 #endif /* VERSION_CONFIG_H */
 
diff -r e836ad93635a -r 439bcf6c1bd5 external/mit/xorg-server/include/xf86Build.h
--- a/external/mit/xorg-server/include/xf86Build.h      Fri Jul 15 04:10:41 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#define BUILD_DATE 20210823
-#define BUILD_TIME 232323
diff -r e836ad93635a -r 439bcf6c1bd5 external/mit/xorg-server/include/xorg-config.h
--- a/external/mit/xorg-server/include/xorg-config.h    Fri Jul 15 04:10:41 2022 +0000
+++ b/external/mit/xorg-server/include/xorg-config.h    Fri Jul 15 04:10:54 2022 +0000
@@ -17,7 +17,7 @@
 #define XORGSERVER 1
 
 /* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((20) * 100000) + ((13) * 1000) + 0)
+#define XORG_VERSION_CURRENT ((10000000) + ((21) * 100000) + ((1) * 1000) + 3)
 
 /* Name of X server. */
 #define __XSERVERNAME__ "Xorg"
@@ -44,7 +44,7 @@
 /* #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" */
 
 /* Default log location */
 #define DEFAULT_LOGDIR "/var/log"
@@ -151,9 +151,6 @@
 /* Define to 1 if you have the `seteuid' function. */
 #define HAVE_SETEUID 1
 
-/* Support APM/ACPI power management in the server */
-/* #undef XF86PM */
-
 /* Fallback input driver if the assigned driver fails */
 #define FALLBACK_INPUT_DRIVER ""
 
diff -r e836ad93635a -r 439bcf6c1bd5 external/mit/xorg-server/include/xorg-server.h
--- a/external/mit/xorg-server/include/xorg-server.h    Fri Jul 15 04:10:41 2022 +0000
+++ b/external/mit/xorg-server/include/xorg-server.h    Fri Jul 15 04:10:54 2022 +0000
@@ -25,7 +25,7 @@
 #define BIGREQS 1
 
 /* 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/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/" */
 
 /* Support Composite Extension */
 #define COMPOSITE 1
@@ -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
@@ -75,8 +75,8 @@
 /* Internal define for Xinerama */
 #define PANORAMIX 1
 
+/* Support Present extension */
 #if 0
-/* Support Present extension */
 #define PRESENT 1
 #endif
 
@@ -140,7 +140,7 @@
 #define XORGSERVER 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((20) * 100000) + ((13) * 1000) + 0)
+#define XORG_VERSION_CURRENT ((10000000) + ((21) * 100000) + ((1) * 1000) + 3)
 
 /* Build Xv Extension */
 #define XvExtension 1
@@ -196,9 +196,9 @@
 /* System has wscons console */
 #define WSCONS_SUPPORT 1
 
+/* Loadable XFree86 server awesomeness */
 #if 0
-/* Loadable XFree86 server awesomeness */
-#define XFree86LOADER
+#define XFree86LOADER 1
 
 /* Use libpciaccess */
 #define XSERVER_LIBPCIACCESS 1
@@ -223,8 +223,8 @@
 /* Ask fontsproto to make font path element names const */
 #define FONT_PATH_ELEMENT_NAME_CONST    1
 
+/* byte order */
 #if 0
-/* byte order */
 #define X_BYTE_ORDER X_LITTLE_ENDIAN
 #endif
Prev by Date: [xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/xfree86/common fix merge ...
Next by Date: [xsrc/trunk]: xsrc/external/mit various updates to build against xorg-server ...
Previous by Thread: [xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/xfree86/common fix merge ...
Next by Thread: [xsrc/trunk]: xsrc/external/mit various updates to build against xorg-server ...
Indexes:
Home | Main Index | Thread Index | Old Index