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 "[email protected]" */
/* 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) * 10000000) + ((6) * 100000) + ((1) * 1000) + 901)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((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 000000
+#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) * 10000000) + ((6) * 100000) + ((1) * 1000) + 901)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((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) * 10000000) + ((6) * 100000) + ((1) * 1000) + 901)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((6) * 100000) + ((2) * 1000) + 0)
/* Build Xv Extension */
#define XvExtension 1
