From f139a3cbb402a86dd04702734431d53612a4b04ed1e8729e48c47380a1f3a35c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 9 Jul 2014 10:45:56 +0000 Subject: [PATCH] - Update to version 10.2.3 * Mesa 10.2.3 is a bug fix release which fixes bugs fixed since the 10.2.2 release - obsoletes u_mesa-gallium-llvmpipe-fix-SIGFPE.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=383 --- Mesa.changes | 8 ++++++++ Mesa.spec | 7 ++----- MesaLib-10.2.1.tar.bz2 | 3 --- MesaLib-10.2.3.tar.bz2 | 3 +++ u_mesa-gallium-llvmpipe-fix-SIGFPE.patch | 24 ------------------------ 5 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 MesaLib-10.2.1.tar.bz2 create mode 100644 MesaLib-10.2.3.tar.bz2 delete mode 100644 u_mesa-gallium-llvmpipe-fix-SIGFPE.patch diff --git a/Mesa.changes b/Mesa.changes index e6b3ed1..39067b1 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jul 9 09:04:35 UTC 2014 - sndirsch@suse.com + +- Update to version 10.2.3 + * Mesa 10.2.3 is a bug fix release which fixes bugs fixed since + the 10.2.2 release +- obsoletes u_mesa-gallium-llvmpipe-fix-SIGFPE.patch + ------------------------------------------------------------------- Sun Jun 8 01:22:36 UTC 2014 - tobias.johannes.klausmann@mni.thm.de diff --git a/Mesa.spec b/Mesa.spec index cf5b828..47a492f 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -58,10 +58,10 @@ %endif %define _name_archive MesaLib -%define _version 10.2.1 +%define _version 10.2.3 Name: Mesa -Version: 10.2.1 +Version: 10.2.3 Release: 0 BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -149,8 +149,6 @@ Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch Patch13: u_mesa-8.0.1-fix-16bpp.patch # Patch from Fedora, use shmget when available, under llvmpipe Patch15: u_mesa-8.0-llvmpipe-shmget.patch -# to be upstreamed -Patch16: u_mesa-gallium-llvmpipe-fix-SIGFPE.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -516,7 +514,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} #%patch15 -p1 #%patch13 -p1 ### -%patch16 -p1 %build rm -f src/mesa/depend diff --git a/MesaLib-10.2.1.tar.bz2 b/MesaLib-10.2.1.tar.bz2 deleted file mode 100644 index 9549acb..0000000 --- a/MesaLib-10.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:461277909207da689d8152cfbf9e182ea6f70e1e672ab64c67df83725c8d2b54 -size 7109792 diff --git a/MesaLib-10.2.3.tar.bz2 b/MesaLib-10.2.3.tar.bz2 new file mode 100644 index 0000000..3800935 --- /dev/null +++ b/MesaLib-10.2.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e482a96170c98b17d6aba0d6e4dda4b9a2e61c39587bb64ac38cadfa4aba4aeb +size 7127618 diff --git a/u_mesa-gallium-llvmpipe-fix-SIGFPE.patch b/u_mesa-gallium-llvmpipe-fix-SIGFPE.patch deleted file mode 100644 index db1f54a..0000000 --- a/u_mesa-gallium-llvmpipe-fix-SIGFPE.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Takashi Iwai -Subject: Fix zero-division in llvmpipe_texture_layout() -References: bnc#879462 - -Fix the crash of "gnome-control-center info" invocation on QEMU where -zero height is passed at init. - -Signed-off-by: Takashi Iwai - ---- - src/gallium/drivers/llvmpipe/lp_texture.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/gallium/drivers/llvmpipe/lp_texture.c -+++ b/src/gallium/drivers/llvmpipe/lp_texture.c -@@ -115,7 +115,7 @@ llvmpipe_texture_layout(struct llvmpipe_ - lpr->row_stride[level] = align(nblocksx * block_size, util_cpu_caps.cacheline); - - /* if row_stride * height > LP_MAX_TEXTURE_SIZE */ -- if (lpr->row_stride[level] > LP_MAX_TEXTURE_SIZE / nblocksy) { -+ if (nblocksy && lpr->row_stride[level] > LP_MAX_TEXTURE_SIZE / nblocksy) { - /* image too large */ - goto fail; - }