From 3dd2e9c2102b8811b58c7dbd00fbf31b3de5504c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 29 2019 15:49:29 +0000
Subject: import mesa-18.0.5-4.el7_6


---

diff --git a/SOURCES/xshm-disable.patch b/SOURCES/xshm-disable.patch
new file mode 100644
index 0000000..bf6e3f4
--- /dev/null
+++ b/SOURCES/xshm-disable.patch
@@ -0,0 +1,12 @@
+diff -up mesa-18.0.5/src/glx/drisw_glx.c.dma mesa-18.0.5/src/glx/drisw_glx.c
+--- mesa-18.0.5/src/glx/drisw_glx.c.dma	2018-12-07 10:42:42.332659700 +1000
++++ mesa-18.0.5/src/glx/drisw_glx.c	2018-12-07 10:43:08.312349783 +1000
+@@ -812,6 +812,8 @@ static int
+ check_xshm(Display *dpy)
+ {
+    int ignore;
++   /* disable shm paths for now */
++   return 0;
+ 
+    return XQueryExtension(dpy, "MIT-SHM", &xshm_opcode, &ignore, &ignore);
+ }
diff --git a/SPECS/mesa.spec b/SPECS/mesa.spec
index 1b7ce7e..40c88d9 100644
--- a/SPECS/mesa.spec
+++ b/SPECS/mesa.spec
@@ -61,7 +61,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 18.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -83,6 +83,10 @@ Patch2: dri-sw-xshm-support.patch
 
 # fix some timeout mismatch warnings (backport from upstream)
 Patch3: fix-timeout-warnings.patch
+
+# disable xshm
+Patch4: xshm-disable.patch
+
 Patch12: mesa-8.0.1-fix-16bpp.patch
 Patch15: mesa-9.2-hardware-float.patch
 Patch20: mesa-10.2-evergreen-big-endian.patch
@@ -328,6 +332,7 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
 %patch1 -p1 -b .nv50rtti
 %patch2 -p1 -b .xshm
 %patch3 -p1 -b .timeout
+%patch4 -p1 -b .noshm
 
 #patch12 -p1 -b .16bpp
 
@@ -659,6 +664,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Dec 15 2018 Dave Airlie <airlied@redhat.com> - 18.0.5-4
+- disable shm put/get for now it caused regressions
+
 * Tue Jul 24 2018 Dave Airlie <airlied@redhat.com> - 18.0.5-3
 - rename fedora to system in glvnd fallback