Bug#635059: libgl1-mesa-glx: incorrect renderType in GLX fbconfigs (w/ patch)

[Zdenek Salvet <salvet@ics.muni.cz>]

Package: libgl1-mesa-glx
Version: 7.7.1-4
Severity: important
Tags: upstream patch

GLX routines may report and use incorrect FBConfigs due to bug
in protocol parsing - renderType should not be computed from (uninitialized)
GLX_RGBA property when server sent it explicitely (with GLX 1.3+)

-- System Information:
Debian Release: 6.0.1
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/16 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages libgl1-mesa-glx depends on:
ii  libc6                  2.11.2-10         Embedded GNU C Library: Shared lib
ii  libdrm2                2.4.21-1~squeeze3 Userspace interface to kernel DRM 
ii  libx11-6               2:1.3.3-4         X11 client-side library
ii  libxdamage1            1:1.1.3-1         X11 damaged region extension libra
ii  libxext6               2:1.1.2-1         X11 miscellaneous extension librar
ii  libxfixes3             1:4.0.5-1         X11 miscellaneous 'fixes' extensio
ii  libxxf86vm1            1:1.1.0-2         X11 XFree86 video mode extension l

Versions of packages libgl1-mesa-glx recommends:
ii  libgl1-mesa-dri               7.7.1-4    A free implementation of the OpenG

libgl1-mesa-glx suggests no packages.

-- no debconf information

--- mesa.orig/src/glx/x11/glxext.c	2011-07-21 14:47:20.719908125 +0200
+++ mesa/src/glx/x11/glxext.c	2011-07-21 14:50:53.535908287 +0200
@@ -268,6 +268,7 @@
                                     Bool fbconfig_style_tags)
 {
    int i;
+   int renderTypeSet = 0;
 
    if (!tagged_only) {
       /* Copy in the first set of properties */
@@ -389,6 +390,7 @@
          break;
       case GLX_RENDER_TYPE:
          config->renderType = *bp++;
+	 renderTypeSet = 1;
          break;
       case GLX_X_RENDERABLE:
          config->xRenderable = *bp++;
@@ -452,6 +454,7 @@
       }
    }
 
+   if (!renderTypeSet) 
    config->renderType =
       (config->rgbMode) ? GLX_RGBA_BIT : GLX_COLOR_INDEX_BIT;