Accepting request 391125 from X11:XOrg

- u_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.patch 
  * dri3: Check for dummyContext to see if the glx_context is valid
    According to the comments in src/glx/glxcurrent.c 
    __glXGetCurrentContext() always returns a valid pointer. If no
    context is made current, it will contain dummyContext. Thus a
    test for NULL will always fail.

- update to 11.2.1
* It fixes crashes in VAAPI, some build problems in Nine has been addressed,
    adds a drirc workaround for Warsow and resolves issues in the nouveau,
    radeonsi and i965 drivers.
* fdo#93962 ES2-CTS.gtf.GL2FixedTests.scissor.scissor - segfault/asserts

OBS-URL: https://build.opensuse.org/request/show/391125
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=264

Mesa.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Thu Apr 21 09:36:08 UTC 2016 - sndirsch@suse.com
+
+- u_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.patch 
+  * dri3: Check for dummyContext to see if the glx_context is valid
+    According to the comments in src/glx/glxcurrent.c 
+    __glXGetCurrentContext() always returns a valid pointer. If no
+    context is made current, it will contain dummyContext. Thus a
+    test for NULL will always fail.
+
+-------------------------------------------------------------------
+Sun Apr 17 19:13:12 UTC 2016 - mimi.vx@gmail.com
+
+- update to 11.2.1
+* It fixes crashes in VAAPI, some build problems in Nine has been addressed,
+    adds a drirc workaround for Warsow and resolves issues in the nouveau,
+    radeonsi and i965 drivers.
+* fdo#93962 ES2-CTS.gtf.GL2FixedTests.scissor.scissor - segfault/asserts
+
 -------------------------------------------------------------------
 Mon Apr  4 19:57:06 UTC 2016 - mimi.vx@gmail.com
 

Mesa.spec

@@ -18,7 +18,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 11.2.0
+%define _version 11.2.1
 %define with_opencl 0
 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
 %define gallium_loader 1
@@ -42,7 +42,7 @@
 %endif
 %endif
 Name:           Mesa
-Version:        11.2.0
+Version:        11.2.1
 Release:        0
 Summary:        System for rendering interactive 3-D graphics
 License:        MIT
@@ -58,6 +58,7 @@ Source7:        Mesa.keyring
 # required for building against wayland of openSUSE 13.1
 Patch0:         n_Fixed-build-against-wayland-1.2.1.patch
 Patch1:         u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch
+Patch2:         u_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.patch
 # to be upstreamed
 Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 # Patch from Fedora, fix 16bpp in llvmpipe
@@ -555,6 +556,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch0 -p1
 %endif
 %patch1 -p1
+%patch2 -p1
 ### disabled, but not dropped yet; these still need investigation in
 ### order to figure out whether the issue is still reproducable and
 ### hence a fix is required

mesa-11.2.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c1fed2674abf3f16ed2623e9a5694d6752c293194e18462ebc644a19cfaafb2
-size 7856132

mesa-11.2.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a65207e9ae5c5f1c29f863c6a2cc98a7ab99762a24b82a248337f0ea9cfce01b
+size 7857308

u_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.patch

@@ -0,0 +1,40 @@
+From 2be941ebf55e9533652634b180fdbdd0c24075ea Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Thu, 21 Apr 2016 11:26:07 +0200
+Subject: [PATCH] dri3: Check for dummyContext to see if the glx_context is
+ valid
+
+According to the comments in src/glx/glxcurrent.c __glXGetCurrentContext()
+always returns a valid pointer. If no context is made current, it will
+contain dummyContext. Thus a test for NULL will always fail.
+
+https://lists.freedesktop.org/archives/mesa-dev/2016-April/113962.html
+
+Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
+---
+ src/glx/dri3_glx.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
+index 6054ffc..e7c2ec1 100644
+--- a/src/glx/dri3_glx.c
++++ b/src/glx/dri3_glx.c
+@@ -127,13 +127,9 @@ static __DRIcontext *
+ glx_dri3_get_dri_context(struct loader_dri3_drawable *draw)
+ {
+    struct glx_context *gc = __glXGetCurrentContext();
++   struct dri3_context *dri3Ctx = (struct dri3_context *) gc;
+ 
+-   if (gc) {
+-      struct dri3_context *dri3Ctx = (struct dri3_context *) gc;
+-      return dri3Ctx->driContext;
+-   }
+-
+-   return NULL;
++   return (gc != &dummyContext) ? dri3Ctx->driContext : NULL;
+ }
+ 
+ static void
+-- 
+2.6.2
+