From 282ba8b4b30eb3a68ecce10600dc9a16f3c9de53 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@fedoraproject.org>
Date: Oct 02 2006 22:06:48 +0000
Subject: * Mon Oct  2 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-44.fc6

- xorg-x11-server-1.1.1-offscreen-pixmaps.patch: Take the server lock
  before calling back into XAA to evict pixmaps.

---

diff --git a/xorg-x11-server-1.1.1-offscreen-pixmaps.patch b/xorg-x11-server-1.1.1-offscreen-pixmaps.patch
index 3841b04..4462cee 100644
--- a/xorg-x11-server-1.1.1-offscreen-pixmaps.patch
+++ b/xorg-x11-server-1.1.1-offscreen-pixmaps.patch
@@ -33,7 +33,7 @@
  XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
 --- ./GL/glx/glxdri.c.offscreen-pixmaps	2006-08-30 16:46:45.000000000 -0400
 +++ ./GL/glx/glxdri.c	2006-08-30 16:45:52.000000000 -0400
-@@ -367,6 +367,19 @@
+@@ -367,6 +367,21 @@
      int		bpp;
      GLenum	target, format, type;
  
@@ -45,7 +45,9 @@
 +      static int evictedPixmaps;
 +
 +      if (!evictedPixmaps) {
++	__glXDRIenterServer();
 +	XAAEvictPixmaps();
++	__glXDRIleaveServer();
 +	evictedPixmaps = TRUE;
 +      }
 +    }
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 3822f44..c81d7d8 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   43%{?dist}
+Release:   44%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -719,6 +719,10 @@ rm -rf $RPM_BUILD_ROOT
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Oct  2 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-44.fc6
+- xorg-x11-server-1.1.1-offscreen-pixmaps.patch: Take the server lock
+  before calling back into XAA to evict pixmaps.
+
 * Wed Sep 27 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-43.fc6
 - xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch: Since the
   VT_ACTIVATE/VT_WAITACTIVE pair are never guaranteed to successfully