- rel 6; git fixes

Changed files:
    Mesa-git.patch -> 1.3
    Mesa.spec -> 1.216

diff --git a/Mesa-git.patch b/Mesa-git.patch
new file mode 100644 (file)
index 0000000..537cbd0
--- /dev/null
+++ b/Mesa-git.patch
@@ -0,0 +1,25 @@
+commit fd65418f600874b05f902b622078b40bc1abb24a
+Author: Eric Anholt <eric@anholt.net>
+Date:   Mon Aug 3 14:27:41 2009 -0700
+
+    intel: Fix inverted test for disabling flushing of front buffer output.
+    
+    The comment disagreed with the code, and nicely drew my eyes to what was
+    going wrong.
+    
+    Bug #21774 (blender)
+    Bug #21788 (readpix)
+
+diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
+index 7f5b8d7..35d9985 100644
+--- a/src/mesa/drivers/dri/intel/intel_context.c
++++ b/src/mesa/drivers/dri/intel/intel_context.c
+@@ -513,7 +513,7 @@ intel_flush(GLcontext *ctx, GLboolean needs_mi_flush)
+         * each of N places that do rendering.  This has worse performances,
+         * but it is much easier to get correct.
+         */
+-       if (intel->is_front_buffer_rendering) {
++       if (!intel->is_front_buffer_rendering) {
+           intel->front_buffer_dirty = GL_FALSE;
+        }
+       }

diff --git a/Mesa.spec b/Mesa.spec
index 1cb62b031708b32e55604ef244863ca694efc052..b326ea21b498fc0f45d1a1f1cd919dcd728eeaa3 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -22,7 +22,7 @@ Summary:      Free OpenGL implementation
 Summary(pl.UTF-8):     Wolnodostępna implementacja standardu OpenGL
 Name:          Mesa
 Version:       7.5
-Release:       6%{?with_multigl:.mgl}
+Release:       7%{?with_multigl:.mgl}
 License:       MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:         X11/Libraries
 Source0:       http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
@@ -34,6 +34,7 @@ Source2:      http://www.archlinux.org/~jgc/gl-manpages-1.0.1.tar.bz2
 Patch0:                %{name}-realclean.patch
 Patch1:                %{name}-noveau-abi-0.0.15.patch
 Patch2:                %{name}-sparc64.patch
+Patch3:                %{name}-git.patch
 URL:           http://www.mesa3d.org/
 BuildRequires: expat-devel
 %{?with_demos:BuildRequires:   glew-devel}
@@ -616,6 +617,7 @@ Sterownik X.org DRI dla rodziny kart VIA Unichrome.
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # fix demos
 find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"