From 386144da3f57cab97734d841e99b504be137718e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Fri, 18 Apr 2008 05:41:19 +0000
Subject: [PATCH] - okay fire me now - I swear it runs compiz really well... -
 fix more bugs on 965

---
 mesa-fix-965-buffer-check.patch | 25 +++++++++++++++++++++++++
 mesa.spec                       |  9 ++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 mesa-fix-965-buffer-check.patch

diff --git a/mesa-fix-965-buffer-check.patch b/mesa-fix-965-buffer-check.patch
new file mode 100644
index 0000000..3bcd7b9
--- /dev/null
+++ b/mesa-fix-965-buffer-check.patch
@@ -0,0 +1,25 @@
+From 27e06a52342b94b4fb1d60a57c3bdaa2b30607cf Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@panoply-rh.(none)>
+Date: Fri, 18 Apr 2008 15:37:54 +1000
+Subject: [PATCH] i965: fixup depth buffer check
+
+---
+ src/mesa/drivers/dri/i965/brw_misc_state.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c
+index ec0bd6b..26ec797 100644
+--- a/src/mesa/drivers/dri/i965/brw_misc_state.c
++++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
+@@ -183,7 +183,7 @@ static int prepare_depthbuffer(struct brw_context *brw)
+ {
+    struct intel_region *region = brw->state.depth_region;
+ 
+-   if (region->buffer)
++   if (!region || !region->buffer)
+       return 0;
+    return dri_bufmgr_check_aperture_space(region->buffer);
+ }
+-- 
+1.5.4.5
+
diff --git a/mesa.spec b/mesa.spec
index 7f9f64a..710d37f 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -15,7 +15,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.1
-Release: 0.27%{?dist}
+Release: 0.28%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -38,6 +38,8 @@ Patch7: mesa-7.1-link-shared.patch
 # lets only build drivers on sparc that are remotely useful
 Patch8: mesa-7.1-sparc.patch
 
+Patch9: mesa-fix-965-buffer-check.patch
+
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
 BuildRequires: libdrm-devel >= 2.4.0-0.5
@@ -165,6 +167,7 @@ This package provides some demo applications for testing Mesa.
 %patch4 -p1 -b .disable-tex-offset
 %patch7 -p1 -b .dricore
 %patch8 -p1
+%patch9 -p1 -b .965-depth
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -413,6 +416,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Fri Apr 18 2008 Dave Airlie <airlied@redhat.com> 7.1-0.28
+- okay fire me now - I swear it runs compiz really well...
+- fix more bugs on 965
+
 * Fri Apr 18 2008 Dave Airlie <airlied@redhat.com> 7.1-0.27
 - why yes, that is a brown paper bag
 - fix glxgears on 965