rpms/mesa/devel mesa-7.1-dri2.patch,NONE,1.1 mesa.spec,1.176,1.177

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17517

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.1-dri2.patch 
Log Message:
* Wed Apr 09 2008 Adam Jackson <ajax at redhat.com> 7.1-0.22
- mesa-7.1-visual-crash.patch: Fix a segfault if DRI unavailable.
- mesa-7.1-fbconfig-fix.patch: Fix fbconfig comparisons.


mesa-7.1-dri2.patch:

--- NEW FILE mesa-7.1-dri2.patch ---
diff -up mesa-20080331/src/glx/x11/dri2.c.jx mesa-20080331/src/glx/x11/dri2.c
--- mesa-20080331/src/glx/x11/dri2.c.jx	2008-03-31 16:58:48.000000000 -0400
+++ mesa-20080331/src/glx/x11/dri2.c	2008-04-09 10:15:59.000000000 -0400
@@ -37,7 +37,7 @@
 #include <X11/extensions/extutil.h>
 #include "glheader.h"
 #include "xf86drm.h"
-#include "dri2proto.h"
+#include <X11/extensions/dri2proto.h>
 #include "dri2.h"
 
 static char dri2ExtensionName[] = DRI2_NAME;


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- mesa.spec	9 Apr 2008 14:16:57 -0000	1.176
+++ mesa.spec	9 Apr 2008 14:28:36 -0000	1.177
@@ -35,6 +35,7 @@
 
 Patch4: mesa-7.1-visual-crash.patch
 Patch5: mesa-7.1-fbconfig-fix.patch
+Patch6: mesa-7.1-dri2.patch
 
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
@@ -160,6 +161,7 @@
 %patch3 -p1 -b .disable-tex-offset
 %patch4 -p1 -b .visual-crash
 %patch5 -p1 -b .fbconfig
+%patch6 -p1 -b .dri2
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.