xserver: Branch 'server-1.5-branch' - 3 commits

[Adam Jackson]

 configure.ac                     |    4 ++--
 hw/kdrive/ephyr/XF86dri.c        |   10 ++++++++++
 hw/kdrive/ephyr/ephyrhostglx.c   |   11 +++++++++++
 hw/kdrive/ephyr/ephyrhostvideo.c |   10 ++++++++++
 hw/kdrive/ephyr/hostx.c          |   12 ++++++++++++
 render/filter.c                  |    2 +-
 6 files changed, 46 insertions(+), 3 deletions(-)

New commits:
commit c0c73e9236cffece7c8049515b03facb41f12f0e
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jul 23 14:16:47 2008 -0400

    xserver 1.4.99.906
    
    You know, Mesa 7.1 could release any day now and that'd be just fine.

diff --git a/configure.ac b/configure.ac
index a9b1651..2a8ef8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.99.905, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="23 July 2008"
+AC_INIT([xorg-server], 1.4.99.906, [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
@@ -418,7 +419,6 @@ VENDOR_MAN_VERSION="Version ${PACKAGE_VERSION}"
 
 VENDOR_NAME="The X.Org Foundation"
 VENDOR_NAME_SHORT="X.Org"
-RELEASE_DATE="5 September 2007"
 VENDOR_WEB="http://wiki.x.org"
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
commit e909a396194e64119d04fc6ecb68ddc4265a3e49
Author: Pierre-Loup A. Griffais <pgriffais at nvidia.com>
Date:   Tue Jul 22 17:34:37 2008 -0700

    Don't return BadAlloc when trying to set a PictureFilter with no parameters when a filter with parameters was previously set.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    (cherry picked from commit bc3c03a3f3c091026310f0e8d55321cec570a0c5)

diff --git a/render/filter.c b/render/filter.c
index 092313f..aa3eb1a 100644
--- a/render/filter.c
+++ b/render/filter.c
@@ -301,7 +301,7 @@ SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int
     if (nparams != pPicture->filter_nparams)
     {
 	new_params = xalloc (nparams * sizeof (xFixed));
-	if (!new_params)
+	if (!new_params && nparams)
 	    return BadAlloc;
 	xfree (pPicture->filter_params);
 	pPicture->filter_params = new_params;
commit c217cb96dccb39ffd689086b6d833a1963dfb661
Author: Dodji Seketeli <dodji at seketeli.org>
Date:   Wed Jul 23 01:00:26 2008 +0200

    [Xephyr] Fix #15839
    
    Make sure the _XSERVER64 macro is not defined in Xlib client code.
    That macro is meant to be define only on pure server code, when necessary.
    (cherry picked from commit 5de1867fbb0a336ff3fdc92cbf734849f6111b1b)

diff --git a/hw/kdrive/ephyr/XF86dri.c b/hw/kdrive/ephyr/XF86dri.c
index e656ff5..63e630c 100644
--- a/hw/kdrive/ephyr/XF86dri.c
+++ b/hw/kdrive/ephyr/XF86dri.c
@@ -45,6 +45,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <kdrive-config.h>
 #endif
+/*
+ * including some server headers (like kdrive-config.h)
+ * might define the macro _XSERVER64
+ * on 64 bits machines. That macro must _NOT_ be defined for Xlib
+ * client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
 
 #ifdef XEPHYR_DRI
 
diff --git a/hw/kdrive/ephyr/ephyrhostglx.c b/hw/kdrive/ephyr/ephyrhostglx.c
index f5db5be..1eec4e0 100644
--- a/hw/kdrive/ephyr/ephyrhostglx.c
+++ b/hw/kdrive/ephyr/ephyrhostglx.c
@@ -31,6 +31,17 @@
 #include <kdrive-config.h>
 #endif
 
+/*
+ * including some server headers (like kdrive-config.h)
+ * might define the macro _XSERVER64
+ * on 64 bits machines. That macro must _NOT_ be defined for Xlib
+ * client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
+
 #include <X11/Xlibint.h>
 #include <GL/glx.h>
 #include <GL/internal/glcore.h>
diff --git a/hw/kdrive/ephyr/ephyrhostvideo.c b/hw/kdrive/ephyr/ephyrhostvideo.c
index 562c2a4..41c0b75 100644
--- a/hw/kdrive/ephyr/ephyrhostvideo.c
+++ b/hw/kdrive/ephyr/ephyrhostvideo.c
@@ -28,6 +28,16 @@
 #ifdef HAVE_CONFIG_H
 #include <kdrive-config.h>
 #endif
+/*
+ * including some server headers (like kdrive-config.h)
+ * might define the macro _XSERVER64
+ * on 64 bits machines. That macro must _NOT_ be defined for Xlib
+ * client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
 #include <X11/Xutil.h>
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xvlib.h>
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 1a71d06..c870a29 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -27,6 +27,18 @@
 #include <kdrive-config.h>
 #endif
 
+/*
+ * including some server headers (like kdrive-config.h)
+ * might define the macro _XSERVER64
+ * on 64 bits machines. That macro must _NOT_ be defined for Xlib
+ * client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
+
+
 #include "hostx.h"
 
 #include <stdlib.h>