From 82500f989b688738580c8ab3289a935b3fa29e26 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Oct 2011 20:29:23 -0400
Subject: [PATCH] mesa-7.11-intel-swap-event.patch: Disable
 GLX_INTEL_swap_event by default; DRI2 enables it explicitly, but swrast
 doesn't and oughtn't. (#748747)

---
 mesa-7.11-intel-swap-event.patch | 12 ++++++++++++
 mesa.spec                        |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 mesa-7.11-intel-swap-event.patch

diff --git a/mesa-7.11-intel-swap-event.patch b/mesa-7.11-intel-swap-event.patch
new file mode 100644
index 0000000..0211c16
--- /dev/null
+++ b/mesa-7.11-intel-swap-event.patch
@@ -0,0 +1,12 @@
+diff -up Mesa-7.11/src/glx/glxextensions.c.jx Mesa-7.11/src/glx/glxextensions.c
+--- Mesa-7.11/src/glx/glxextensions.c.jx	2011-07-08 21:37:10.000000000 -0400
++++ Mesa-7.11/src/glx/glxextensions.c	2011-10-28 20:26:49.172259452 -0400
+@@ -139,7 +139,7 @@ static const struct extension_info known
+    { GLX(SGIX_visual_select_group),    VER(0,0), Y, Y, N, N },
+    { GLX(EXT_texture_from_pixmap),     VER(0,0), Y, N, N, N },
+ #endif
+-   { GLX(INTEL_swap_event),            VER(1,4), Y, Y, N, N },
++   { GLX(INTEL_swap_event),            VER(1,4), Y, N, N, N },
+    { NULL }
+ };
+ 
diff --git a/mesa.spec b/mesa.spec
index 650dd12..5f0a9a3 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -26,7 +26,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.11
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -50,6 +50,7 @@ Patch31: mesa-7.10-swrastg.patch
 Patch32: mesa-7.11-generic-wmb.patch
 Patch33: mesa-7.11-drisw-glx13.patch
 Patch34: 0001-nv50-fix-max-texture-levels.patch
+Patch35: mesa-7.11-intel-swap-event.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
 %if %{with_hardware}
@@ -226,6 +227,7 @@ Mesa offscreen rendering development package
 %patch32 -p1 -b .wmb
 %patch33 -p1 -b .glx13
 %patch34 -p1 -b .nv50-texlevel
+%patch35 -p1 -b .ise
 
 %build
 
@@ -464,6 +466,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/osmesa.pc
 
 %changelog
+* Fri Oct 28 2011 Adam Jackson <ajax@redhat.com> 7.11-7
+- mesa-7.11-intel-swap-event.patch: Disable GLX_INTEL_swap_event by default;
+  DRI2 enables it explicitly, but swrast doesn't and oughtn't. (#748747)
+
 * Mon Oct 24 2011 Adam Jackson <ajax@redhat.com> 7.11-6
 - 0001-nv50-fix-max-texture-levels.patch: Fix maximum texture size on
   nouveau (and thus, gnome-shell init on wide display setups) (#748540)