xserver: Branch 'master' - 2 commits

[Michel Dänzer]

 configure.ac           |   15 +++++++++------
 hw/xfree86/dri2/dri2.c |    2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 24928b85dc996c8d0a052ddf383df25718ee5305
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sat Nov 15 13:28:53 2008 +0100

    DRI2: Don't crash in DRI2ClipNotify when DRI2DrawablePtr is NULL.

diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 4c52757..3c852a4 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -258,7 +258,7 @@ DRI2ClipNotify(WindowPtr pWin, int dx, int dy)
     DRI2ScreenPtr       ds = DRI2GetScreen(pScreen);
     DRI2DrawablePtr     dd = DRI2GetDrawable(&pWin->drawable);
 
-    if (ds->lastSequence < dd->pendingSequence && ds->Wait)
+    if (dd && ds->lastSequence < dd->pendingSequence && ds->Wait)
 	ds->Wait(pWin, dd->pendingSequence);
 
     if (ds->ClipNotify) {
commit e5271c374715dd4e9a724ab3e5f77108d4ce8c23
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sat Nov 15 13:27:42 2008 +0100

    Set libdrm flags correctly even when only DRI2 is enabled.

diff --git a/configure.ac b/configure.ac
index 74a1bee..13ceed9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -841,14 +841,8 @@ AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
 if test "x$DRI" = xyes; then
 	AC_DEFINE(XF86DRI, 1, [Build DRI extension])
 	PKG_CHECK_MODULES([DRIPROTO], [xf86driproto])
-	PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.0])
 	PKG_CHECK_MODULES([GL], [glproto >= 1.4.1 dri >= 7.1.0])
-	PKG_CHECK_EXISTS(libdrm >= 2.2.0,
-			 [AC_DEFINE([HAVE_LIBDRM_2_2], 1,
-			 [Has version 2.2 (or newer) of the drm library])])
 	AC_SUBST(DRIPROTO_CFLAGS)
-	AC_SUBST(LIBDRM_CFLAGS)
-	AC_SUBST(LIBDRM_LIBS)
 	AC_SUBST(GL_CFLAGS)
 fi
 
@@ -865,6 +859,15 @@ case "$DRI2,$HAVE_DRI2PROTO" in
 esac
 AM_CONDITIONAL(DRI2, test "x$DRI2" == xyes)
 
+if test "x$DRI" = xyes || test "x$DRI2" = xyes; then
+	PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.0])
+	PKG_CHECK_EXISTS(libdrm >= 2.2.0,
+			 [AC_DEFINE([HAVE_LIBDRM_2_2], 1,
+			 [Has version 2.2 (or newer) of the drm library])])
+	AC_SUBST(LIBDRM_CFLAGS)
+	AC_SUBST(LIBDRM_LIBS)
+fi
+
 AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])
 if test "x$XINERAMA" = xyes; then
 	AC_DEFINE(XINERAMA, 1, [Support Xinerama extension])