latest upstream snapshot to fix r200 regression.

This commit is contained in:
Dave Airlie 2011-04-12 21:04:10 +10:00
parent a27a36d277
commit 93e1adb483
3 changed files with 7 additions and 5 deletions

1
.gitignore vendored
View file

@ -19,3 +19,4 @@ mesa-20100720.tar.bz2
/mesa-20110327.tar.xz /mesa-20110327.tar.xz
/mesa-20110330.tar.xz /mesa-20110330.tar.xz
/mesa-20110401.tar.xz /mesa-20110401.tar.xz
/mesa-20110412.tar.xz

View file

@ -12,13 +12,13 @@
%define _default_patch_fuzz 2 %define _default_patch_fuzz 2
%define manpages gl-manpages-1.0.1 %define manpages gl-manpages-1.0.1
%define gitdate 20110401 %define gitdate 20110412
#% define snapshot #% define snapshot
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 7.11 Version: 7.11
Release: 0.5.%{gitdate}.0%{?dist} Release: 0.6.%{gitdate}.0%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -31,7 +31,6 @@ Source2: %{manpages}.tar.bz2
Source3: make-git-snapshot.sh Source3: make-git-snapshot.sh
Source4: llvmcore.mk Source4: llvmcore.mk
Patch1: mesa-intel-snb-regression-reverts.patch
Patch2: mesa-7.1-nukeglthread-debug.patch Patch2: mesa-7.1-nukeglthread-debug.patch
Patch3: mesa-no-mach64.patch Patch3: mesa-no-mach64.patch
Patch4: legacy-drivers.patch Patch4: legacy-drivers.patch
@ -215,7 +214,6 @@ Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires vide
%prep %prep
#setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2 #setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2
%setup -q -n mesa-%{gitdate} -b2 %setup -q -n mesa-%{gitdate} -b2
%patch1 -p1 -b .intel-fix
%patch2 -p1 -b .intel-glthread %patch2 -p1 -b .intel-glthread
%patch3 -p1 -b .no-mach64 %patch3 -p1 -b .no-mach64
%patch4 -p1 -b .classic %patch4 -p1 -b .classic
@ -487,6 +485,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libOSMesa.so %{_libdir}/libOSMesa.so
%changelog %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 * Fri Apr 01 2011 Dave Airlie <airlied@redhat.com> 7.11-0.5.20110401.0
- Revert upstream patches causing SNB regression. - Revert upstream patches causing SNB regression.

View file

@ -1,2 +1,2 @@
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
be260c4b3183acdac9c0b6546db0effc mesa-20110401.tar.xz b8a15e6f9892d004c3407d6a0659fb5b mesa-20110412.tar.xz