Merge remote-tracking branch 'origin/f16' into f15

Conflicts:
	.gitignore

.gitignore

@@ -22,7 +22,13 @@ mesa-20100720.tar.bz2
 /mesa-20110330.tar.xz
 /mesa-20110401.tar.xz
 /mesa-20110412.tar.xz
-/mesa-20110620.tar.xz
+/mesa-20110506.tar.xz
+/mesa-20110509.tar.xz
+/mesa-20110525.tar.xz
+/mesa-20110621.tar.xz
+/mesa-20110626.tar.xz
+/mesa-20110709.tar.xz
+/mesa-20110729.tar.xz
 /mesa-20110730.tar.xz
-/MesaLib-7.11.tar.bz2
 /mesa-20111103.tar.xz
+/MesaLib-7.11.2.tar.bz2

mesa.spec

@@ -20,21 +20,21 @@
 %define _default_patch_fuzz 2
 
 %define manpages gl-manpages-1.0.1
-%define gitdate 20111103
+#define gitdate 20111103
 #% define snapshot 
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 7.11
-Release: 11%{?dist}
+Version: 7.11.2
+Release: 1%{?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
 
@@ -84,6 +84,7 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Provides: libGL
 Requires: libdrm%{?isa} >= 2.4.23-1
+Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
 %if %{with_hardware}
 Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14
 %endif
@@ -213,8 +214,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
@@ -462,6 +463,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/osmesa.pc
 
 %changelog
+* Mon Nov 28 2011 Adam Jackson <ajax@redhat.com> 7.11.2-1
+- Mesa 7.11.2
+- Pull in archful -dri-drivers for libGL to pacify wine (#757464)
+
 * Wed Nov 09 2011 Adam Jackson <ajax@redhat.com> 7.11-11
 - Obsolete more -llvmcore (#752152)
 
@@ -499,34 +504,37 @@ rm -rf $RPM_BUILD_ROOT
   for all PCI arches.
 
 * Sat Jul 30 2011 Dave Airlie <airlied@redhat.com> 7.11-0.18.20110730.0
-- rebase to latest upstream snapshot (same as F15)
+- latest 7.11-rc4
 
-* Thu Jul 07 2011 Peter Lemenkov <lemenkov@gmail.com> - 7.11-0.16.20110620.0
-- Fix building on ppc (some dri1 drivers are missing)
+* Fri Jul 29 2011 Dave Airlie <airlied@redhat.com> 7.11-0.17.20110729.0
+- latest mesa snapshot of 7.11 branch
 
-* Wed Jul  6 2011 Ville Skyttä <ville.skytta@iki.fi> - 7.11-0.15.20110620.0
-- More include dir ownership fixes (#682357).
+* Sat Jul 09 2011 Dave Airlie <airlied@redhat.com> 7.11-0.16.20110709.0
+- update to latest 7.11 with additional gm45 regression fix
 
-* Tue Jul 05 2011 Adam Jackson <ajax@redhat.com> 7.11-0.14.20110620.0
-- Arch-dep and file ownership fixes (#682357)
+* Sun Jun 26 2011 Dave Airlie <airlied@redhat.com> 7.11-0.15.20110626.0
+- update to latest mesa 7.11 with intel gen5 fix
 
-* Mon Jun 20 2011 Dave Airlie <airlied@redhat.com> 7.11-0.13.20110620.0
-- rebase to 20 June snapshot from upstream - new gallium config options
+* Tue Jun 21 2011 Dave Airlie <airlied@redhat.com> 7.11-0.14.20110621.0
+- update to latest mesa 7.11 with nvfx g-s fix.
 
-* Mon Jun 20 2011 Dave Airlie <airlied@redhat.com> 7.11-0.12.20110412.0
-- dropping DRI1 is premature, fix swrastg upstream first.
+* Mon Jun 06 2011 Ben Skeggs <bskeggs@redhat.com> 7.11-0.13.20110525.0
+- nouveau: fix shell segfault on pre-gallium drivers (#708004)
 
-* Tue May 10 2011 Dan Horák <dan[at]danny.cz> 7.11-0.11.20110412.0
+* Mon May 30 2011 Dan Horák <dan[at]danny.cz> 7.11-0.12.20110525.0
+- fix the gallium p_config header for non-x86 arches (Dave Airlie)
+
+* Wed May 25 2011 Dave Airlie <airlied@redhat.com> 7.11-0.11.20110525.0
+- rebase to latest upstream for llvm fix + r600g cayman/eg support
+
+* Tue May 10 2011 Dan Horák <dan[at]danny.cz> 7.11-0.10.20110509.0
 - r300 needs to be explicitely disabled when with_hardware == 0
 
-* Mon May 09 2011 Adam Jackson <ajax@redhat.com> 7.11-0.10.20110412.0
-- Drop the separate build pass for osmesa, no longer needed.
+* Mon May 09 2011 Dave Airlie <airlied@redhat.com> 7.11-0.9.20110509.0
+- fix rv6xx regression in last set of changes (#702872)
 
-* Mon May 09 2011 Adam Jackson <ajax@redhat.com> 7.11-0.9.20110412.0
-- Drop dri1 subpackage (and its drivers), use "swrastg" consistently.
-
-* Mon May 09 2011 Adam Jackson <ajax@redhat.com> 7.11-0.8.20110412.0
-- Use llvm-libs' shared lib instead of rolling our own.
+* Fri May 06 2011 Dave Airlie <airlied@redhat.com> 7.11-0.8.20110506.0
+- rebase for better nvc0 driver + radeon rv6xx flushing fixes.
 
 * Mon Apr 18 2011 Adam Jackson <ajax@redhat.com> 7.11-0.7.20110412.0
 - Fix intel driver exclusion to be better arched (#697555)

sources

@@ -1,2 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 333f61aac5367c8b7b9ea22943c448b1  mesa-20111103.tar.xz
+0837c52698fe3252369c3fdb5195afcc  MesaLib-7.11.2.tar.bz2