From f75c54f99f35b11c14face6a5148faf31f04dbc717ab58dd1f091551ff59e3de Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 2 May 2013 12:57:35 +0000 Subject: [PATCH] Accepting request 174307 from home:sumski:branches:X11:XOrg Update to 9.1.2 OBS-URL: https://build.opensuse.org/request/show/174307 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=284 --- Mesa.changes | 25 +++++++++++++- Mesa.spec | 11 +++--- MesaLib-9.1.1.tar.bz2 | 3 -- MesaLib-9.1.2.tar.bz2 | 3 ++ u_remove-os-abi-tag.patch | 72 --------------------------------------- 5 files changed, 31 insertions(+), 83 deletions(-) delete mode 100644 MesaLib-9.1.1.tar.bz2 create mode 100644 MesaLib-9.1.2.tar.bz2 delete mode 100644 u_remove-os-abi-tag.patch diff --git a/Mesa.changes b/Mesa.changes index 86c1923..edc5db3 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu May 2 12:03:55 UTC 2013 - hrvoje.senjan@gmail.com + +- update to Mesa 9.1.2: + * [965gm] green artifacts when using GLSL in XBMC (fdo#44567) + * many new symbols in libxatracker after recent automake work + (fdo#59238) + * [SNB/IVB/HSW Bisected]Oglc draw-buffers2(advanced.blending.none) + segfault (fdo#59445) + * [i965 Bisected]Oglc fbblit(advanced.blitFb-3d-cube.mirror.both) + fails (fdo#59495) + * [r300g] Unigine Heaven 3.0: all objects are black (fdo#60503) + * Firefox 18.0.2 Crash On Nvidia GeForce2 (fdo#60510) + * [SNB Bisected] kwin_gles screen corruption (fdo#61197) + * [IVB] corrupt rendering with UBOs (fdo#61317) + * glEdgeFlag can't be set to false (fdo#61395) + * nullpointer dereference causes xorg-server segfault when nouveau + DRI driver is loaded (fdo#61947) + * llvmpipe: Fragment Shader with "return" in main causes back + output (fdo#62357) + * other bugfixes +- Drop u_remove-os-abi-tag.patch, fdo#26663 is fixed with this release + ------------------------------------------------------------------- Wed Apr 3 07:46:47 UTC 2013 - coolo@suse.com @@ -15,7 +38,7 @@ Wed Mar 20 11:10:38 UTC 2013 - hrvoje.senjan@gmail.com - update to Mesa 9.1.1: a bugfix release * [GM45] mesa demos spriteblast render incorrectly (fdo#30232) * [gles2] Ironlake: gl_PointCoord takes no effect for point sprites - (fd0#32429) + (fdo#32429) * Mesa 7.11-devel implementation error: Unexpected program target in destroy_program_variants_cb() (fdo#38086) * [snb] corrupted GLSL built-in function results when using Uniform diff --git a/Mesa.spec b/Mesa.spec index e53e8ce..f9a44d4 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -17,11 +17,11 @@ %define glamor 1 -%define _version 9.1.1 +%define _version 9.1.2 %define _name_archive MesaLib Name: Mesa -Version: 9.1.1 +Version: 9.1.2 Release: 0 BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -91,12 +91,10 @@ Source6: %name-rpmlintrc Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch # Patch from Fedora, fix 16bpp in llvmpipe Patch13: u_mesa-8.0.1-fix-16bpp.patch -# Patch to remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag -Patch14: u_remove-os-abi-tag.patch # Patch to fix glapi_dispatch include -Patch15: u_mesa-glapi_dispatch.patch +Patch14: u_mesa-glapi_dispatch.patch # Patch from Fedora, use shmget when available, under llvmpipe -Patch16: u_mesa-8.0-llvmpipe-shmget.patch +Patch15: u_mesa-8.0-llvmpipe-shmget.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -523,7 +521,6 @@ poor video quality, choppy videos and artefacts all over. # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} #%patch11 -p1 -%patch16 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 diff --git a/MesaLib-9.1.1.tar.bz2 b/MesaLib-9.1.1.tar.bz2 deleted file mode 100644 index 4957246..0000000 --- a/MesaLib-9.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ae5741918a26ce6457b4427663b9e0ed31a3cae1b10b9009e55769a52e9adeb -size 6122510 diff --git a/MesaLib-9.1.2.tar.bz2 b/MesaLib-9.1.2.tar.bz2 new file mode 100644 index 0000000..e34a15f --- /dev/null +++ b/MesaLib-9.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0695115f7a900624db9ade4f5bd32f4b885d9273eed020fb12b7e29a953143db +size 6122642 diff --git a/u_remove-os-abi-tag.patch b/u_remove-os-abi-tag.patch deleted file mode 100644 index 991db5e..0000000 --- a/u_remove-os-abi-tag.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 113326370fcc975af6d6fb5825728995fc8a6c70 Mon Sep 17 00:00:00 2001 -From: Tobias Klausmann -Date: Fri, 19 Oct 2012 22:46:21 +0200 -Subject: [PATCH] Subject: Remove OS ABI tag from libGL, so it is no longer - preferred over libGLs without OS ABI tag References: - bnc#765294, fdo#26663 - -Original Author: Stefan Dirsch - -changed for Mesa 9.1 ---- - src/mapi/glapi/gen/gl_x86-64_asm.py | 2 +- - src/mapi/glapi/gen/gl_x86_asm.py | 2 +- - src/mapi/mapi/entry_x86-64_tls.h | 2 +- - src/mapi/mapi/entry_x86_tls.h | 2 +- - 4 Dateien geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) - -diff --git a/src/mapi/glapi/gen/gl_x86-64_asm.py b/src/mapi/glapi/gen/gl_x86-64_asm.py -index a3548c2..edfc548 100644 ---- a/src/mapi/glapi/gen/gl_x86-64_asm.py -+++ b/src/mapi/glapi/gen/gl_x86-64_asm.py -@@ -181,7 +181,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): - - def printRealFooter(self): - print '' -- print '#if defined(GLX_USE_TLS) && defined(__linux__)' -+ print '#if 0 && defined(__linux__)' - print ' .section ".note.ABI-tag", "a"' - print ' .p2align 2' - print ' .long 1f - 0f /* name length */' -diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py -index 8b0f6ee..7e8105c 100644 ---- a/src/mapi/glapi/gen/gl_x86_asm.py -+++ b/src/mapi/glapi/gen/gl_x86_asm.py -@@ -189,7 +189,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): - print '\t\tALIGNTEXT16' - print 'GLNAME(gl_dispatch_functions_end):' - print '' -- print '#if defined(GLX_USE_TLS) && defined(__linux__)' -+ print '#if 0 && defined(__linux__)' - print ' .section ".note.ABI-tag", "a"' - print ' .p2align 2' - print ' .long 1f - 0f /* name length */' -diff --git a/src/mapi/mapi/entry_x86-64_tls.h b/src/mapi/mapi/entry_x86-64_tls.h -index 72d4125..06d4b3d 100644 ---- a/src/mapi/mapi/entry_x86-64_tls.h -+++ b/src/mapi/mapi/entry_x86-64_tls.h -@@ -28,7 +28,7 @@ - - #include "u_macros.h" - --#ifdef __linux__ -+#ifdef opensuse_dontbuild - __asm__(".section .note.ABI-tag, \"a\"\n\t" - ".p2align 2\n\t" - ".long 1f - 0f\n\t" /* name length */ -diff --git a/src/mapi/mapi/entry_x86_tls.h b/src/mapi/mapi/entry_x86_tls.h -index de91812..a38d9a0 100644 ---- a/src/mapi/mapi/entry_x86_tls.h -+++ b/src/mapi/mapi/entry_x86_tls.h -@@ -29,7 +29,7 @@ - #include - #include "u_macros.h" - --#ifdef __linux__ -+#ifdef opensuse_dontbuild - __asm__(".section .note.ABI-tag, \"a\"\n\t" - ".p2align 2\n\t" - ".long 1f - 0f\n\t" /* name length */ --- -1.7.10.4 -