Accepting request 355068 from X11:XOrg

- u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch
  Check for dummyContext to see if the glx_context is valid (boo#962609).

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

Mesa.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Wed Jan 20 16:40:10 UTC 2016 - eich@suse.com
+
+- u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch
+  Check for dummyContext to see if the glx_context is valid (boo#962609).
+
+-------------------------------------------------------------------
+Wed Jan 20 15:16:11 UTC 2016 - sndirsch@suse.com
+
+- n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch 
+  * Since these are packaged separately in (open)SUSE anyway, one
+    can use copies as well. This makes debug packages possible
+    again. (bnc #962609)
+
+-------------------------------------------------------------------
+Wed Jan 13 23:14:33 UTC 2016 - mimi.vx@gmail.com
+
+- update to 11.1.1
+* Bugfix release and adding KB Lake PCI id's
++ fdo#91806 - configure does not test whether assembler supports sse4.1
++ fdo#92229 - [APITRACE] SOMA have serious graphical errors
++ fdo#92233 - Unigine Heaven 4.0 silhuette run
++ fdo#93004 - Guild Wars 2 crash on nouveau DX11 cards
++ fdo#93215 - [Regression bisected] Ogles1conform Automatic mipmap
+    generation test is fail
++ fdo#93257 - [SKL, bisected] ASTC dEQP tests segfault
++ fixes for r600,nv*,glx,glsl,radeonsi and i965
+
 -------------------------------------------------------------------
 Wed Jan  6 14:00:51 UTC 2016 - schwab@suse.de
 

Mesa.spec

@@ -18,7 +18,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 11.1.0
+%define _version 11.1.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.1.0
+Version:        11.1.1
 Release:        0
 Summary:        System for rendering interactive 3-D graphics
 License:        MIT
@@ -57,6 +57,7 @@ Source6:        %{name}-rpmlintrc
 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
 # to be upstreamed
 Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 # Patch from Fedora, fix 16bpp in llvmpipe
@@ -65,6 +66,8 @@ Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 Patch15:        u_mesa-8.0-llvmpipe-shmget.patch
 # to be upstreamed
 Patch17:        u_st-va-hardlink-driver-instances-to-gallium_drv_video.patch
+# never to be upstreamed
+Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
 BuildRequires:  bison
@@ -548,6 +551,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 # required for building against wayland of openSUSE 13.1
 %patch0 -p1
 %endif
+%patch1 -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
@@ -555,6 +559,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch15 -p1
 #%patch13 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 %if 0%{?suse_version} >= 1310

mesa-11.1.0.tar.xz

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

mesa-11.1.1.tar.xz

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

n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch

@@ -0,0 +1,52 @@
+From a9af1af5f1f9aa9fdea9e73135a92f053478f849 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Wed, 20 Jan 2016 16:10:15 +0100
+Subject: [PATCH] VDPAU/XVMC libs: Replace hardlinks with copies
+
+Since these are packaged separately in (open)SUSE anyway, one can use
+copies as well. This makes debug packages possible again. (bnc #962609)
+
+Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
+---
+ src/gallium/targets/vdpau/Makefile.am | 4 ++--
+ src/gallium/targets/xvmc/Makefile.am  | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
+index d388f8b..c9cc534 100644
+--- a/src/gallium/targets/vdpau/Makefile.am
++++ b/src/gallium/targets/vdpau/Makefile.am
+@@ -86,7 +86,7 @@ all-local: $(vdpau_LTLIBRARIES)
+ 		j=libvdpau_gallium.$(LIB_EXT);				\
+ 		k=libvdpau_$${i}.$(LIB_EXT);				\
+ 		l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0;		\
+-		ln -f .libs/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0	\
++		cp -a .libs/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0	\
+ 		      $${link_dir}/$${l};				\
+ 		ln -sf $${l}						\
+ 		       $${link_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
+@@ -111,7 +111,7 @@ install-data-hook:
+ 		j=libvdpau_gallium.$(LIB_EXT);				\
+ 		k=libvdpau_$${i}.$(LIB_EXT);				\
+ 		l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0;		\
+-		ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
++		cp -a $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
+ 		      $${dest_dir}/$${l};				\
+ 		ln -sf $${l}						\
+ 		       $${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
+diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am
+index fdc5f4b..93ef230 100644
+--- a/src/gallium/targets/xvmc/Makefile.am
++++ b/src/gallium/targets/xvmc/Makefile.am
+@@ -73,7 +73,7 @@ install-data-hook:
+ 		j=libXvMCgallium.$(LIB_EXT);				\
+ 		k=libXvMC$${i}.$(LIB_EXT);				\
+ 		l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0;			\
+-		ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0	\
++		cp -a $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0	\
+ 		      $${dest_dir}/$${l};				\
+ 		ln -sf $${l}						\
+ 		       $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR);	\
+-- 
+2.6.2
+

u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch

@@ -0,0 +1,30 @@
+From: Egbert Eich <eich@suse.de>
+Date: Wed Jan 20 13:51:11 2016 +0100
+Subject: [PATCH]dri2: Check for dummyContext to see if the glx_context is valid
+Patch-mainline: to be upstreamed
+
+References: boo#962609
+Signed-off-by: Egbert Eich <eich@suse.com>
+
+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.
+
+Signed-off-by: Egbert Eich <eich@suse.de>
+---
+ src/glx/dri2_glx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
+index 27ea952..6a5f964 100644
+--- a/src/glx/dri2_glx.c
++++ b/src/glx/dri2_glx.c
+@@ -520,7 +520,7 @@ dri2GetCurrentContext()
+    struct glx_context *gc = __glXGetCurrentContext();
+    struct dri2_context *dri2Ctx = (struct dri2_context *)gc;
+ 
+-   return dri2Ctx ? dri2Ctx->driContext : NULL;
++   return (gc != &dummyContext) ? dri2Ctx->driContext : NULL;
+ }
+ 
+ /**