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

[Keith Packard]

 configure.ac             |    2 +-
 glx/glxscreens.c         |    2 +-
 hw/xquartz/GL/indirect.c |    2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 3575cb86a18d9e80e239acefdab18694e4ca2098
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Feb 17 08:27:32 2009 -0800

    glx: Inialize best_score before calculating visual scores
    
    This bug was pointed out by Peter Ã…strand.
    
    Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
    (cherry picked from commit 4039603413f9f46d7f725463a70b4a51838e0049)
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index 027afb8..95d35eb 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -353,7 +353,7 @@ static __GLXconfig *
 pickFBConfig(__GLXscreen *pGlxScreen, VisualPtr visual)
 {
     __GLXconfig *best = NULL, *config;
-    int best_score;
+    int best_score = 0;
 
     for (config = pGlxScreen->fbconfigs; config != NULL; config = config->next) {
 	int score = 0;
commit d050a61747bd5e5f9c96f5df5a191598c3f01e5c
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)
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 35450da..b4d18dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,7 +409,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 8e16e64f55deb8e94007915333ba356c0f7e4f73
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)
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

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... */