Update to xserver 1.18.3. Tested by shadchin@ and naddy@.

Note that indirect GLX is now disbled by default.

5 files changed, 17 insertions, 34 deletions

diff --git a/xserver/doc/Makefile.in b/xserver/doc/Makefile.in
index 4d358b6fa..b2844e15b 100644
--- a/xserver/doc/Makefile.in
+++ b/xserver/doc/Makefile.in
@@ -76,8 +76,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/xorg-tls.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -244,7 +243,6 @@ GLAMOR_LIBS = @GLAMOR_LIBS@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
 GLX_DEFINES = @GLX_DEFINES@
 GLX_SYS_LIBS = @GLX_SYS_LIBS@
-GLX_TLS = @GLX_TLS@
 GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 GREP = @GREP@
@@ -374,8 +372,6 @@ XEPHYR_INCS = @XEPHYR_INCS@
 XEPHYR_LIBS = @XEPHYR_LIBS@
 XF86CONFIGDIR = @XF86CONFIGDIR@
 XF86CONFIGFILE = @XF86CONFIGFILE@
-XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
-XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
 XKB_BASE_DIRECTORY = @XKB_BASE_DIRECTORY@
 XKB_BIN_DIRECTORY = @XKB_BIN_DIRECTORY@
 XKB_COMPILED_DIR = @XKB_COMPILED_DIR@
diff --git a/xserver/doc/Xinput.xml b/xserver/doc/Xinput.xml
index 7f576a135..083b10908 100644
--- a/xserver/doc/Xinput.xml
+++ b/xserver/doc/Xinput.xml
@@ -61,7 +61,7 @@ The functionality is implemented by
 routines that typically reside in the server source tree directory 
 extensions/server/xinput.
 This extension includes functions to enable and disable input extension devices,
-select input, grab and focus those device, query and change key 
+select input, grab and focus those devices, query and change key
 and button mappings, and others.  The only input extension requirements 
 for the device-dependent part of X are that the input devices be 
 correctly initialized and input events from those devices be correctly
@@ -362,7 +362,7 @@ server to begin checking for available input from this device.
 </para>
 <para>
 <!-- .LP -->
-&gt;From InitAndStartDevices, EnableDevice is called for all devices that have
+From InitAndStartDevices, EnableDevice is called for all devices that have
 the "inited" and "startup" fields in the DeviceIntRec set to TRUE.  The
 "inited" field is set by InitAndStartDevices to the value returned by
 the deviceproc when called with a mode value of DEVICE_INIT.  The "startup"
@@ -420,7 +420,7 @@ FocusClass - the device can be focused.
   </listitem>
   <listitem>
     <para>
-FeedbackClass - the device supports some kind of feedback
+FeedbackClass - the device supports some kind of feedback.
 <!-- .in -5n -->
 <!-- .RE -->
     </para>
@@ -446,7 +446,7 @@ This function is provided to allocate and initialize a KeyClassRec, and
 should be called for extension devices that have keys.  It is passed a pointer
 to the device, and pointers to arrays of keysyms and modifiers reported by
 the device.  It returns FALSE if the KeyClassRec could not be allocated,
-or if the maps for the keysyms and and modifiers could not be allocated.
+or if the maps for the keysyms and modifiers could not be allocated.
 Its parameters are:
 </para>
 <para>
@@ -702,7 +702,7 @@ InitStringFeedbackClassDeviceStruct(dev, controlProc, max_symbols,
 	num_symbols_supported, symbols)
     DeviceIntPtr dev;
     void (*controlProc)();
-    int max_symbols:
+    int max_symbols;
     int num_symbols_supported;
     KeySym *symbols;
 </literallayout>
@@ -905,7 +905,7 @@ such a device.
 <para>
 <!-- .LP -->
 The default implementation is to always return a BadMatch error.  If the
-implementation does not support any input devices that are allow their
+implementation does not support any input devices that allow their
 valuators to be set, the default implementation may be left unchanged.
 </para>
 </sect2>
@@ -1003,7 +1003,7 @@ initialized.
 </para>
 <para>
 <!-- .LP -->
-The data structures that define these
+The data structures that describe these
 events are defined in the file <function>extensions/include/XIproto.h</function>.  Other
 input extension constants needed by DDX are defined in the file
 <function>extensions/include/XI.h</function>.
@@ -1035,7 +1035,7 @@ deviceid - the identifier of the device that generated the event.
   </listitem>
   <listitem>
     <para>
-device_state - the state of any modifiers on the device that generated the event
+device_state - the state of any modifiers on the device that generated the event.
     </para>
   </listitem>
   <listitem>
@@ -1060,7 +1060,7 @@ valuator0 through valuator5 - the values of the valuators.
 <!-- .LP -->
 In order to pass this information to the input extension library, two 32-byte
 wire events must be generated by DDX.  The first has an event type of 
-<function>DeviceKeyPress</function>, and the second has an event type of \fPDeviceValuator\fP.
+<function>DeviceKeyPress</function>, and the second has an event type of <function>DeviceValuator</function>.
 </para>
 <para>
 <!-- .LP -->
@@ -1078,7 +1078,7 @@ The following code fragment shows how the two wire events could be initialized:
     deviceKeyButtonPointer *xev = (deviceKeyButtonPointer *) xE;
     deviceValuator *xv;
 
-    xev-&gt;type = DeviceKeyPress;                /* defined by input extension */
+    xev-&gt;type = DeviceKeyPress;         /* defined by input extension */
     xev-&gt;detail = keycode;              /* key pressed on this device */
     xev-&gt;time = timestamp;              /* same as for core events    */
     xev-&gt;rootX = pointerx;              /* x location of core pointer */
@@ -1093,7 +1093,7 @@ The following code fragment shows how the two wire events could be initialized:
     /*                                                                */
     /******************************************************************/
 
-    xev-&gt;deviceid = dev-&gt;id | MORE_EVENTS;        /* sending more than 1*/
+    xev-&gt;deviceid = dev-&gt;id | MORE_EVENTS;     /* sending more than 1 */
 
     /******************************************************************/
     /* Fields in the second 32-byte wire event:                       */
@@ -1152,7 +1152,7 @@ The following code fragment shows how the two wire events could be initialized:
     /*                                                                */
     /******************************************************************/
 
-    xev-&gt;deviceid = dev-&gt;id | MORE_EVENTS;        /* sending more than 1*/
+    xev-&gt;deviceid = dev-&gt;id | MORE_EVENTS;     /* sending more than 1 */
 
     /******************************************************************/
     /* Fields in the second 32-byte wire event:                       */
diff --git a/xserver/doc/Xserver-spec.xml b/xserver/doc/Xserver-spec.xml
index 4c344194d..72a544b55 100644
--- a/xserver/doc/Xserver-spec.xml
+++ b/xserver/doc/Xserver-spec.xml
@@ -1992,7 +1992,7 @@ regions, these blocks may need to be reallocated by your region
 software.  For instance, in the sample server, a RegionRec has some
 header information and a pointer to a dynamically allocated rectangle
 list.  Periodically, the rectangle list needs to be expanded with
-Xrealloc(), whereupon the new pointer is remembered in the RegionRec.</para>
+realloc(), whereupon the new pointer is remembered in the RegionRec.</para>
 <para>
 Most of the region operations come in two forms: a function pointer in
 the Screen structure, and a macro.  The server can be compiled so that
@@ -2598,7 +2598,7 @@ VisualRec data structure along with other display characteristics like the
 depth and other numbers.</para>
 <para>
 The allowable DepthRec's and VisualRec's are pointed to by fields in the ScreenRec.
-These are set up when InitOutput() is called; you should Xalloc() appropriate blocks
+These are set up when InitOutput() is called; you should malloc() appropriate blocks
 or use static variables initialized to the correct values.</para>
 </section>
 <section>
@@ -3897,7 +3897,7 @@ for CT_NONE, etc. are in Xserver/include/gc.h.)  This routine is
 responsible for incrementing any necessary reference counts (e.g. for
 a pixmap clip mask) for the new clipmask and freeing anything that
 used to be in the GC's clipMask field.  The lists of rectangles passed
-in can be freed with Xfree(), the regions can be destroyed with the
+in can be freed with free(), the regions can be destroyed with the
 RegionDestroy field in the screen, and pixmaps can be destroyed by
 calling the screen's DestroyPixmap function.  DIX and MI code expect
 what they pass in to this to be freed or otherwise inaccessible, and
@@ -5104,9 +5104,6 @@ mi and fb implementations.</para>
 <row><entry><function>WaitForSomething</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
 <row><entry><function>WindowExposures</function></entry><entry><literal>mi</literal></entry><entry><para>Window</para></entry></row>
 <row><entry><function>WriteToClient</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
-<row><entry><function>Xalloc</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
-<row><entry><function>Xfree</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
-<row><entry><function>Xrealloc</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>
 	    </tbody>
 	  </tgroup>
 	</table>
diff --git a/xserver/doc/dtrace/Makefile.in b/xserver/doc/dtrace/Makefile.in
index 715f7f0ae..b20db22d3 100644
--- a/xserver/doc/dtrace/Makefile.in
+++ b/xserver/doc/dtrace/Makefile.in
@@ -79,8 +79,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/xorg-tls.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -235,7 +234,6 @@ GLAMOR_LIBS = @GLAMOR_LIBS@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
 GLX_DEFINES = @GLX_DEFINES@
 GLX_SYS_LIBS = @GLX_SYS_LIBS@
-GLX_TLS = @GLX_TLS@
 GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 GREP = @GREP@
@@ -365,8 +363,6 @@ XEPHYR_INCS = @XEPHYR_INCS@
 XEPHYR_LIBS = @XEPHYR_LIBS@
 XF86CONFIGDIR = @XF86CONFIGDIR@
 XF86CONFIGFILE = @XF86CONFIGFILE@
-XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
-XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
 XKB_BASE_DIRECTORY = @XKB_BASE_DIRECTORY@
 XKB_BIN_DIRECTORY = @XKB_BIN_DIRECTORY@
 XKB_COMPILED_DIR = @XKB_COMPILED_DIR@
diff --git a/xserver/doc/smartsched b/xserver/doc/smartsched
index 057a759fd..bd7627410 100644
--- a/xserver/doc/smartsched
+++ b/xserver/doc/smartsched
@@ -196,9 +196,3 @@ updated in three ways:
 
 The effect of these changes is to both improve interactive application
 response and benchmark numbers at the same time.
-
-
-
-
-
-$XFree86: $