xserver: Branch 'server-1.4-branch' - 4 commits

[Eric Anholt]

 configure.ac                   |   10 ++++++++--
 hw/kdrive/neomagic/Makefile.am |    2 --
 os/io.c                        |    4 +++-
 os/osdep.h                     |    3 ---
 render/picturestr.h            |    2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

New commits:
diff-tree ec56c5e958248ea0161dda885fa59752b20f5d7c (from 5efc4bd7d0e2020242127d8ed83efb8d2d76a151)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 31 20:02:52 2007 -0700

    Bump version to 1.3.99.2.

diff --git a/configure.ac b/configure.ac
index da90ede..60f34c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl Process this file with autoconf to c
 AC_PREREQ(2.57)
 dnl This is the not the Xorg version number, it's the server version number.
 dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.3.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.3.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
diff-tree 5efc4bd7d0e2020242127d8ed83efb8d2d76a151 (from 1a125b521434da7ba3a41b6398c7f094867908e0)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 31 18:27:41 2007 -0700

    Remove backend.[ch] from neomagic to fix distcheck.
    (cherry picked from commit 917e3bb83a48da7618fce463cf6283be36cd9084)

diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am
index 4686547..95f0e1e 100644
--- a/hw/kdrive/neomagic/Makefile.am
+++ b/hw/kdrive/neomagic/Makefile.am
@@ -19,8 +19,6 @@ bin_PROGRAMS = Xneomagic
 noinst_LIBRARIES = libneomagic.a
 
 libneomagic_a_SOURCES =         \
-	backend.h                   \
-	backend.c                   \
 	neomagic.c                  \
 	neomagic.h                  \
 	neo_draw.c
diff-tree 1a125b521434da7ba3a41b6398c7f094867908e0 (from f499c2ea0a90a69713daef8f9497463229384964)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 31 15:16:01 2007 -0700

    Bug #7364: Require renderproto 0.9.3 on 64-bit, and fix build with it.
    
    (cherry picked from commit 07630d897ef37cad8b79d073d9edc891d5a7bddd)

diff --git a/configure.ac b/configure.ac
index ad6ae4b..da90ede 100644
--- a/configure.ac
+++ b/configure.ac
@@ -628,7 +628,13 @@ PKG_CHECK_MODULES(PIXMAN, $PIXMAN)
 AC_SUBST(PIXMAN_CFLAGS)
 
 dnl Core modules for most extensions, et al.
-REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.2] [kbproto >= 1.0.3]"
+# Require updated renderproto for ABI sanity if we're 64-bit.
+if test "$ac_cv_sizeof_unsigned_long" = 8; then
+	RENDERPROTO="[renderproto >= 0.9.3]"
+else
+	RENDERPROTO="renderproto"
+fi
+REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.2] [kbproto >= 1.0.3]"
 REQUIRED_LIBS="xfont xau fontenc $PIXMAN"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
diff --git a/render/picturestr.h b/render/picturestr.h
index 01572ec..aabce84 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -24,8 +24,8 @@
 #ifndef _PICTURESTR_H_
 #define _PICTURESTR_H_
 
-#include "glyphstr.h"
 #include "scrnintstr.h"
+#include "glyphstr.h"
 #include "resource.h"
 
 typedef struct _DirectFormat {
diff-tree f499c2ea0a90a69713daef8f9497463229384964 (from 3e9ecdcb132bb223febc396626211aa2681e4c79)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 31 13:00:23 2007 -0700

    Bug #7186: Fix an excessive request size limitation that broke big-requests.
    
    MAXBUFSIZE appears to be a leftover of some previous time.  Instead, just
    use maxBigRequestSize when bigreqs are available (limiting buffers to ~16MB).
    When bigreqs are not available, needed won't be larger than the maximum
    size of a non-bigreqs request (256kB).
    (cherry picked from commit ca82d4bddf235c9b68d51d68636bab40eafb9889)

diff --git a/os/io.c b/os/io.c
index 835af54..9de75ee 100644
--- a/os/io.c
+++ b/os/io.c
@@ -304,12 +304,14 @@ ReadRequestFromClient(ClientPtr client)
 	 */
 
 	oci->lenLastReq = 0;
-	if (needed > MAXBUFSIZE)
+#ifdef BIGREQS
+	if (needed > maxBigRequestSize << 2)
 	{
 	    /* request is too big for us to handle */
 	    YieldControlDeath();
 	    return -1;
 	}
+#endif
 	if ((gotnow == 0) ||
 	    ((oci->bufptr - oci->buffer + needed) > oci->size))
 	{
diff --git a/os/osdep.h b/os/osdep.h
index 965436d..2d455aa 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -55,9 +55,6 @@ SOFTWARE.
 #define BOTIMEOUT 200 /* in milliseconds */
 #define BUFSIZE 4096
 #define BUFWATERMARK 8192
-#ifndef MAXBUFSIZE
-#define MAXBUFSIZE (1 << 22)
-#endif
 
 #include <X11/Xdmcp.h>