From c83e8de593a0d0dd4124fffa38a187e0992a9dd0 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 14 Jun 2016 13:17:59 +1000
Subject: [PATCH] 11.2.2 + virgl fence fix

---
 mesa.spec | 12 ++++++++++--
 sources   |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mesa.spec b/mesa.spec
index d0f1124..942e2f5 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -50,13 +50,13 @@
 
 %define _default_patch_fuzz 2
 
-%define gitdate 20160501
+%define gitdate 20160614
 #% define githash 24ea81a
 %define git %{?githash:%{githash}}%{!?githash:%{gitdate}}
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 11.2.1
+Version: 11.2.2
 Release: 1.%{git}%{?dist}
 License: MIT
 Group: System Environment/Libraries
@@ -77,6 +77,9 @@ Patch15: mesa-9.2-hardware-float.patch
 Patch20: mesa-10.2-evergreen-big-endian.patch
 Patch30: mesa-10.3-bigendian-assert.patch
 
+# upstream backport for virgl fix
+Patch40: 0001-virgl-fix-checking-fences.patch
+
 # To have sha info in glxinfo
 BuildRequires: git-core
 
@@ -357,6 +360,8 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
 %patch20 -p1 -b .egbe
 %patch30 -p1 -b .beassert
 
+%patch40 -p1 -b .virglfix
+
 %if 0%{with_private_llvm}
 sed -i 's/llvm-config/mesa-private-llvm-config-%{__isa_bits}/g' configure.ac
 sed -i 's/`$LLVM_CONFIG --version`/&-mesa/' configure.ac
@@ -695,6 +700,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Jun 14 2016 Dave Airlie <airlied@redhat.com> - 11.2.2-1.20160614
+- 11.2.2 + virgl fence fix
+
 * Sun May 01 2016 Igor Gnatenko <ignatenko@redhat.com> - 11.2.1-1.20160601
 - 11.2.1
 
diff --git a/sources b/sources
index 1791031..5d8f70b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e1a2fe139c525b01cc39ccef3ecfd73e  mesa-20160501.tar.xz
+a9dfe51504c51358c470371154fa5592  mesa-20160614.tar.xz