From 93e1adb48334acc69b2e12e0e73c302d5ca51d41 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 12 Apr 2011 21:04:10 +1000
Subject: [PATCH] latest upstream snapshot to fix r200 regression.

---
 .gitignore | 1 +
 mesa.spec  | 9 +++++----
 sources    | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 49c23e8..c72e55f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ mesa-20100720.tar.bz2
 /mesa-20110327.tar.xz
 /mesa-20110330.tar.xz
 /mesa-20110401.tar.xz
+/mesa-20110412.tar.xz
diff --git a/mesa.spec b/mesa.spec
index 9dcab1b..1b7111d 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -12,13 +12,13 @@
 %define _default_patch_fuzz 2
 
 %define manpages gl-manpages-1.0.1
-%define gitdate 20110401
+%define gitdate 20110412
 #% define snapshot 
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.11
-Release: 0.5.%{gitdate}.0%{?dist}
+Release: 0.6.%{gitdate}.0%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -31,7 +31,6 @@ Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 Source4: llvmcore.mk
 
-Patch1: mesa-intel-snb-regression-reverts.patch
 Patch2: mesa-7.1-nukeglthread-debug.patch
 Patch3: mesa-no-mach64.patch
 Patch4: legacy-drivers.patch
@@ -215,7 +214,6 @@ Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires vide
 %prep
 #setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2
 %setup -q -n mesa-%{gitdate} -b2
-%patch1 -p1 -b .intel-fix
 %patch2 -p1 -b .intel-glthread
 %patch3 -p1 -b .no-mach64
 %patch4 -p1 -b .classic
@@ -487,6 +485,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libOSMesa.so
 
 %changelog
+* Tue Apr 12 2011 Dave Airlie <airlied@redhat.com> 7.11-0.6.20110412.0
+- latest upstream snapshot to fix r200 regression.
+
 * Fri Apr 01 2011 Dave Airlie <airlied@redhat.com> 7.11-0.5.20110401.0
 - Revert upstream patches causing SNB regression.
 
diff --git a/sources b/sources
index 303b8c6..ccfda6e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
-be260c4b3183acdac9c0b6546db0effc  mesa-20110401.tar.xz
+b8a15e6f9892d004c3407d6a0659fb5b  mesa-20110412.tar.xz