packages: Mesa/Mesa.spec, Mesa/Mesa-git.patch - rel 6; git fixes

[arekm]

Author: arekm                        Date: Tue Aug 11 18:48:11 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6; git fixes

---- Files affected:
packages/Mesa:
   Mesa.spec (1.215 -> 1.216) , Mesa-git.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.215 packages/Mesa/Mesa.spec:1.216
--- packages/Mesa/Mesa.spec:1.215	Thu Aug  6 11:14:00 2009
+++ packages/Mesa/Mesa.spec	Tue Aug 11 20:48:05 2009
@@ -23,7 +23,7 @@
 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
@@ -35,6 +35,7 @@
 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}
@@ -617,6 +618,7 @@
 %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"
@@ -959,6 +961,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.216  2009/08/11 18:48:05  arekm
+- rel 6; git fixes
+
 Revision 1.215  2009/08/06 09:14:00  tommat
 - ups removed too much
 

================================================================
Index: packages/Mesa/Mesa-git.patch
diff -u /dev/null packages/Mesa/Mesa-git.patch:1.3
--- /dev/null	Tue Aug 11 20:48:11 2009
+++ packages/Mesa/Mesa-git.patch	Tue Aug 11 20:48:05 2009
@@ -0,0 +1,25 @@
+commit fd65418f600874b05f902b622078b40bc1abb24a
+Author: Eric Anholt <eric at 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;
+ 	 }
+       }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.215&r2=1.216&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa-git.patch?r1=1.2&r2=1.3&f=u