Compare commits

...

1 Commits

Author SHA1 Message Date
Igor Gnatenko 66964d96aa update to latest master snap
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2014-05-12 18:41:47 +04:00
4 changed files with 21 additions and 10 deletions

1
.gitignore vendored
View File

@ -71,3 +71,4 @@ mesa-20100720.tar.bz2
/mesa-20140430.tar.xz
/mesa-20140505.tar.xz
/mesa-20140510.tar.xz
/mesa-8baed872126b331aa8d789b78986c0100c6d853a.tar.xz

View File

@ -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} \

View File

@ -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@gmail.com> - 10.3-0.devel.1.8baed872126b331aa8d789b78986c0100c6d853a
- 8baed872126b331aa8d789b78986c0100c6d853a upstream commit
* 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

View File

@ -1 +1 @@
8845801d47c3d9725b9cd56f6277f783 mesa-20140510.tar.xz
24874de926ab6bf46dab9c583e21996a mesa-8baed872126b331aa8d789b78986c0100c6d853a.tar.xz