commit 7f30443aa2cc2925ae6b20867950150e8ce6edfd
Author: Dave Airlie <airlied(a)redhat.com>
Date: Fri Apr 1 10:10:13 2011 +1000
upstream snapshot again - proper fix for ILK + nv50 gnome-shell issue
.gitignore | 1 +
mesa-intel-fix-gs-rendering-regression.patch | 99 --------------------------
mesa.spec | 9 ++-
sources | 2 +-
4 files changed, 7 insertions(+), 104 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dda81af..49c23e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ mesa-20100720.tar.bz2
/MesaLib-7.10.1.tar.bz2
/mesa-20110327.tar.xz
/mesa-20110330.tar.xz
+/mesa-20110401.tar.xz
diff --git a/mesa.spec b/mesa.spec
index 0ec80cd..d08c55a 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 20110330
+%define gitdate 20110401
#% define snapshot
Summary: Mesa graphics libraries
Name: mesa
Version: 7.11
-Release: 0.3.%{gitdate}.0%{?dist}
+Release: 0.4.%{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-fix-gs-rendering-regression.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 .upstreamrevert
%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
+* Fri Apr 01 2011 Dave Airlie <airlied(a)redhat.com> 7.11-0.4.20110401.0
+- upstream snapshot again - proper fix for ILK + nv50 gnome-shell issue
+
* Wed Mar 30 2011 Dave Airlie <airlied(a)redhat.com> 7.11-0.3.20110330.0
- mesa-intel-fix-gs-rendering-regression.patch, attempt to fix gnome shell
rendering.
diff --git a/sources b/sources
index 1f3ea74..303b8c6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
-08d37442be3d2c40010aa3c5fa3eb787 mesa-20110330.tar.xz
+be260c4b3183acdac9c0b6546db0effc mesa-20110401.tar.xz