[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server zero out a local variable, fix...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b7a64a19c583
branches:  trunk
changeset: 394928:b7a64a19c583
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Jun 24 17:25:35 2009 +0000

description:
zero out a local variable, fixes random behaviour in case a DRI hw module
cannot be loaded and the server falls back to software rendering, from
Rafal Boni per mail to tech-x11
bump PKGREVISION

diffstat:

 x11/modular-xorg-server/Makefile         |   3 ++-
 x11/modular-xorg-server/distinfo         |   3 ++-
 x11/modular-xorg-server/patches/patch-am |  13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diffs (48 lines):

diff -r df03556abbde -r b7a64a19c583 x11/modular-xorg-server/Makefile
--- a/x11/modular-xorg-server/Makefile  Wed Jun 24 14:44:53 2009 +0000
+++ b/x11/modular-xorg-server/Makefile  Wed Jun 24 17:25:35 2009 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2009/06/16 18:05:34 reed Exp $
+# $NetBSD: Makefile,v 1.46 2009/06/24 17:25:35 drochner Exp $
 #
 
 DISTNAME=      xorg-server-1.6.1.901
 PKGNAME=       modular-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=  .tar.bz2
diff -r df03556abbde -r b7a64a19c583 x11/modular-xorg-server/distinfo
--- a/x11/modular-xorg-server/distinfo  Wed Jun 24 14:44:53 2009 +0000
+++ b/x11/modular-xorg-server/distinfo  Wed Jun 24 17:25:35 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2009/06/07 11:23:46 wiz Exp $
+$NetBSD: distinfo,v 1.34 2009/06/24 17:25:35 drochner Exp $
 
 SHA1 (xorg-server-1.6.1.901.tar.bz2) = 0818a63225e9b2262d33099eb6630d15c07f04b6
 RMD160 (xorg-server-1.6.1.901.tar.bz2) = 32ee9b17d1a5562a3abf783598bd746d466c8c19
@@ -9,6 +9,7 @@
 SHA1 (patch-aj) = 84ff5c6215d0b62734cf26e78394a70afe2b7007
 SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d
 SHA1 (patch-al) = cb1fb44037f23fb2838ed36aaf2591946264fe53
+SHA1 (patch-am) = be278e6044dfa37b108d2544c82b84f36b6ca9d7
 SHA1 (patch-ba) = 803f8df4e2ad2ebdfde9f7e17c3dd26fa11262ab
 SHA1 (patch-sa) = a22001b4146dcbcbd5405c9a1ff7b1632ec946b8
 SHA1 (patch-sb) = 0a064016b16e088d08cd9e290a57cb4efb4f5d26
diff -r df03556abbde -r b7a64a19c583 x11/modular-xorg-server/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/modular-xorg-server/patches/patch-am  Wed Jun 24 17:25:35 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.5 2009/06/24 17:25:36 drochner Exp $
+
+--- glx/glxdri.c.orig  2009-06-24 16:22:56.000000000 +0200
++++ glx/glxdri.c
+@@ -966,6 +966,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+     const __DRIextension **extensions;
+     int i;
+ 
++    memset(&framebuffer, 0, sizeof(framebuffer));
++
+     if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
+       !DRIQueryDirectRenderingCapable(pScreen, &isCapable) ||
+       !isCapable) {