xserver: Branch 'master' - 2 commits

[Jeremy Huddleston]

 configure.ac             |    2 +-
 hw/xquartz/GL/indirect.c |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 344b1f2b25d627bdf7d802c5831b6a72d22ffe34
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Tue Feb 17 23:25:14 2009 -0800

    configure.ac: Support version strings like W.X.Y.Z-XXXXXX
    (cherry picked from commit 43967514cd57ad836d7fb85c8c9e58ada07e0232)

diff --git a/configure.ac b/configure.ac
index aede4b3..affbea0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,7 +410,7 @@ XORG_RELEASE_VERSION
 dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the
 dnl major number
 PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1`
-PVS=`echo $PACKAGE_VERSION | cut -d . -f 4`
+PVS=`echo $PACKAGE_VERSION | cut -d . -f 4 | cut -d - -f 1`
 if test "x$PVS" = "x"; then
 	PVS="0"
 fi
commit 67faf41b3f3e0cd66e35e3c176a9adb37ff1a759
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Tue Feb 17 23:24:25 2009 -0800

    XQuartz: Don't need GlxSetVisualConfig any more
    
    Fixes build failure resulting from 516f8e2cad1311a09764e2633644188d1e3c31bb
    (cherry picked from commit 066b17028a35956a089815716e38571f305469c5)

diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 517ab1a..0a60672 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -723,8 +723,6 @@ static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {
     screen->base.fbconfigs = CreateConfigs(&screen->base.numFBConfigs, 
 					   pScreen->myNum);
     
-    GlxSetVisualConfig(GLX_ALL_VISUALS);
-
     __glXScreenInit(&screen->base, pScreen);
 
     /* __glXScreenInit initializes these, so the order here is important, if we need these... */