Merge branch 'f21' into f20

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

.gitignore

@@ -68,6 +68,9 @@ mesa-20100720.tar.bz2
 /mesa-20140301.tar.xz
 /mesa-20140305.tar.xz
 /mesa-20140419.tar.xz
+/mesa-20140509.tar.xz
+/mesa-20140521.tar.xz
+/mesa-20140607.tar.xz
 /mesa-20140430.tar.xz
 /mesa-20140505.tar.xz
 /mesa-20140510.tar.xz
@@ -77,7 +80,11 @@ mesa-20100720.tar.bz2
 /mesa-20140608.tar.xz
 /mesa-20140625.tar.xz
 /mesa-20140711.tar.xz
-/mesa-f381c27c548aa28b003c8e188f5d627ab4105f76.tar.xz
-/mesa-c40d7d6d948912a4d51cbf8f0854cf2ebe916636.tar.xz
-/mesa-e7f2f2dea5acdbd1a12ed88914e64a38a97432f0.tar.xz
-/mesa-c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f.tar.xz
+/mesa-20140806.tar.xz
+/mesa-20140824.tar.xz
+/mesa-20140906.tar.xz
+/mesa-20140927.tar.xz
+/mesa-20141028.tar.xz
+/mesa-20141110.tar.xz
+/mesa-20141202.tar.xz
+/mesa-20141207.tar.xz

make-git-snapshot.sh

@@ -13,7 +13,7 @@ fi
 
 if [ -z "$1" ]; then
   DIRNAME=mesa-$( date +%Y%m%d )
-  BRANCH=10.2
+  BRANCH=10.3
 else
   DIRNAME=mesa-$1
   BRANCH=master

mesa-10.3-bigendian-assert.patch

@@ -0,0 +1,13 @@
+diff -up mesa-20140824/src/gallium/auxiliary/util/u_math.h.be mesa-20140824/src/gallium/auxiliary/util/u_math.h
+--- mesa-20140824/src/gallium/auxiliary/util/u_math.h.be	2014-08-28 15:30:32.560480333 +0200
++++ mesa-20140824/src/gallium/auxiliary/util/u_math.h	2014-08-28 15:30:56.275479755 +0200
+@@ -55,6 +55,9 @@ extern "C" {
+ #include <strings.h> /* for ffs */
+ #endif
+ 
++#ifdef PIPE_ARCH_BIG_ENDIAN
++#include <assert.h>
++#endif
+ 
+ #ifndef M_SQRT2
+ #define M_SQRT2 1.41421356237309504880

mesa.spec

@@ -7,13 +7,14 @@
 %define with_wayland 1
 %endif
 
-%ifarch ppc64le
+%ifarch %{power64} ppc
 %undefine with_vdpau
 %endif
 
 # S390 doesn't have video cards, but we need swrast for xserver's GLX
 # llvm (and thus llvmpipe) doesn't actually work on ppc32
-%ifnarch s390 ppc  ppc64le
+# llvm support for ppc64le is supposed to come in llvm-3.5
+%ifnarch s390 ppc ppc64le
 %define with_llvm 1
 %endif
 
@@ -22,13 +23,13 @@
 %define with_radeonsi 1
 %endif
 
-%ifarch s390 s390x ppc64le ppc
+%ifarch s390 s390x %{power64} ppc
 %define with_hardware 0
 %define base_drivers swrast
 %endif
-%ifnarch s390 s390x ppc64le ppc
+%ifnarch s390 s390x %{power64} ppc
 %define with_hardware 1
-%define base_drivers nouveau,radeon,r200
+%define base_drivers swrast,nouveau,radeon,r200
 %ifarch %{ix86} x86_64
 %define platform_drivers ,i915,i965
 %define with_vmware 1
@@ -47,14 +48,14 @@
 
 %define _default_patch_fuzz 2
 
-#% define gitdate 20140510
-%define githash c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f
+%define gitdate 20141207
+#% define githash c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f
 %define git %{?githash:%{githash}}%{!?githash:%{gitdate}}
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 10.4
-Release: 0.devel.1.%{git}%{?dist}
+Version: 10.3.5
+Release: 1.%{git}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -75,6 +76,7 @@ Patch9: mesa-8.0-llvmpipe-shmget.patch
 Patch12: mesa-8.0.1-fix-16bpp.patch
 Patch15: mesa-9.2-hardware-float.patch
 Patch20: mesa-10.2-evergreen-big-endian.patch
+Patch30: mesa-10.3-bigendian-assert.patch
 
 # https://bugs.freedesktop.org/show_bug.cgi?id=73512
 Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch
@@ -341,6 +343,7 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
 
 %patch15 -p1 -b .hwfloat
 %patch20 -p1 -b .egbe
+%patch30 -p1 -b .beassert
 
 %if 0%{?with_opencl}
 %patch99 -p1 -b .icd
@@ -532,11 +535,15 @@ rm -rf $RPM_BUILD_ROOT
 %if 0%{?with_vmware}
 %{_libdir}/dri/vmwgfx_dri.so
 %endif
+%endif
+%if 0%{?with_llvm}
+%ifarch %{ix86} x86_64
 %dir %{_libdir}/gallium-pipe
 %{_libdir}/gallium-pipe/*.so
 %endif
-%{_libdir}/dri/swrast_dri.so
 %{_libdir}/dri/kms_swrast_dri.so
+%endif
+%{_libdir}/dri/swrast_dri.so
 
 %if %{with_hardware}
 %if 0%{?with_omx}
@@ -672,88 +679,32 @@ rm -rf $RPM_BUILD_ROOT
 # Generate changelog using:
 # git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)"
 %changelog
-* Sat Aug 23 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.4-0.devel.1.c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f
-- 10.4 c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f
+* Sun Dec 07 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3.5-1.20141207
+- 10.3.5
 
-* Fri Aug 22 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3-0.rc1.1.e7f2f2dea5acdbd1a12ed88914e64a38a97432f0
-- e7f2f2dea5acdbd1a12ed88914e64a38a97432f0 commit
+* Tue Dec 02 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3.4-1.20141202
+- 10.3.4
 
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10.3-0.devel.2.c40d7d6d948912a4d51cbf8f0854cf2ebe916636.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+* Mon Nov 10 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3.3-1.20141110
+- 10.3.3
 
-* Wed Aug 06 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3-0.devel.2.c40d7d6d948912a4d51cbf8f0854cf2ebe916636
-- c40d7d6d948912a4d51cbf8f0854cf2ebe916636 commit
+* Tue Oct 28 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3.2-1.20141028
+- 10.3.2
 
-* Fri Jul 11 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3-0.devel.1.f381c27c548aa28b003c8e188f5d627ab4105f76
-- Rebase to 'master' branch (f381c27c548aa28b003c8e188f5d627ab4105f76 commit)
+* Sat Jun 07 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.1.5-1.20140607
+- 10.1.5 upstream release
 
-* Fri Jul 11 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2.3-1.20140711
-- 10.2.3 upstream release
+* Thu May 29 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.1.4-3.20140521
+- drop previous patch (not needed for F20)
 
-* Mon Jul  7 2014 Peter Robinson <pbrobinson@fedoraproject.org> 10.2.2-4.20140625
-- Build aarch64 options the same as ARMv7
-- Fix PPC conditionals
-
-* Fri Jul 04 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2.2-3.20140625
-- Fix up intelInitScreen2 for DRI3 (RHBZ #1115323) (patch from drago01)
-
-* Fri Jun 27 2014 Dave Airlie <airlied@redhat.com> 10.2.2-2.20140625
-- add dri3 gnome-shell startup fix from Jasper.
-
-* Wed Jun 25 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2.2-1.20140625
-- 10.2.2 upstream release
-
-* Wed Jun 11 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2.1-2.20140608
-- drop radeonsi llvm hack
-
-* Sun Jun 08 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2.1-1.20140608
-- 10.2.1 upstream release
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10.2-0.11.rc5.20140531
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Jun 04 2014 Dan Horák <dan[at]danny.cz> - 10.2-0.10.rc5.20140531
-- fix build without hardware drivers
-
-* Sat May 31 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2-0.9.rc5.20140531
-- 10.2-rc5 upstream release
-
-* Wed May 28 2014 Brent Baude <baude@us.ibm.com> - 10.2-0.8.rc4.20140524
-- Removing ppc64le arch from with_llvm
-
-* Wed May 28 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2-0.7.rc4.20140524
+* Wed May 28 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.1.4-2.20140521
 - i915: add a missing NULL pointer check (RHBZ #1100967)
 
-* Sat May 24 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2-0.6.rc4.20140524
-- 10.2-rc4 upstream release
-- add back updated radeonsi hack for LLVM
+* Wed May 21 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.1.4-1.20140521
+- 10.1.4 upstream release
 
-* Sat May 17 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2-0.5.rc3.20140517
-- 10.2-rc3 upstream release
-
-* Sat May 10 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2-0.4.rc2.20140510
-- 10.2-rc2 upstream release
-- drop radeonsi hack for LLVM
-
-* Tue May 06 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2-0.3.rc1.20140505
-- Move gallium-pipe to the correct sub-package (RHBZ #1094588) (kwizart)
-- Move egl_gallium.so to the correct location (RHBZ #1094588) (kwizart)
-- Switch from with to enable for llvm shared libs (kwizart)
-
-* Mon May 05 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2-0.2.rc1.20140505
-- Enable gallium-egl (needed by freedreeno) (RHBZ #1094199) (kwizart)
-
-* Mon May 05 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2-0.1.rc1.20140505
-- Enable omx on x86 and arm (RHBZ #1094199) (kwizart)
-- Split _with_xa from _with_vmware (RHBZ #1094199) (kwizart)
-- Add _with_xa when arch is arm and _with_freedreeno (RHBZ #1094199) (kwizart)
-
-* Mon May 05 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2-0.rc1.20140505
-- 10.2-rc1 upstream release
-
-* Wed Apr 30 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.1.1-3.20140430
-- Update to today snapshot
-- apply as downstream patches for reporting GPU max frequency on r600 (FD.o #73511)
+* Fri May 09 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.1.3-1.20140509
+- 10.1.3 upstream release
 
 * Sat Apr 19 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.1.1-2.20140419
 - fix buildrequires llvm 3.4-5 to 3.4-6, because 3.4-5 is not available for F20

sources

@@ -1 +1 @@
-47debe611a8154fc008719ef7549b9f5  mesa-c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f.tar.xz
+46b63b0a37362b78c6be8e144295d206  mesa-20141207.tar.xz