summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>1999-10-24 20:44:41 +0000
committertron <tron@pkgsrc.org>1999-10-24 20:44:41 +0000
commitfc167b1e2586f31a494b10a546e04f87bf17decb (patch)
treef645dd049648b447356f1d77fb3604acb409b9a2 /graphics
parent0dd07ee7dfdf33a9e0ece27c30647c96a583c4a3 (diff)
downloadpkgsrc-fc167b1e2586f31a494b10a546e04f87bf17decb.tar.gz
Make hardware acceleration for Riva 128, TNT and TNT 2 boards work with
XFree86 3.3.5 servers. Fix based on a patch sent by Andrew Gillham in private e-mail.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/Mesa-glx/files/patch-sum3
-rw-r--r--graphics/Mesa-glx/patches/patch-ac39
2 files changed, 41 insertions, 1 deletions
diff --git a/graphics/Mesa-glx/files/patch-sum b/graphics/Mesa-glx/files/patch-sum
index 7935aae520b..4a11fadec41 100644
--- a/graphics/Mesa-glx/files/patch-sum
+++ b/graphics/Mesa-glx/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.2 1999/10/01 18:43:18 tron Exp $
+$NetBSD: patch-sum,v 1.3 1999/10/24 20:44:41 tron Exp $
MD5 (patch-aa) = 4d3b5b65223089784b40564da47e7f24
MD5 (patch-ab) = 5b2cae1a7ef546ebcd36a7d3e8f9fc4b
+MD5 (patch-ac) = f546ecd0d256c6fc7b6f7650ac0ad1c8
diff --git a/graphics/Mesa-glx/patches/patch-ac b/graphics/Mesa-glx/patches/patch-ac
new file mode 100644
index 00000000000..d3a9b6e6188
--- /dev/null
+++ b/graphics/Mesa-glx/patches/patch-ac
@@ -0,0 +1,39 @@
+$NetBSD: patch-ac,v 1.1 1999/10/24 20:44:41 tron Exp $
+
+--- servGL/serverglx/glxmesa.c.orig Mon Aug 2 20:37:13 1999
++++ servGL/serverglx/glxmesa.c Sun Oct 24 22:30:45 1999
+@@ -54,6 +54,7 @@
+ #include "GL/xmesa.h"
+
+ #include <assert.h>
++#include <paths.h>
+ #include <signal.h>
+
+ #ifdef __FreeBSD__
+@@ -133,10 +134,10 @@
+ glxInitLogs() {
+ fprintf(stderr, "Initializing logs\n");
+
+- unlink("~/glx_debug.log");
++ unlink(_PATH_TMP "glx_debug.log");
+
+ /* set up logging capabilities */
+- if (set_log_file("~/glx_debug.log")) {
++ if (set_log_file(_PATH_TMP "glx_debug.log")) {
+ fprintf(stderr, "glX Error: error setting log file\n");
+ }
+ log_initialize();
+@@ -269,9 +270,10 @@
+ hwInitVisuals = NULL;
+ #endif
+ } else
+- if ( (!strcmp("RIVA128", vga256InfoRec.chipset)) ||
+- (!strcmp("RIVATNT", vga256InfoRec.chipset)) ||
+- (!strcmp("RIVATNT2", vga256InfoRec.chipset)) ) {
++ if ( (strncmp("RIVA", vga256InfoRec.chipset, 4) == 0) &&
++ ((strstr(&vga256InfoRec.chipset[4], "128") != NULL) ||
++ (strstr(&vga256InfoRec.chipset[4], "TNT") != NULL) ||
++ (strstr(&vga256InfoRec.chipset[4], "TNT2") != NULL)) ) {
+ hw_flag = GL_TRUE;
+ /* XXX - may need to select correct one */
+ glx_chipset = NV_RIVATNT;