summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner>2009-06-24 17:25:35 +0000
committerdrochner <drochner>2009-06-24 17:25:35 +0000
commit3c9ee45947619d00f4e4b6aa677f978b9b7f9e8b (patch)
treeb2d228edfa83c3112482777178e1ddc502faee8f
parent6e9773049bd87920355b385532c9adf2297803c6 (diff)
downloadpkgsrc-3c9ee45947619d00f4e4b6aa677f978b9b7f9e8b.tar.gz
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
-rw-r--r--x11/modular-xorg-server/Makefile3
-rw-r--r--x11/modular-xorg-server/distinfo3
-rw-r--r--x11/modular-xorg-server/patches/patch-am13
3 files changed, 17 insertions, 2 deletions
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 432dcd026a7..90179ab3b8e 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -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 --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 5e7ceb68ae2..c8dd8a7091f 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -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-ah) = 2820d1a394de6bf19b980cc52a41cbb09c582b8f
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 --git a/x11/modular-xorg-server/patches/patch-am b/x11/modular-xorg-server/patches/patch-am
new file mode 100644
index 00000000000..6976c4f776b
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-am
@@ -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) {