rpms/mesa/devel mesa.spec,1.211,1.212 r300-bufmgr.patch,1.8,1.9

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13538

Modified Files:
	mesa.spec r300-bufmgr.patch 
Log Message:
* Sun Dec 21 2008 Dave Airlie <airlied at redhat.com> 7.3-0.3
- r300-bufmgr.patch: make radeon/r200 work



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- mesa.spec	20 Dec 2008 23:40:15 -0000	1.211
+++ mesa.spec	21 Dec 2008 00:00:27 -0000	1.212
@@ -18,7 +18,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.3
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -173,7 +173,7 @@
 %patch0 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p0 -b .no-mach64
-#patch5 -p1 -b .r300-bufmgr
+%patch5 -p1 -b .r300-bufmgr
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
@@ -430,6 +430,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Sun Dec 21 2008 Dave Airlie <airlied at redhat.com> 7.3-0.3
+- r300-bufmgr.patch: make radeon/r200 work
+
 * Sun Dec 21 2008 Dave Airlie <airlied at redhat.com> 7.3-0.2
 - intel-fix-sarea-define.patch - workaround wrong define
 - intel-triple-remove.patch - remove triple buffering

r300-bufmgr.patch:

Index: r300-bufmgr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/r300-bufmgr.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- r300-bufmgr.patch	20 Dec 2008 23:27:04 -0000	1.8
+++ r300-bufmgr.patch	21 Dec 2008 00:00:27 -0000	1.9
@@ -1,3 +1,18 @@
+diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
+index e9144ac..7064f42 100644
+--- a/src/mesa/drivers/dri/r200/Makefile
++++ b/src/mesa/drivers/dri/r200/Makefile
+@@ -48,7 +48,9 @@ SYMLINKS = \
+ COMMON_SYMLINKS = \
+ 	radeon_chipset.h \
+ 	radeon_screen.c \
+-	radeon_screen.h
++	radeon_screen.h \
++	radeon_bo_legacy.h \
++	radeon_buffer.h
+ 
+ ##### TARGETS #####
+ 
 diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
 index 6ca9342..cbb09e6 100644
 --- a/src/mesa/drivers/dri/r300/Makefile
@@ -9894,7 +9909,7 @@
 +
 +#endif
 diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
-index 5f32dd5..0dda28e 100644
+index 5f32dd5..d579509 100644
 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c
 +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
 @@ -35,6 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -10404,7 +10419,7 @@
           radeonSetSpanFunctions(depthRb, mesaVis);
           _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &depthRb->Base);
 -	 depthRb->depthHasSurface = screen->depthHasSurface;
-+    	 depthRb->has_surface = screen->depthHasSurface;
++    	// depthRb->has_surface = screen->depthHasSurface;
        }
        else if (mesaVis->depthBits == 24) {
           driRenderbuffer *depthRb
@@ -10413,7 +10428,7 @@
           radeonSetSpanFunctions(depthRb, mesaVis);
           _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &depthRb->Base);
 -	 depthRb->depthHasSurface = screen->depthHasSurface;
-+ 	     depthRb->has_surface = screen->depthHasSurface;
++ 	 //    depthRb->has_surface = screen->depthHasSurface;
        }
  
        /* stencil renderbuffer */
@@ -10422,7 +10437,7 @@
           radeonSetSpanFunctions(stencilRb, mesaVis);
           _mesa_add_renderbuffer(fb, BUFFER_STENCIL, &stencilRb->Base);
 -	 stencilRb->depthHasSurface = screen->depthHasSurface;
-+         stencilRb->has_surface = screen->depthHasSurface;
++         //stencilRb->has_surface = screen->depthHasSurface;
        }
  
        _mesa_add_soft_renderbuffers(fb,
@@ -10577,17 +10592,3 @@
 +extern void radeonSetSpanFunctions(driRenderbuffer * rb, const GLvisual * vis);
 +#endif
  #endif
-diff -up mesa-20081220/src/mesa/drivers/dri/r200/Makefile.dave mesa-20081220/src/mesa/drivers/dri/r200/Makefile
---- mesa-20081220/src/mesa/drivers/dri/r200/Makefile.dave	2008-12-21 09:24:58.000000000 +1000
-+++ mesa-20081220/src/mesa/drivers/dri/r200/Makefile	2008-12-21 09:26:11.000000000 +1000
-@@ -48,7 +48,9 @@ SYMLINKS = \
- COMMON_SYMLINKS = \
- 	radeon_chipset.h \
- 	radeon_screen.c \
--	radeon_screen.h
-+	radeon_screen.h \
-+	radeon_bo_legacy.h \
-+	radeon_buffer.h
- 
- ##### TARGETS #####
-