summaryrefslogtreecommitdiff
path: root/sysutils/radeontool
diff options
context:
space:
mode:
authorrumble <rumble@pkgsrc.org>2007-12-18 20:45:49 +0000
committerrumble <rumble@pkgsrc.org>2007-12-18 20:45:49 +0000
commit413c2cdc4d02db43db0855bb1799b5ad8266f25e (patch)
tree73318f07561928170bf58129a9ee9af21a9a0389 /sysutils/radeontool
parentd8b4e04b3f6784db0b3b5711466442bd18a2e950 (diff)
downloadpkgsrc-413c2cdc4d02db43db0855bb1799b5ad8266f25e.tar.gz
The mmap error condition is MAP_FAILED, not necessarily pointer < 0. Now
it not only builds, but works again on my laptop.
Diffstat (limited to 'sysutils/radeontool')
-rw-r--r--sysutils/radeontool/Makefile4
-rw-r--r--sysutils/radeontool/distinfo4
-rw-r--r--sysutils/radeontool/patches/patch-aa13
3 files changed, 15 insertions, 6 deletions
diff --git a/sysutils/radeontool/Makefile b/sysutils/radeontool/Makefile
index b3d63fb46d4..085af905cf9 100644
--- a/sysutils/radeontool/Makefile
+++ b/sysutils/radeontool/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2007/12/18 17:04:53 rumble Exp $
+# $NetBSD: Makefile,v 1.6 2007/12/18 20:45:49 rumble Exp $
DISTNAME= radeontool-1.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://fdd.com/software/radeon/
diff --git a/sysutils/radeontool/distinfo b/sysutils/radeontool/distinfo
index 5e0ba98001d..56c344ba52b 100644
--- a/sysutils/radeontool/distinfo
+++ b/sysutils/radeontool/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2007/12/18 17:47:13 rumble Exp $
+$NetBSD: distinfo,v 1.5 2007/12/18 20:45:49 rumble Exp $
SHA1 (radeontool-1.5.tar.gz) = bd9096d5b18b31a1f1addbea80e6debfc707abf6
RMD160 (radeontool-1.5.tar.gz) = 1cdeeb7ad379afa7bc03e1cd79adbb09f6a9cb85
Size (radeontool-1.5.tar.gz) = 20869 bytes
-SHA1 (patch-aa) = ef23987185c3a2b0a132c3ec503a3c03603493d1
+SHA1 (patch-aa) = fa7dfa4b6fe9cbf0d4eacce012047ba36b7ca548
diff --git a/sysutils/radeontool/patches/patch-aa b/sysutils/radeontool/patches/patch-aa
index 31ed03d497c..ceb713b542a 100644
--- a/sysutils/radeontool/patches/patch-aa
+++ b/sysutils/radeontool/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2007/12/18 17:03:35 rumble Exp $
+$NetBSD: patch-aa,v 1.3 2007/12/18 20:45:49 rumble Exp $
--- radeontool.c.orig 2007-12-17 21:35:53.000000000 -0500
-+++ radeontool.c 2007-12-17 21:42:16.000000000 -0500
++++ radeontool.c 2007-12-18 15:38:46.000000000 -0500
@@ -21,7 +21,17 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -19,6 +19,15 @@ $NetBSD: patch-aa,v 1.2 2007/12/18 17:03:35 rumble Exp $
#include "radeon_reg.h"
+@@ -107,7 +117,7 @@
+ mem_fd,
+ base
+ );
+- if ((long)device_mem < 0) {
++ if (device_mem == MAP_FAILED) {
+ if(debug)
+ fprintf(stderr,"mmap returned %d\n",(int)device_mem);
+ fatal("mmap error \n");
@@ -251,7 +261,6 @@
} else if(forkrc == 0) { /* if child */
close(pipefd[0]);