rpms/mesa/devel mesa-6.5-force-r300.patch, NONE, 1.1 mesa.spec, 1.55, 1.56 mesa-6.4.1-texture-from-drawable.patch, 1.3, NONE

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20056/devel

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5-force-r300.patch 
Removed Files:
	mesa-6.4.1-texture-from-drawable.patch 
Log Message:
auto-import mesa-6.5-4 on branch devel from mesa-6.5-4.src.rpm

mesa-6.5-force-r300.patch:
 radeon_screen.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mesa-6.5-force-r300.patch ---
--- ./src/mesa/drivers/dri/r300/radeon_screen.c.force-r300	2006-04-11 17:08:36.000000000 -0400
+++ ./src/mesa/drivers/dri/r300/radeon_screen.c	2006-04-11 17:09:20.000000000 -0400
@@ -639,7 +639,7 @@
    }
    if (screen->chip_family == CHIP_FAMILY_R350 || 
        screen->chip_family == CHIP_FAMILY_R300) {
-	   if (getenv("R300_FORCE_R300") == NULL) {
+	   if (0 && getenv("R300_FORCE_R300") == NULL) {
 		   fprintf(stderr, "Radeon 9500/9700/9800 cards are not currently stable.\n");
 		   fprintf(stderr, "More details can be found at https://bugs.freedesktop.org/show_bug.cgi?id=6318\n");
 		   return NULL;


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mesa.spec	10 Apr 2006 21:51:56 -0000	1.55
+++ mesa.spec	11 Apr 2006 21:18:25 -0000	1.56
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 3
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -74,6 +74,7 @@
 Patch4: mesa-6.4.1-libGLw-enable-motif-support.patch
 Patch5: mesa-6.5-drop-static-inline.patch
 Patch6: mesa-6.5-noexecstack.patch
+Patch7: mesa-6.5-force-r300.patch
 
 # General patches from upstream go here:
 
@@ -241,6 +242,7 @@
 %endif
 %patch5 -p0 -b .drop-static-inline
 %patch6 -p0 -b .noexecstack
+%patch7 -p0 -b .force-r300
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
@@ -432,6 +434,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Apr 11 2006 Adam Jackson <ajackson at redhat.com> 6.5-4
+- Disable R300_FORCE_R300 hack for wider testing.
+
 * Mon Apr 10 2006 Kristian Høgsberg <krh at redhat.com> 6.5-3
 - Add mesa-6.5-noexecstack.patch to prevent assembly files from making
   libGL.so have executable stack.


--- mesa-6.4.1-texture-from-drawable.patch DELETED ---