debian/changelog | 3 +++
debian/patches/48_xaa_nooffscreenpixmaps.diff | 26 ++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 30 insertions(+)
New commits:
commit 0fb46ce64b8aac62c4f0d5ae4c1d4550301a86d3
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jun 12 06:04:46 2008 +0200
48_xaa_nooffscreenpixmaps.diff: disable XAA offscreen pixmaps by default
They can be enabled with Option "XaaOffscreenPixmaps"
(closes: #478277, #433331).
diff --git a/debian/changelog b/debian/changelog
index c857473..153b6c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xorg-server (2:1.4.2-1) UNRELEASED; urgency=low
* Security fixes from the previous upload are included upstream.
* Cherry-pick patches from upstream git to make the LeftOf and Above options
in xorg.conf actually work (closes: #466526).
+ * 48_xaa_nooffscreenpixmaps.diff: disable XAA offscreen pixmaps by default;
+ they can be enabled with Option "XaaOffscreenPixmaps" (closes: #478277,
+ #433331).
-- Julien Cristau <[EMAIL PROTECTED]> Wed, 11 Jun 2008 18:57:01 +0200
diff --git a/debian/patches/48_xaa_nooffscreenpixmaps.diff
b/debian/patches/48_xaa_nooffscreenpixmaps.diff
new file mode 100644
index 0000000..799368b
--- /dev/null
+++ b/debian/patches/48_xaa_nooffscreenpixmaps.diff
@@ -0,0 +1,26 @@
+xaa: disable offscreen pixmaps by default
+
+Can be enabled with Option "XaaOffscreenPixmaps".
+
+Index: xorg-server/hw/xfree86/xaa/xaaInitAccel.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/xaa/xaaInitAccel.c 2008-06-12
05:52:15.000000000 +0200
++++ xorg-server/hw/xfree86/xaa/xaaInitAccel.c 2008-06-12 05:57:07.000000000
+0200
+@@ -87,7 +87,7 @@
+ OPTV_BOOLEAN, {0}, FALSE },
+ {XAAOPT_PIXMAP_CACHE, "XaaNoPixmapCache",
+ OPTV_BOOLEAN, {0}, FALSE },
+- {XAAOPT_OFFSCREEN_PIXMAPS, "XaaNoOffscreenPixmaps",
++ {XAAOPT_OFFSCREEN_PIXMAPS, "XaaOffscreenPixmaps",
+ OPTV_BOOLEAN, {0}, FALSE },
+ { -1, NULL,
+ OPTV_NONE, {0}, FALSE }
+@@ -542,7 +542,7 @@
+ #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
+
+ if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
+- !xf86IsOptionSet(options, XAAOPT_OFFSCREEN_PIXMAPS)) {
++ xf86IsOptionSet(options, XAAOPT_OFFSCREEN_PIXMAPS)) {
+ XAAMSG("\tOffscreen Pixmaps\n");
+ } else {
+ infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
diff --git a/debian/patches/series b/debian/patches/series
index 9713eb7..b477e51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,6 +20,7 @@
45_only_XF86_APM_CAPABILITY_CHANGED_for_video_change_acpi_events.diff
46_reduce_wakeups_from_smart_scheduler.patch
#47_fbdevhw_magic_numbers.diff
+48_xaa_nooffscreenpixmaps.diff
91_ttf2pt1
91_ttf2pt1_updates
92_xprint-security-holes-fix.patch
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
