From 31625e5ce938e9af7162d345d0e6a2a7984b9cb1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Tue, 19 Sep 2017 23:50:42 +0200
Subject: [PATCH] - fix for Xorg crashes on Radeon cards - rel 2

---
 Mesa.spec     |  4 +++-
 b101832.patch | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 b101832.patch

diff --git a/Mesa.spec b/Mesa.spec
index 856cc65..d4a1a57 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -64,12 +64,13 @@ Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
 Version:	17.2.1
-Release:	1
+Release:	2
 License:	MIT (core) and others - see license.html file
 Group:		X11/Libraries
 Source0:	ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz
 # Source0-md5:	f53ed38110237d9df5f9198c09ef0ab0
 Patch0:		%{name}-link.patch
+Patch1:		b101832.patch
 URL:		http://www.mesa3d.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -1268,6 +1269,7 @@ radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD.
 %prep
 %setup -q -n mesa-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/b101832.patch b/b101832.patch
new file mode 100644
index 0000000..57b13a6
--- /dev/null
+++ b/b101832.patch
@@ -0,0 +1,14 @@
+https://bugs.freedesktop.org/show_bug.cgi?id=101832
+
+--- mesa-17.2.0-rc5/src/gallium/drivers/swr/rasterizer/core/utils.h.omv~	2017-08-31 00:39:53.063561929 +0200
++++ mesa-17.2.0-rc5/src/gallium/drivers/swr/rasterizer/core/utils.h	2017-08-31 00:40:13.853833494 +0200
+@@ -347,7 +347,8 @@ static INLINE std::string GetEnv(const s
+     output.resize(valueSize - 1); // valueSize includes null, output.resize() does not
+     GetEnvironmentVariableA(variableName.c_str(), &output[0], valueSize);
+ #else
+-    output = getenv(variableName.c_str());
++    char *o = getenv(variableName.c_str());
++    output = o ? std::string(o) : std::string();
+ #endif
+ 
+     return output;
-- 
2.44.0