[mesa/f15: 20/20] Merge branch 'f16' into f15

[Adam Jackson]

commit d015e9c7ccbfc89da0870f634ff8fad131b6cc02
Merge: 3c90dfd 36a1ccb
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Aug 2 12:37:09 2011 -0400

    Merge branch 'f16' into f15
    
    Conflicts:
    	.gitignore
    	mesa.spec
    	sources

 .gitignore                       |    6 +
 llvmcore.mk                      |    6 -
 make-demo-snapshot.sh            |   22 -
 mesa-7.1-link-shared.patch       |  101 ----
 mesa-7.1-osmesa-version.patch    |   12 -
 mesa-7.10-llvmcore.patch         |   49 +--
 mesa-7.3-965-texture-size.patch  |   16 -
 mesa-7.3-dri-configs-fixes.patch | 1001 --------------------------------------
 mesa-7.5-get-driver-name.patch   |   85 ----
 mesa.spec                        |  113 ++---
 sources                          |    2 +-
 11 files changed, 52 insertions(+), 1361 deletions(-)
---
diff --cc .gitignore
index 5998210,b185d65..f78f3b0
--- a/.gitignore
+++ b/.gitignore
@@@ -22,11 -22,6 +22,17 @@@ mesa-20100720.tar.bz
  /mesa-20110330.tar.xz
  /mesa-20110401.tar.xz
  /mesa-20110412.tar.xz
++<<<<<<< HEAD
 +/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
++=======
+ /mesa-20110620.tar.xz
+ /mesa-20110730.tar.xz
+ /MesaLib-7.11.tar.bz2
++>>>>>>> f16
diff --cc mesa.spec
index 6df670b,3d4ab94..36fdab0
--- a/mesa.spec
+++ b/mesa.spec
@@@ -475,42 -434,47 +434,50 @@@ rm -rf $RPM_BUILD_ROO
  
  %files libOSMesa-devel
  %defattr(-,root,root,-)
+ %dir %{_includedir}/GL
  %{_includedir}/GL/osmesa.h
  %{_libdir}/libOSMesa.so
+ %{_libdir}/pkgconfig/osmesa.pc
  
  %changelog
+ * Tue Aug 02 2011 Adam Jackson <ajax at redhat.com> 7.11-1
+ - Mesa 7.11
+ - Redo the driver arch exclusion, yet again.  Dear secondary arches: unless
+   it's an on-motherboard driver like i915, all PCI drivers are to be built
+   for all PCI arches.
+ 
  * Sat Jul 30 2011 Dave Airlie <airlied at 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 at gmail.com> - 7.11-0.16.20110620.0
 -- Fix building on ppc (some dri1 drivers are missing)
 +* Fri Jul 29 2011 Dave Airlie <airlied at redhat.com> 7.11-0.17.20110729.0
 +- latest mesa snapshot of 7.11 branch
  
 -* Wed Jul  6 2011 Ville Skyttä <ville.skytta at iki.fi> - 7.11-0.15.20110620.0
 -- More include dir ownership fixes (#682357).
 +* Sat Jul 09 2011 Dave Airlie <airlied at 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 at redhat.com> 7.11-0.14.20110620.0
 -- Arch-dep and file ownership fixes (#682357)
 +* Sun Jun 26 2011 Dave Airlie <airlied at 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 at 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 at 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 at redhat.com> 7.11-0.12.20110412.0
 -- dropping DRI1 is premature, fix swrastg upstream first.
 +* Mon Jun 06 2011 Ben Skeggs <bskeggs at 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
 -- r300 needs to be explicitely disabled when with_hardware == 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 at redhat.com> 7.11-0.11.20110525.0
 +- rebase to latest upstream for llvm fix + r600g cayman/eg support
  
 -* Mon May 09 2011 Adam Jackson <ajax at redhat.com> 7.11-0.10.20110412.0
 -- Drop the separate build pass for osmesa, no longer needed.
 +* 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 at redhat.com> 7.11-0.9.20110412.0
 -- Drop dri1 subpackage (and its drivers), use "swrastg" consistently.
 +* Mon May 09 2011 Dave Airlie <airlied at redhat.com> 7.11-0.9.20110509.0
 +- fix rv6xx regression in last set of changes (#702872)
  
 -* Mon May 09 2011 Adam Jackson <ajax at 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 at redhat.com> 7.11-0.8.20110506.0
 +- rebase for better nvc0 driver + radeon rv6xx flushing fixes.
  
  * Mon Apr 18 2011 Adam Jackson <ajax at redhat.com> 7.11-0.7.20110412.0
  - Fix intel driver exclusion to be better arched (#697555)