diff options
| author | reed <reed@pkgsrc.org> | 2005-01-07 16:57:36 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2005-01-07 16:57:36 +0000 |
| commit | 5ca06ca1479c74592d97ac9f97bd9901a5de7d70 (patch) | |
| tree | 777f0e52487a11efea20cbb555cabcd80d24a42e | |
| parent | bc45ac923a476f128640a182f3c26a36c780ecbd (diff) | |
| download | pkgsrc-5ca06ca1479c74592d97ac9f97bd9901a5de7d70.tar.gz | |
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.
| -rw-r--r-- | x11/xorg-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/xorg-libs/patches/patch-ax | 16 | ||||
| -rw-r--r-- | x11/xorg-server/Makefile | 4 |
3 files changed, 20 insertions, 3 deletions
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index dc06f656f62..85e8d19cd80 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -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-at) = bc375171b6f0a8141621009767b5457962967112 SHA1 (patch-au) = fd2bcdb1c37ce0cc748b0f5c2a12d226e4486d0d SHA1 (patch-av) = 99e9764ca1afdfb5882d62e453ccaea7dfa7f182 SHA1 (patch-aw) = d305ea935ba10d443f9bfdcfc2c74bab5a03ba60 +SHA1 (patch-ax) = 5a340661ded23816334b6af67068680a8de73cda diff --git a/x11/xorg-libs/patches/patch-ax b/x11/xorg-libs/patches/patch-ax new file mode 100644 index 00000000000..7d6ceb4ef4d --- /dev/null +++ b/x11/xorg-libs/patches/patch-ax @@ -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 --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile index 02ab60401bb..dc055460ca7 100644 --- a/x11/xorg-server/Makefile +++ b/x11/xorg-server/Makefile @@ -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 \ |