[mesa/f13/master] glx regression fix

[Ben Skeggs]

commit 06c67fb9fff3c8f5e8d0f45ef96d6090b92afc70
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Thu Aug 5 08:42:11 2010 +1000

    glx regression fix

 mesa-7.8.1-glx-regression-fix.patch |   12 ++++++++++++
 mesa.spec                           |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/mesa-7.8.1-glx-regression-fix.patch b/mesa-7.8.1-glx-regression-fix.patch
new file mode 100644
index 0000000..a5c8d64
--- /dev/null
+++ b/mesa-7.8.1-glx-regression-fix.patch
@@ -0,0 +1,12 @@
+--- Mesa-7.8.1.orig/src/glx/glxext.c	2010-06-08 23:39:29.844249035 +0200
++++ Mesa-7.8.1.orig/src/glx/glxext.c	2010-06-08 23:40:41.186564816 +0200
+@@ -582,6 +582,9 @@ __glXInitializeVisualConfigFromTags(__GL
+          config->yInverted = *bp++;
+          break;
+ #endif
++      case GLX_USE_GL:
++         if (fbconfig_style_tags) *bp++;
++         break;
+       case None:
+          i = count;
+          break;
diff --git a/mesa.spec b/mesa.spec
index 2f4e72b..817f504 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -45,6 +45,7 @@ Patch5: nouveau-legacy-update.patch
 Patch6: nouveau-class-header.patch
 
 #Patch7: mesa-7.1-link-shared.patch
+Patch8: mesa-7.8.1-glx-regression-fix.patch
 
 Patch30: mesa-7.6-hush-vblank-warning.patch
 Patch31: mesa-7.8.1-intel-dri2-damage.patch
@@ -190,6 +191,7 @@ Group: User Interface/X Hardware Support
 %patch5 -p1 -b .nouveau-legacy-update
 %patch6 -p1 -b .nouveau-class
 #%patch7 -p1 -b .dricore
+%patch8 -p1 -b .glx-regression
 %patch30 -p1 -b .vblank-warning
 #Fix #RH 577142 (compiz redrawing issues)
 %patch31 -p1 -b .intel-dri2-damage
@@ -416,6 +418,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Thu Aug 05 2010 Ben Skeggs <bskeggs at redhat.com> - 7.8.1-8
+- glx regression fix from upstream (rhbz#601631)
+
 * Tue Aug 03 2010 Ben Skeggs <bskeggs at redhat.com> - 7.8.1-7
 - fix nouveau build with newer libdrm