Author: branden
Date: 2003-10-11 15:25:28 -0500 (Sat, 11 Oct 2003)
New Revision: 654
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
Log:
Grab fix to XAA pixmap cache server on request from Thomas Winischhofer.
- debian/patches/000_stolen_from_HEAD.diff:
(xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c):
Color 8x8 patterns which are smaller that 8x8 were incorrectly
expanded to 8x8 when written to the cache. In fact, the expansion was
done from source instead of destination; this lead to incorrect 8x8
representations of smaller patterns. (Thomas Winischhofer)
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-10-11 20:03:49 UTC (rev 653)
+++ branches/4.3.0/sid/debian/changelog 2003-10-11 20:25:28 UTC (rev 654)
@@ -75,8 +75,16 @@
+ resurrect xlibs-pic as an empty architecture-all pseudopackage in the
oldlibs section which depends on xlibs-static-pic
- -- Branden Robinson <[EMAIL PROTECTED]> Sat, 11 Oct 2003 02:01:16 -0500
+ * Grab fix to XAA pixmap cache server on request from Thomas Winischhofer.
+ - debian/patches/000_stolen_from_HEAD.diff:
+ (xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c):
+ Color 8x8 patterns which are smaller that 8x8 were incorrectly
+ expanded to 8x8 when written to the cache. In fact, the expansion was
+ done from source instead of destination; this lead to incorrect 8x8
+ representations of smaller patterns. (Thomas Winischhofer)
+ -- Branden Robinson <[EMAIL PROTECTED]> Sat, 11 Oct 2003 15:16:55 -0500
+
xfree86 (4.3.0-0pre1v3) experimental; urgency=high
* Update pam_setcred() security fix to xdm to use pam_error and
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-10-11
20:03:49 UTC (rev 653)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD.diff 2003-10-11
20:25:28 UTC (rev 654)
@@ -15,6 +15,12 @@
when calling a Xi function that calls XGetExtensionVersion() (Bugzilla
#260, Bastien Nocera, Owen Taylor).
+(xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c):
+ Color 8x8 patterns which are smaller that 8x8 were incorrectly expanded
+ to 8x8 when written to the cache. In fact, the expansion was done from
+ source instead of destination; this lead to incorrect 8x8
+ representations of smaller patterns. (Thomas Winischhofer)
+
diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c
--- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100
+++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000
@@ -649,3 +655,26 @@
}
if (versions[version_index].major_version > Dont_Check)
+Index: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v
+retrieving revision 1.30.10.1
+retrieving revision 1.32
+diff -u -r1.30.10.1 -r1.32
+--- xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c 16 Aug 2003 01:13:58
-0000 1.30.10.1
++++ xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c 6 Oct 2003 18:20:14
-0000 1.32
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.30.10.1
2003/08/16 01:13:58 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.32 2003/10/06
18:20:14 twini Exp $ */
+
+ #include "misc.h"
+ #include "xf86.h"
+@@ -2052,7 +2052,7 @@
+ nw = w;
+ memcpy(dstPtr, srcPtr, w * Bpp);
+ while (nw != 8) {
+- memcpy(dstPtr + (nw * Bpp), srcPtr, nw * Bpp);
++ memcpy(dstPtr + (nw * Bpp), dstPtr, nw * Bpp);
+ nw <<= 1;
+ }
+ }
