- Mesa rebase to upstream + new r300 bufmgr code (may need more work)

.cvsignore

@@ -1,3 +1,3 @@
 xdriinfo-1.0.2.tar.bz2
 gl-manpages-1.0.1.tar.bz2
-mesa-20081001.tar.bz2
+mesa-20081220.tar.bz2

depth-override-fix.patch

@@ -1,25 +0,0 @@
-From df6ae3f0a39f95cb1199ac16c98be2bf9a3bc96f Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Wed, 1 Oct 2008 14:14:06 -0700
-Subject: [PATCH] i965: Fix overwriting of depth override for SetTexOffset.
-
-Fixes black borders around windows in compiz.  Bug #17233.
----
- src/mesa/drivers/dri/i965/brw_wm_surface_state.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
-index 47127c0..3790b50 100644
---- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
-+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
-@@ -274,7 +274,6 @@ brw_update_texture_surface( GLcontext *ctx, GLuint unit )
-    key.width = firstImage->Width;
-    key.height = firstImage->Height;
-    key.cpp = intelObj->mt->cpp;
--   key.depth = firstImage->Depth;
-    key.tiling = intelObj->mt->region->tiling;
- 
-    dri_bo_unreference(brw->wm.surf_bo[unit + MAX_DRAW_BUFFERS]);
--- 
-1.6.0.1
-

mesa.spec

@@ -51,7 +51,6 @@ BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel >= 2.0
 BuildRequires: xorg-x11-proto-devel >= 7.1-10
-BuildRequires: dri2proto >= 1.1
 BuildRequires: makedepend
 BuildRequires: libselinux-devel
 BuildRequires: libXext-devel
@@ -189,7 +188,7 @@ sed -i 's,terrain.dat,%{_libdir}/mesa-demos-data/&,' progs/demos/terrain.c
 
 %build
 
-autoreconf --install
+autoreconf --install  
 
 export CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
 export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"

sources

@@ -1,3 +1,3 @@
 a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
-2a67b54e44727e83045c8778db63d28d  mesa-20081001.tar.bz2
+b19670958386915cec8826aec505d01a  mesa-20081220.tar.bz2