mesa: Changes to 'debian-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 ChangeLog            |   10 ++++++++++
 debian/changelog     |    7 +++++++
 src/glx/x11/glxext.c |    4 ++++
 3 files changed, 21 insertions(+)

New commits:
commit 2d33c0b868dc6259e735b251451586eea3c2e355
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Jun 3 17:52:44 2010 +0200

    Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index b082bfe..82ddb66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+commit 0e080548f99a3fdea3afea13f48406ac935f5add
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Jun 3 09:44:31 2010 -0600
+
+    glx: fix regression with GLX_USE_GL
+    
+    update for fbconfig_style_tags
+    
+    Based on commit 26a9b7e4c737c89b47844303bb7413ceab0280a5 from master.
+
 commit 8ba378d9698be4fe24585beb10cadb95746f2a94
 Author: José Fonseca <jfonseca@vmware.com>
 Date:   Tue May 4 10:09:49 2010 +0100
diff --git a/debian/changelog b/debian/changelog
index c67f6d3..722b102 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.7.1-3) unstable; urgency=medium
+
+  * Pull from mesa_7_7_branch to get the fix for a regression introduced in
+    7.7.1-2 (closes: #584163)
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 03 Jun 2010 17:52:40 +0200
+
 mesa (7.7.1-2) unstable; urgency=low
 
   * debian/rules: use DEB_HOST_ARCH_CPU instead of DEB_HOST_GNU_CPU.  Prompted

commit 0e080548f99a3fdea3afea13f48406ac935f5add
Author: Brian Paul <brianp@vmware.com>
Date:   Thu Jun 3 09:44:31 2010 -0600

    glx: fix regression with GLX_USE_GL
    
    update for fbconfig_style_tags
    
    Based on commit 26a9b7e4c737c89b47844303bb7413ceab0280a5 from master.

diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index bdc6e31..387c081 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -438,6 +438,10 @@ __glXInitializeVisualConfigFromTags(__GLcontextModes * config, int count,
       case GLX_Y_INVERTED_EXT:
          config->yInverted = *bp++;
          break;
+      case GLX_USE_GL:
+         if (fbconfig_style_tags)
+            bp++;
+         break;
       case None:
          i = count;
          break;