Attachment 923651 Details for Bug 1126223 – Update to 10.2.5

[patch] Update to 10.2.5

0001-Update-to-10.2.5.patch (text/plain), 4.78 KB, created by Michael Kuhn on 2014-08-03 18:19:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Kuhn

Created: 2014-08-03 18:19:36 UTC

Size: 4.78 KB

patch

obsolete

>From fba3d8795a11cc02c5c408d9846146d92cd1937b Mon Sep 17 00:00:00 2001
>From: Michael Kuhn <suraia@ikkoku.de>
>Date: Sun, 3 Aug 2014 20:12:01 +0200
>Subject: [PATCH] Update to 10.2.5.
>
>---
> 0001-i915-Fix-up-intelInitScreen2-for-DRI3.patch | 40 ------------------------
> mesa.spec                                        | 29 ++++++++++-------
> sanitize-tarball.sh                              |  5 +--
> 3 files changed, 20 insertions(+), 54 deletions(-)
> delete mode 100644 0001-i915-Fix-up-intelInitScreen2-for-DRI3.patch
>
>diff --git a/0001-i915-Fix-up-intelInitScreen2-for-DRI3.patch b/0001-i915-Fix-up-intelInitScreen2-for-DRI3.patch
>deleted file mode 100644
>index f959c48..0000000
>--- a/0001-i915-Fix-up-intelInitScreen2-for-DRI3.patch
>+++ /dev/null
>@@ -1,40 +0,0 @@
>-From ea3ade19e2170bd67c3d5448fc38747b8e380d5a Mon Sep 17 00:00:00 2001
>-From: Adel Gadllah <adel.gadllah@gmail.com>
>-Date: Thu, 3 Jul 2014 22:13:53 +0200
>-Subject: [PATCH] i915: Fix up intelInitScreen2 for DRI3
>-MIME-Version: 1.0
>-Content-Type: text/plain; charset=UTF-8
>-Content-Transfer-Encoding: 8bit
>-
>-Commit 442442026eb updated both i915 and i965 for DRI3 support,
>-but one check in intelInitScreen2 was missed for i915 causing crashes
>-when trying to use i915 with DRI3.
>-
>-So fix that up.
>-
>-Reported-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
>-Tested-by: FrantiÅ¡ek Zatloukal <Zatloukal.Frantisek@gmail.com>
>-Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1115323
>-Cc: "10.2" <mesa-stable@lists.freedesktop.org>
>-Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
>----
>- src/mesa/drivers/dri/i915/intel_screen.c | 3 ++-
>- 1 file changed, 2 insertions(+), 1 deletion(-)
>-
>-diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
>-index 9b4e490..4c9726c 100644
>---- a/src/mesa/drivers/dri/i915/intel_screen.c
>-+++ b/src/mesa/drivers/dri/i915/intel_screen.c
>-@@ -1152,7 +1152,8 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
>- {
>-    struct intel_screen *intelScreen;
>- 
>--   if (psp->dri2.loader->base.version <= 2 ||
>-+   if (psp->image.loader) {
>-+   } else if (psp->dri2.loader->base.version <= 2 ||
>-        psp->dri2.loader->getBuffersWithFormat == NULL) {
>-       fprintf(stderr,
>- 	      "\nERROR!  DRI2 loader with getBuffersWithFormat() "
>--- 
>-2.0.0
>-
>diff --git a/mesa.spec b/mesa.spec
>index 1c63e4f..ae27c25 100644
>--- a/mesa.spec
>+++ b/mesa.spec
>@@ -47,19 +47,22 @@
> 
> %define _default_patch_fuzz 2
> 
>-%define gitdate 20140711
>+#define gitdate 20140711
> #% define snapshot 
> 
> Summary: Mesa graphics libraries
> Name: mesa
>-Version: 10.2.3
>-Release: 1.%{gitdate}%{?dist}
>+Version: 10.2.5
>+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
>@@ -75,10 +78,6 @@ Patch12: mesa-8.0.1-fix-16bpp.patch
> Patch15: mesa-9.2-hardware-float.patch
> Patch20: mesa-10.2-evergreen-big-endian.patch
> 
>-# http://lists.freedesktop.org/archives/mesa-dev/2014-July/062741.html
>-# https://bugzilla.redhat.com/show_bug.cgi?id=1115323
>-Patch31: 0001-i915-Fix-up-intelInitScreen2-for-DRI3.patch
>-
> # https://bugs.freedesktop.org/show_bug.cgi?id=73512
> Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch
> 
>@@ -325,9 +324,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
> 
>@@ -345,8 +349,6 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
> %patch15 -p1 -b .hwfloat
> %patch20 -p1 -b .egbe
> 
>-%patch31 -p1 -b .dri3fix
>-
> %if 0%{?with_opencl}
> %patch99 -p1 -b .icd
> %endif
>@@ -674,6 +676,9 @@ rm -rf $RPM_BUILD_ROOT
> %endif
> 
> %changelog
>+* Sun Aug 03 2014 Michael Kuhn <suraia@ikkoku.de> - 10.2.5-1
>+- Update to 10.2.5.
>+
> * Fri Jul 11 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2.3-1.20140711
> - 10.2.3 upstream release
> 
>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
>-- 
>2.0.1
>

Actions: View | Diff

Attachments on bug 1126223: 923651