PATCH_VER 0.2.7. Update Newport acceleration patch to 5200_all_6.8.0-newport-accel-v2.patch. This fixes an error "structure has no member named `PUToScreenTextureDstFormats'," which should start with CPU, not PU. It also moves the autoloading of the xaa module around (#38549). Newport acceleration patch is by Dominik Behr, with mods by Adam Jackson. Drop 0155_all_4.3.0-Xi-Xinitthreads-locking-bug.patch. It was fixed in an alternate way in the release, and this was causing problems with totem and kaffeine (#64929, #59746, maybe #60131). Add 6100_all_6.8.0-xnest-uninitialized-GetWindowPixmap.patch (#70431). Alexander Gottwald says on fd.o #1404: "pScreen->GetWindowPixmap is never initialized in Xnest startup and contains random data. After some server resets it crashes with segfault because pScreen->GetWindowPixmap is called but is not a valid function. A quick fix was to set the complete ScreenRec structure to null after allocating it in dix/main.c (AddScreen)."

3 files changed, 21 insertions, 4 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 117761ecda3a..22fa2f097421 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.204 2004/11/15 19:46:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.205 2004/11/17 06:01:29 spyderous Exp $
+
+  16 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  PATCH_VER 0.2.7. Update Newport acceleration patch to
+  5200_all_6.8.0-newport-accel-v2.patch. This fixes an error "structure has no
+  member named `PUToScreenTextureDstFormats'," which should start with CPU,
+  not PU. It also moves the autoloading of the xaa module around (#38549).
+  Newport acceleration patch is by Dominik Behr, with mods by Adam Jackson.
+  Drop 0155_all_4.3.0-Xi-Xinitthreads-locking-bug.patch. It was fixed in an
+  alternate way in the release, and this was causing problems with totem and
+  kaffeine (#64929, #59746, maybe #60131). Add
+  6100_all_6.8.0-xnest-uninitialized-GetWindowPixmap.patch (#70431). Alexander
+  Gottwald says on fd.o #1404: "pScreen->GetWindowPixmap is never initialized
+  in Xnest startup and contains random data. After some server resets it
+  crashes with segfault because pScreen->GetWindowPixmap is called but is not
+  a valid function. A quick fix was to set the complete ScreenRec structure to
+  null after allocating it in dix/main.c (AddScreen)."
 
   15 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild:
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r2 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r2
index 3823961c3156..97bb1d777785 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r2
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r2
@@ -3,7 +3,7 @@ MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
 MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
 MD5 8e8905cf6863546481ec52f1101b6984 xorg-x11-6.8.0-files-0.6.tar.bz2 10139
-MD5 27809390a76d466f0b139c192c1b354f xorg-x11-6.8.0-patches-0.2.6.tar.bz2 149692
+MD5 c0ae07b33bb2ea1bd8efe4945a60374d xorg-x11-6.8.0-patches-0.2.7.tar.bz2 150261
 MD5 c31a2e1c226e659c2ff29abfe55386e3 X11R6.8.0-src1.tar.gz 30560275
 MD5 4089bb6efb6c5bc73fbcfc23fafcb0c8 X11R6.8.0-src2.tar.gz 5808901
 MD5 488a5ebbbdf48d974efbc3a0bde92bf4 X11R6.8.0-src3.tar.gz 10014266
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
index 70d9d6f6140a..45dbb8b8252e 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.58 2004/11/15 19:46:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.59 2004/11/17 06:01:29 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -40,7 +40,7 @@ IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server hardened
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.6"
-PATCH_VER="0.2.6"
+PATCH_VER="0.2.7"
 XCUR_VER="0.3.1"
 #MGADRV_VER="1_3_0beta"
 #VIADRV_VER="0.1"