xorg-server: Changes to 'debian-unstable'
debian/changelog | 3 +--
debian/patches/48_xaa_nooffscreenpixmaps.diff | 19 +++++++++++++++++--
debian/xserver-xorg-core.NEWS | 11 -----------
3 files changed, 18 insertions(+), 15 deletions(-)
New commits:
commit 3f2e00cfbb44d401b094c5e350f0358a96e24876
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jun 22 19:17:56 2008 +0200
Document the xaa offscreen pixmaps change in the xorg.conf manpage
diff --git a/debian/patches/48_xaa_nooffscreenpixmaps.diff b/debian/patches/48_xaa_nooffscreenpixmaps.diff
index 799368b..71eaebd 100644
--- a/debian/patches/48_xaa_nooffscreenpixmaps.diff
+++ b/debian/patches/48_xaa_nooffscreenpixmaps.diff
@@ -4,8 +4,8 @@ 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
+--- xorg-server.orig/hw/xfree86/xaa/xaaInitAccel.c
++++ xorg-server/hw/xfree86/xaa/xaaInitAccel.c
@@ -87,7 +87,7 @@
OPTV_BOOLEAN, {0}, FALSE },
{XAAOPT_PIXMAP_CACHE, "XaaNoPixmapCache",
@@ -24,3 +24,18 @@ Index: xorg-server/hw/xfree86/xaa/xaaInitAccel.c
XAAMSG("\tOffscreen Pixmaps\n");
} else {
infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
+Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
+===================================================================
+--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre
++++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -1648,8 +1648,8 @@
+ Disables accelerated fills of a trapezoidal region with a monochrome
+ pattern.
+ .TP 7
+-.BI "Option \*qXaaNoOffscreenPixmaps\*q"
+-Disables accelerated draws into pixmaps stored in offscreen video memory.
++.BI "Option \*qXaaOffscreenPixmaps\*q"
++Enables accelerated draws into pixmaps stored in offscreen video memory.
+ .TP 7
+ .BI "Option \*qXaaNoPixmapCache\*q"
+ Disables caching of patterns in offscreen video memory.
commit 82f746ee8766c84076bb1dad895a88ed32acdf6a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jun 22 19:17:19 2008 +0200
Revert "Add a NEWS entry about 48_xaa_nooffscreenpixmaps.diff"
This reverts commit 0f12c9da5214fabdf6708fe70f6b1fc003542f47.
Doesn't warrant a NEWS entry in my opinion, debian/changelog and bug
logs should be plenty.
diff --git a/debian/changelog b/debian/changelog
index f2121a9..7eb12a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,8 @@ xorg-server (2:1.4.2-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* Update patches to not require -p0, closes: #485185.
- * Add a NEWS entry about 48_xaa_nooffscreenpixmaps.diff.
- -- Brice Goglin <bgoglin@debian.org> Sat, 14 Jun 2008 18:32:47 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 14 Jun 2008 18:21:05 +0200
xorg-server (2:1.4.1~git20080517-2) unstable; urgency=high
diff --git a/debian/xserver-xorg-core.NEWS b/debian/xserver-xorg-core.NEWS
index 3f73c94..8552040 100644
--- a/debian/xserver-xorg-core.NEWS
+++ b/debian/xserver-xorg-core.NEWS
@@ -1,14 +1,3 @@
-xorg-server (2:1.4.2-1) UNRELEASED; urgency=low
-
- * XAA offscreen pixmaps are now disabled by default. It helps compositing
- manager such as Compiz (see bug #433331) and works around some rendering
- problems (see bug #478277). Option "XaaNoOffscreenPixmaps" is not needed
- anymore. To revert to the old behavior, use
- Option "XaaOffscreenPixmaps"
- in the Device section of xorg.conf.
-
- -- Brice Goglin <bgoglin@debian.org> Sat, 14 Jun 2008 18:29:57 +0200
-
xorg-server (2:1.3.0.0.dfsg-3) unstable; urgency=low
* The server now includes a patch to always include the font paths
Reply to: