From 40527b3988e4269679530c0705785ed1983533d0 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Jan 07 2009 22:15:57 +0000
Subject: * Wed Jan 07 2009 Adam Jackson <ajax@redhat.com> 1.5.99.3-7

- xserver-1.5.99.3-offscreen-pixmaps.patch: Turn off offscreen pixmaps in XAA.
  Again.  Sigh.

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 9825670..4405f91 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.3
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -75,6 +75,7 @@ Patch6002: xserver-1.5.1-mode-debug.patch
 Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch
 # 6005 should be in 1.5.99.4
 Patch6005: xserver-1.5.99.3-ddx-rules.patch
+Patch6006: xserver-1.5.99.3-offscreen-pixmaps.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -492,6 +493,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 07 2009 Adam Jackson <ajax@redhat.com> 1.5.99.3-7
+- xserver-1.5.99.3-offscreen-pixmaps.patch: Turn off offscreen pixmaps in XAA.
+  Again.  Sigh.
+
 * Wed Jan 07 2009 Adam Tkac <atkac redhat com> 1.5.99.3-6
 - use "git am" instead of "git-am"
 - added more sources into xorg-x11-server-source to make source compilable
diff --git a/xserver-1.5.99.3-offscreen-pixmaps.patch b/xserver-1.5.99.3-offscreen-pixmaps.patch
new file mode 100644
index 0000000..9ce9913
--- /dev/null
+++ b/xserver-1.5.99.3-offscreen-pixmaps.patch
@@ -0,0 +1,46 @@
+From 70e14e1dd95ba965ffd3264af1f2d4b207c67f73 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 7 Jan 2009 17:14:34 -0500
+Subject: [PATCH] XAA: turn off offscreen pixmaps by default.  again.
+
+---
+ hw/xfree86/xaa/xaaInitAccel.c |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
+index 4087142..3b397dc 100644
+--- a/hw/xfree86/xaa/xaaInitAccel.c
++++ b/hw/xfree86/xaa/xaaInitAccel.c
+@@ -41,7 +41,8 @@ typedef enum {
+     XAAOPT_WRITE_BITMAP,
+     XAAOPT_WRITE_PIXMAP,
+     XAAOPT_PIXMAP_CACHE,
+-    XAAOPT_OFFSCREEN_PIXMAPS
++    XAAOPT_OFFSCREEN_PIXMAPS,
++    XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE
+ } XAAOpts;
+ 
+ static const OptionInfoRec XAAOptions[] = {
+@@ -87,6 +88,8 @@ static const OptionInfoRec XAAOptions[] = {
+ 				OPTV_BOOLEAN,	{0}, FALSE },
+     {XAAOPT_OFFSCREEN_PIXMAPS,		"XaaNoOffscreenPixmaps",
+ 				OPTV_BOOLEAN,	{0}, FALSE },
++    {XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE, "XaaOffscreenPixmaps",
++				OPTV_BOOLEAN,   {0}, FALSE },
+     { -1,				NULL,
+ 				OPTV_NONE,	{0}, FALSE }
+ };
+@@ -525,8 +528,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
+ #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
+ 
+     if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
+-		!xf86ReturnOptValBool(options, XAAOPT_OFFSCREEN_PIXMAPS,
+-		                      FALSE)) {
++		xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE))
++    {
+ 	XAAMSG("\tOffscreen Pixmaps\n");
+     } else {
+ 	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
+-- 
+1.6.0.3
+