[mesa] Today's git snap of 9.2 branch

[Adam Jackson]

commit 966e17fb0623e56ce269108332cf864533f85da7
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jul 23 16:42:11 2013 -0400

    Today's git snap of 9.2 branch

 .gitignore                                         |    1 +
 ...-Disable-unused-pipeline-stages-once-at-s.patch |   92 --
 make-git-snapshot.sh                               |    4 +-
 mesa-9.2-evergreen-big-endian.patch                |   12 +
 mesa-9.2-llvmpipe-on-big-endian.patch              | 1652 --------------------
 mesa-llvmpipe-use-mcjit-on-arm.patch               |   40 -
 mesa.spec                                          |   15 +-
 sources                                            |    2 +-
 8 files changed, 23 insertions(+), 1795 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 89bfb77..4afc30a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@ mesa-20100720.tar.bz2
 /mesa-20130514.tar.xz
 /mesa-20130528.tar.xz
 /mesa-20130610.tar.xz
+/mesa-20130723.tar.xz
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
index 083365b..e393eb3 100755
--- a/make-git-snapshot.sh
+++ b/make-git-snapshot.sh
@@ -15,11 +15,11 @@ DIRNAME=mesa-$( date +%Y%m%d )
 
 echo REF ${REF:+--reference $REF}
 echo DIRNAME $DIRNAME
-echo HEAD ${1:-HEAD}
+echo HEAD ${1:-9.2}
 
 rm -rf $DIRNAME
 
-git clone --depth 1 ${REF:+--reference $REF} \
+git clone --depth 1 ${REF:+--reference $REF} --branch 9.2 \
 	git://git.freedesktop.org/git/mesa/mesa $DIRNAME
 
 GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
diff --git a/mesa-9.2-evergreen-big-endian.patch b/mesa-9.2-evergreen-big-endian.patch
new file mode 100644
index 0000000..bc6486b
--- /dev/null
+++ b/mesa-9.2-evergreen-big-endian.patch
@@ -0,0 +1,12 @@
+diff -up mesa-20130610/src/gallium/drivers/r600/evergreen_state.c.jx mesa-20130610/src/gallium/drivers/r600/evergreen_state.c
+--- mesa-20130610/src/gallium/drivers/r600/evergreen_state.c.jx	2013-06-10 13:58:51.000000000 -0400
++++ mesa-20130610/src/gallium/drivers/r600/evergreen_state.c	2013-06-17 10:24:14.687160428 -0400
+@@ -615,7 +615,7 @@ static uint32_t r600_translate_colorform
+ 
+ static uint32_t r600_colorformat_endian_swap(uint32_t colorformat)
+ {
+-	if (R600_BIG_ENDIAN) {
++	if (0 && R600_BIG_ENDIAN) {
+ 		switch(colorformat) {
+ 
+ 		/* 8-bit buffers. */
diff --git a/mesa.spec b/mesa.spec
index bc8ef76..43386ca 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -48,13 +48,13 @@
 
 %define _default_patch_fuzz 2
 
-%define gitdate 20130610
+%define gitdate 20130723
 #% define snapshot 
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 9.2
-Release: 0.13.%{gitdate}%{?dist}
+Release: 0.14.%{gitdate}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -75,10 +75,8 @@ Patch9: mesa-8.0-llvmpipe-shmget.patch
 Patch12: mesa-8.0.1-fix-16bpp.patch
 Patch15: mesa-9.2-hardware-float.patch
 Patch16: mesa-9.2-no-useless-vdpau.patch
-Patch18: mesa-9.2-llvmpipe-on-big-endian.patch
 Patch19: mesa-9.2-no-gallium-osmesa.patch
-Patch20: 0001-Revert-i965-Disable-unused-pipeline-stages-once-at-s.patch
-Patch30: mesa-llvmpipe-use-mcjit-on-arm.patch
+Patch20: mesa-9.2-evergreen-big-endian.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
 %if %{with_hardware}
@@ -303,10 +301,8 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
 
 %patch15 -p1 -b .hwfloat
 %patch16 -p1 -b .vdpau
-%patch18 -p1 -b .be
 %patch19 -p1 -b .osmesa
-%patch20 -p1 -b .revert
-%patch30 -p1 -b .arm
+%patch20 -p1 -b .egbe
 
 %if 0%{with_private_llvm}
 sed -i 's/llvm-config/mesa-private-llvm-config-%{__isa_bits}/g' configure.ac
@@ -606,6 +602,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Jul 23 2013 Adam Jackson <ajax at redhat.com> 9.2-0.14.20130723
+- Today's git snap of 9.2 branch
+
 * Sun Jul 14 2013 Kyle McMartin <kyle at redhat.com> 9.2-0.13.20130610
 - Use LLVM::MCJIT on ARM and AArch64.
 
diff --git a/sources b/sources
index a90d4d0..928ecc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ebed369f4835292aa17eb05ad5b935f1  mesa-20130610.tar.xz
+322d77c41931530f5be496f7b543ac1e  mesa-20130723.tar.xz