[mesa/f16] snapshot latest mesa 7.11 stable branch (what will be 7.11.1)
Dave Airlie
airlied at fedoraproject.org
Thu Nov 3 20:01:50 UTC 2011
commit f899a988b01fa676860f73a42cfab4afac71e527
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Nov 3 20:01:05 2011 +0000
snapshot latest mesa 7.11 stable branch (what will be 7.11.1)
.gitignore | 1 +
mesa-7.11-drisw-glx13.patch | 29 -----------------------------
mesa-7.11-intel-swap-event.patch | 12 ------------
mesa.spec | 21 +++++++++------------
sources | 2 +-
5 files changed, 11 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b185d65..f0e2145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ mesa-20100720.tar.bz2
/mesa-20110620.tar.xz
/mesa-20110730.tar.xz
/MesaLib-7.11.tar.bz2
+/mesa-20111103.tar.xz
diff --git a/mesa.spec b/mesa.spec
index f40a6fd..ad4a9a0 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -20,21 +20,21 @@
%define _default_patch_fuzz 2
%define manpages gl-manpages-1.0.1
-#define gitdate 20110730
+%define gitdate 20111103
#% define snapshot
Summary: Mesa graphics libraries
Name: mesa
Version: 7.11
-Release: 9%{?dist}
+Release: 10%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
#Source0: http://downloads.sf.net/mesa3d/MesaLib-%{version}.tar.bz2
#Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2
-Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2
-#Source0: %{name}-%{gitdate}.tar.xz
+#Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2
+Source0: %{name}-%{gitdate}.tar.xz
Source2: %{manpages}.tar.bz2
Source3: make-git-snapshot.sh
@@ -48,10 +48,7 @@ Patch8: mesa-7.10-llvmcore.patch
Patch30: mesa-7.6-hush-vblank-warning.patch
Patch31: mesa-7.10-swrastg.patch
Patch32: mesa-7.11-generic-wmb.patch
-Patch33: mesa-7.11-drisw-glx13.patch
Patch34: 0001-nv50-fix-max-texture-levels.patch
-Patch35: mesa-7.11-intel-swap-event.patch
-Patch36: mesa-7.11-fix-sw-24bpp.patch
BuildRequires: pkgconfig autoconf automake libtool
%if %{with_hardware}
@@ -216,8 +213,8 @@ Mesa offscreen rendering development package
%prep
-%setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2
-#setup -q -n mesa-%{gitdate} -b2
+#%setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2
+%setup -q -n mesa-%{gitdate} -b2
%patch2 -p1 -b .intel-glthread
%patch3 -p1 -b .no-mach64
%patch4 -p1 -b .classic
@@ -226,10 +223,7 @@ Mesa offscreen rendering development package
%patch30 -p1 -b .vblank-warning
#patch31 -p1 -b .swrastg
%patch32 -p1 -b .wmb
-%patch33 -p1 -b .glx13
%patch34 -p1 -b .nv50-texlevel
-%patch35 -p1 -b .ise
-%patch36 -p1 -b .sw24
%build
@@ -468,6 +462,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/osmesa.pc
%changelog
+* Thu Nov 03 2011 Dave Airlie <airlied at redhat.com> 7.11-10
+- snapshot latest mesa 7.11 stable branch (what will be 7.11.1)
+
* Thu Nov 03 2011 Adam Jackson <ajax at redhat.com> 7.11-9
- mesa-7.11-fix-sw-24bpp.patch: Fix software rendering in 24bpp.
diff --git a/sources b/sources
index dc42737..81d81a6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
-ff03aca82d0560009a076a87c888cf13 MesaLib-7.11.tar.bz2
+333f61aac5367c8b7b9ea22943c448b1 mesa-20111103.tar.xz
More information about the scm-commits
mailing list