diff options
| author | tron <tron@pkgsrc.org> | 1999-10-25 10:18:36 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 1999-10-25 10:18:36 +0000 |
| commit | 9e8a0aad3a2cef2eb4e51e241ea7b3dbef0d039e (patch) | |
| tree | fce5bef6844be6df09ef17ccd47056f748afa7c5 /graphics/Mesa-glx | |
| parent | ef35f5eca1023ad085628207b3ccb52fa32c0325 (diff) | |
| download | pkgsrc-9e8a0aad3a2cef2eb4e51e241ea7b3dbef0d039e.tar.gz | |
Simplify check for Riva chipsets.
Diffstat (limited to 'graphics/Mesa-glx')
| -rw-r--r-- | graphics/Mesa-glx/files/patch-sum | 4 | ||||
| -rw-r--r-- | graphics/Mesa-glx/patches/patch-ac | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/graphics/Mesa-glx/files/patch-sum b/graphics/Mesa-glx/files/patch-sum index 4a11fadec41..2628353445c 100644 --- a/graphics/Mesa-glx/files/patch-sum +++ b/graphics/Mesa-glx/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.3 1999/10/24 20:44:41 tron Exp $ +$NetBSD: patch-sum,v 1.4 1999/10/25 10:18:36 tron Exp $ MD5 (patch-aa) = 4d3b5b65223089784b40564da47e7f24 MD5 (patch-ab) = 5b2cae1a7ef546ebcd36a7d3e8f9fc4b -MD5 (patch-ac) = f546ecd0d256c6fc7b6f7650ac0ad1c8 +MD5 (patch-ac) = 8f2c496ab99740e0d4987551c412f487 diff --git a/graphics/Mesa-glx/patches/patch-ac b/graphics/Mesa-glx/patches/patch-ac index d3a9b6e6188..5ff85211df3 100644 --- a/graphics/Mesa-glx/patches/patch-ac +++ b/graphics/Mesa-glx/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 1999/10/24 20:44:41 tron Exp $ +$NetBSD: patch-ac,v 1.2 1999/10/25 10:18:37 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 @@ -23,7 +23,7 @@ $NetBSD: patch-ac,v 1.1 1999/10/24 20:44:41 tron Exp $ fprintf(stderr, "glX Error: error setting log file\n"); } log_initialize(); -@@ -269,9 +270,10 @@ +@@ -269,9 +269,9 @@ hwInitVisuals = NULL; #endif } else @@ -32,8 +32,7 @@ $NetBSD: patch-ac,v 1.1 1999/10/24 20:44:41 tron Exp $ - (!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)) ) { ++ (strstr(&vga256InfoRec.chipset[4], "TNT") != NULL)) ) { hw_flag = GL_TRUE; /* XXX - may need to select correct one */ glx_chipset = NV_RIVATNT; |