[pkgsrc/trunk]: pkgsrc/x11 Added patch for Xorg Bug #1488: Fix crash on i830 ...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4e22b6697926
branches:  trunk
changeset: 487042:4e22b6697926
user:      reed <reed%pkgsrc.org@localhost>
date:      Fri Jan 07 16:57:36 2005 +0000

description:
Added patch for Xorg Bug #1488: Fix crash on i830 during startup.
Bump PKGREVISION for xorg-server package.

This was reported by dheeraj of ece gatech edu via PR #28877.

diffstat:

 x11/xorg-libs/distinfo         |   3 ++-
 x11/xorg-libs/patches/patch-ax |  16 ++++++++++++++++
 x11/xorg-server/Makefile       |   4 ++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r cf02c13ae313 -r 4e22b6697926 x11/xorg-libs/distinfo
--- a/x11/xorg-libs/distinfo    Fri Jan 07 16:57:21 2005 +0000
+++ b/x11/xorg-libs/distinfo    Fri Jan 07 16:57:36 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/12/20 14:45:25 xtraeme Exp $
+$NetBSD: distinfo,v 1.9 2005/01/07 16:57:36 reed Exp $
 
 SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
 Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -28,3 +28,4 @@
 SHA1 (patch-au) = fd2bcdb1c37ce0cc748b0f5c2a12d226e4486d0d
 SHA1 (patch-av) = 99e9764ca1afdfb5882d62e453ccaea7dfa7f182
 SHA1 (patch-aw) = d305ea935ba10d443f9bfdcfc2c74bab5a03ba60
+SHA1 (patch-ax) = 5a340661ded23816334b6af67068680a8de73cda
diff -r cf02c13ae313 -r 4e22b6697926 x11/xorg-libs/patches/patch-ax
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-libs/patches/patch-ax    Fri Jan 07 16:57:36 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ax,v 1.1 2005/01/07 16:57:36 reed Exp $
+
+from http://cvs.freedesktop.org/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c?r1=1.5&r2=1.6
+Xorg Bug #1488: Fix crash on i830 during startup.  (Eric Anholt)
+
+--- programs/Xserver/hw/xfree86/drivers/i810/i830_video.c.orig 2004-08-25 22:10:56.000000000 -0700
++++ programs/Xserver/hw/xfree86/drivers/i810/i830_video.c
+@@ -632,7 +632,7 @@ I830SetupImageVideo(ScreenPtr pScreen)
+    pPriv->gamma0 = 0x080808;
+ 
+    /* gotta uninit this someplace */
+-   REGION_INIT(pScreen, &pPriv->clip, NullBox, 0);
++   REGION_NULL(pScreen, &pPriv->clip);
+ 
+    pI830->adaptor = adapt;
+ 
diff -r cf02c13ae313 -r 4e22b6697926 x11/xorg-server/Makefile
--- a/x11/xorg-server/Makefile  Fri Jan 07 16:57:21 2005 +0000
+++ b/x11/xorg-server/Makefile  Fri Jan 07 16:57:36 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/12/27 17:26:18 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2005/01/07 16:57:36 reed Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               xorg-server-${XORG_VER}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG}
 DISTFILES=             X11R${XORG_VER}-src1.tar.gz \