Attachment 892875 Details for Bug 1091696 – Update to 10.1.2.

[patch] Update to 10.1.2.

0001-Update-to-10.1.2.patch (text/plain), 2.26 KB, created by Michael Kuhn on 2014-05-06 13:18:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Kuhn

Created: 2014-05-06 13:18:44 UTC

Size: 2.26 KB

patch

obsolete

>From cc5c28cde1d6d35ef68a10f32d14357c0ea39788 Mon Sep 17 00:00:00 2001
>From: Michael Kuhn <suraia@ikkoku.de>
>Date: Tue, 6 May 2014 15:13:04 +0200
>Subject: [PATCH] Update to 10.1.2.
>
>---
> mesa.spec           | 23 +++++++++++++++++------
> sanitize-tarball.sh |  5 +++--
> 2 files changed, 20 insertions(+), 8 deletions(-)
>
>diff --git a/mesa.spec b/mesa.spec
>index cdaca43..fa1b4c8 100644
>--- a/mesa.spec
>+++ b/mesa.spec
>@@ -49,19 +49,22 @@
> 
> %define _default_patch_fuzz 2
> 
>-%define gitdate 20140419
>+#define gitdate 20140419
> #% define snapshot 
> 
> Summary: Mesa graphics libraries
> Name: mesa
>-Version: 10.1.1
>-Release: 2.%{gitdate}%{?dist}
>+Version: 10.1.2
>+Release: 1%{?gitdate:.%{gitdate}}%{?dist}
> License: MIT
> Group: System Environment/Libraries
> URL: http://www.mesa3d.org
> 
>-# Source0: MesaLib-%{version}.tar.xz
>+%if 0%{?gitdate}
> Source0: %{name}-%{gitdate}.tar.xz
>+%else
>+Source0: MesaLib-%{version}.tar.xz
>+%endif
> Source1: sanitize-tarball.sh
> Source2: make-release-tarball.sh
> Source3: make-git-snapshot.sh
>@@ -315,9 +318,14 @@ Requires: mesa-libOpenCL%{?_isa} = %{version}-%{release}
> Mesa OpenCL development package.
> %endif
> 
>+%if 0%{?gitdate}
>+%define mesadir mesa-%{gitdate}
>+%else
>+%define mesadir Mesa-%{version}%{?snapshot}
>+%endif
>+
> %prep
>-#setup -q -n Mesa-%{version}%{?snapshot}
>-%setup -q -n mesa-%{gitdate}
>+%setup -q -n %{mesadir}
> grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
> %patch1 -p1 -b .nv50rtti
> 
>@@ -645,6 +653,9 @@ rm -rf $RPM_BUILD_ROOT
> %endif
> 
> %changelog
>+* Tue May 06 2014 Michael Kuhn <suraia@ikkoku.de> - 10.1.2-1
>+- Update to 10.1.2.
>+
> * 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
> 
>diff --git a/sanitize-tarball.sh b/sanitize-tarball.sh
>index 414882a..8f14ba2 100755
>--- a/sanitize-tarball.sh
>+++ b/sanitize-tarball.sh
>@@ -13,7 +13,8 @@ else
>     XZ=/usr/bin/xz
> fi
> 
>-dirname=$(basename $(basename "$1" .tar.bz2) .tar.xz)
>+basname=$(basename $(basename "$1" .tar.bz2) .tar.xz)
>+dirname=$(echo $basname | sed 's/MesaLib/Mesa/')
> 
> tar xf "$1"
> pushd $dirname
>@@ -52,4 +53,4 @@ vl_create_decoder(struct pipe_context *pipe,
> EOF
> 
> popd
>-tar cf - $dirname | $XZ > $dirname.tar.xz
>+tar cf - $dirname | $XZ > $basname.tar.xz
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1091696: 890201 | 892875