From 1e0d9d7d351d61968e5ee6ff858c4c00a125216f5b69512c3968118a7b608348 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 19 May 2014 21:37:42 +0000 Subject: [PATCH 1/3] Accepting request 234744 from home:tobijk:X11:XOrg 10.2-rc3 OBS-URL: https://build.opensuse.org/request/show/234744 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=376 --- Mesa.changes | 6 ++++++ Mesa.spec | 4 ++-- MesaLib-10.2.0-rc2.tar.bz2 | 3 --- MesaLib-10.2.0-rc3.tar.bz2 | 3 +++ 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 MesaLib-10.2.0-rc2.tar.bz2 create mode 100644 MesaLib-10.2.0-rc3.tar.bz2 diff --git a/Mesa.changes b/Mesa.changes index 27bc0bf..0de08f3 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 19 16:10:36 UTC 2014 - tobias.johannes.klausmann@mni.thm.de + +- Update to 10.2-rc3 + Even more bugfixes + ------------------------------------------------------------------- Mon May 12 09:32:19 UTC 2014 - schwab@suse.de diff --git a/Mesa.spec b/Mesa.spec index 806a716..b9e4910 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -58,10 +58,10 @@ %endif %define _name_archive MesaLib -%define _version 10.2.0-rc2 +%define _version 10.2.0-rc3 Name: Mesa -Version: 10.2.0~rc2 +Version: 10.2.0~rc3 Release: 0 BuildRequires: autoconf >= 2.60 BuildRequires: automake diff --git a/MesaLib-10.2.0-rc2.tar.bz2 b/MesaLib-10.2.0-rc2.tar.bz2 deleted file mode 100644 index 8613b14..0000000 --- a/MesaLib-10.2.0-rc2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7ef2f04c1decbee6ff0b452d49e61bc88f3e349581e232c6d4287b20c083ce2 -size 7098130 diff --git a/MesaLib-10.2.0-rc3.tar.bz2 b/MesaLib-10.2.0-rc3.tar.bz2 new file mode 100644 index 0000000..96e21e7 --- /dev/null +++ b/MesaLib-10.2.0-rc3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b87eb789c944d9a666ee0e5d7d5684180569bc4b30cd65c5c7f909ab1e7a833e +size 7106047 From f6d83c7f3072f13af5ae0cba1448e840165a51855ab8534edd01296b82b7a3d3 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 27 May 2014 07:46:33 +0000 Subject: [PATCH 2/3] Accepting request 235470 from home:tobijk:X11:XOrg update to version 10.2-rc4 OBS-URL: https://build.opensuse.org/request/show/235470 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=377 --- Mesa.changes | 6 ++++++ Mesa.spec | 4 ++-- MesaLib-10.2.0-rc3.tar.bz2 | 3 --- MesaLib-10.2.0-rc4.tar.bz2 | 3 +++ 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 MesaLib-10.2.0-rc3.tar.bz2 create mode 100644 MesaLib-10.2.0-rc4.tar.bz2 diff --git a/Mesa.changes b/Mesa.changes index 0de08f3..9e66b88 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 26 23:36:44 UTC 2014 - tobias.johannes.klausmann@mni.thm.de + +- Update to version 10.2-rc4: + Another round of bugfixes towards the final 10.2 + ------------------------------------------------------------------- Mon May 19 16:10:36 UTC 2014 - tobias.johannes.klausmann@mni.thm.de diff --git a/Mesa.spec b/Mesa.spec index b9e4910..331afcd 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -58,10 +58,10 @@ %endif %define _name_archive MesaLib -%define _version 10.2.0-rc3 +%define _version 10.2.0-rc4 Name: Mesa -Version: 10.2.0~rc3 +Version: 10.2.0~rc4 Release: 0 BuildRequires: autoconf >= 2.60 BuildRequires: automake diff --git a/MesaLib-10.2.0-rc3.tar.bz2 b/MesaLib-10.2.0-rc3.tar.bz2 deleted file mode 100644 index 96e21e7..0000000 --- a/MesaLib-10.2.0-rc3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b87eb789c944d9a666ee0e5d7d5684180569bc4b30cd65c5c7f909ab1e7a833e -size 7106047 diff --git a/MesaLib-10.2.0-rc4.tar.bz2 b/MesaLib-10.2.0-rc4.tar.bz2 new file mode 100644 index 0000000..67ad4be --- /dev/null +++ b/MesaLib-10.2.0-rc4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11c015b59e039d6615d2443789429f97b96c3880085416f194c421a17242c63d +size 7110521 From 337c2ab7121e4df3a0c67d0ec847dec06f4b5c6fc0f54023370001fe9ac6b116 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 27 May 2014 12:05:25 +0000 Subject: [PATCH 3/3] Accepting request 235536 from home:tiwai:branches:X11:XOrg - Fix zero-division with empty height (bnc#879462) u_mesa-gallium-llvmpipe-fix-SIGFPE.patch OBS-URL: https://build.opensuse.org/request/show/235536 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=378 --- Mesa.changes | 6 ++++++ Mesa.spec | 3 +++ u_mesa-gallium-llvmpipe-fix-SIGFPE.patch | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 u_mesa-gallium-llvmpipe-fix-SIGFPE.patch diff --git a/Mesa.changes b/Mesa.changes index 9e66b88..cf79a28 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 27 13:39:00 CEST 2014 - tiwai@suse.de + +- Fix zero-division with empty height (bnc#879462) + u_mesa-gallium-llvmpipe-fix-SIGFPE.patch + ------------------------------------------------------------------- Mon May 26 23:36:44 UTC 2014 - tobias.johannes.klausmann@mni.thm.de diff --git a/Mesa.spec b/Mesa.spec index 331afcd..17d7f88 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -149,6 +149,8 @@ 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 @@ -514,6 +516,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} #%patch15 -p1 #%patch13 -p1 ### +%patch16 -p1 %build rm -f src/mesa/depend diff --git a/u_mesa-gallium-llvmpipe-fix-SIGFPE.patch b/u_mesa-gallium-llvmpipe-fix-SIGFPE.patch new file mode 100644 index 0000000..db1f54a --- /dev/null +++ b/u_mesa-gallium-llvmpipe-fix-SIGFPE.patch @@ -0,0 +1,24 @@ +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; + }