[mesa/devel] update to latest master snap

[Igor Gnatenko]

commit 66964d96aaefebd8b2bd3aa3acb5879ff4882a74
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date:   Mon May 12 18:35:18 2014 +0400

    update to latest master snap
    
    Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>

 .gitignore           |    1 +
 make-git-snapshot.sh |   12 +++++++++---
 mesa.spec            |   16 ++++++++++------
 sources              |    2 +-
 4 files changed, 21 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38baedd..95f7e35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ mesa-20100720.tar.bz2
 /mesa-20140430.tar.xz
 /mesa-20140505.tar.xz
 /mesa-20140510.tar.xz
+/mesa-8baed872126b331aa8d789b78986c0100c6d853a.tar.xz
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
index b5045fe..eacbac9 100755
--- a/make-git-snapshot.sh
+++ b/make-git-snapshot.sh
@@ -11,15 +11,21 @@ else
     XZ=/usr/bin/xz
 fi
 
-DIRNAME=mesa-$( date +%Y%m%d )
+if [ -z "$1" ]; then
+  DIRNAME=mesa-$( date +%Y%m%d )
+  BRANCH=10.2
+else
+  DIRNAME=mesa-$1
+  BRANCH=master
+fi
 
 echo REF ${REF:+--reference $REF}
 echo DIRNAME $DIRNAME
-echo HEAD ${1:-10.2}
+echo HEAD ${1:-$BRANCH}
 
 rm -rf $DIRNAME
 
-git clone --depth 1 ${REF:+--reference $REF} --branch 10.2 \
+git clone --depth 1 ${REF:+--reference $REF} --branch $BRANCH \
 	git://git.freedesktop.org/git/mesa/mesa $DIRNAME
 
 GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
diff --git a/mesa.spec b/mesa.spec
index e7de376..b798c8a 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -53,19 +53,20 @@
 
 %define _default_patch_fuzz 2
 
-%define gitdate 20140510
-#% define snapshot 
+#% define gitdate 20140510
+%define githash 8baed872126b331aa8d789b78986c0100c6d853a
+%define git %{?githash:%{githash}}%{!?githash:%{gitdate}}
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 10.2
-Release: 0.4.rc2.%{gitdate}%{?dist}
+Version: 10.3
+Release: 0.devel.1.%{git}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 
 # Source0: MesaLib-%{version}.tar.xz
-Source0: %{name}-%{gitdate}.tar.xz
+Source0: %{name}-%{git}.tar.xz
 Source1: sanitize-tarball.sh
 Source2: make-release-tarball.sh
 Source3: make-git-snapshot.sh
@@ -332,7 +333,7 @@ Mesa OpenCL development package.
 
 %prep
 #setup -q -n Mesa-%{version}%{?snapshot}
-%setup -q -n mesa-%{gitdate}
+%setup -q -n mesa-%{git}
 grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
 %patch1 -p1 -b .nv50rtti
 
@@ -672,6 +673,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon May 12 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 10.3-0.devel.1.8baed872126b331aa8d789b78986c0100c6d853a
+- 8baed872126b331aa8d789b78986c0100c6d853a upstream commit
+
 * Sat May 10 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 10.2-0.4.rc2.20140510
 - 10.2-rc2 upstream release
 - drop radeonsi hack for LLVM
diff --git a/sources b/sources
index 1f11317..62f19f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8845801d47c3d9725b9cd56f6277f783  mesa-20140510.tar.xz
+24874de926ab6bf46dab9c583e21996a  mesa-8baed872126b331aa8d789b78986c0100c6d853a.tar.xz