diff options
author | jlam <jlam@pkgsrc.org> | 2000-07-15 06:11:20 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2000-07-15 06:11:20 +0000 |
commit | 617af86cc72c2b513f01a3f75792fd76eba442b7 (patch) | |
tree | a4d0323c342c48f87d3b25df8b945ffb56117d5f /sysutils | |
parent | 565ad3094e197ae94aea97386acebe518442364f (diff) | |
download | pkgsrc-617af86cc72c2b513f01a3f75792fd76eba442b7.tar.gz |
Forgot these patches. These patch sources to work after kernel mmap
interface changed.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/aperture/patches/patch-ad | 30 | ||||
-rw-r--r-- | sysutils/aperture/patches/patch-ae | 22 |
2 files changed, 52 insertions, 0 deletions
diff --git a/sysutils/aperture/patches/patch-ad b/sysutils/aperture/patches/patch-ad new file mode 100644 index 00000000000..169c513c26d --- /dev/null +++ b/sysutils/aperture/patches/patch-ad @@ -0,0 +1,30 @@ +$NetBSD: patch-ad,v 1.1 2000/07/15 06:11:20 jlam Exp $ + +--- module/aperture.c.orig Sat Jul 15 01:15:06 2000 ++++ module/aperture.c Sat Jul 15 01:32:13 2000 +@@ -118,11 +118,25 @@ + * allow only section in the vga framebuffer and above main memory + * to be mapped + */ ++#if (__NetBSD_Version__ < 105020000) ++/* ++ * Technically, the change to the kernel mmap interface happened ++ * during 1.5A, but after the interface changed, the kernel version ++ * was inexplicably not bumped. Hence, the test condition is for ++ * 1.5B. ++ */ + int + xf86mmap(dev, offset, length) + dev_t dev; + int offset; + int length; ++#else ++paddr_t ++xf86mmap(dev, offset, length) ++ dev_t dev; ++ off_t offset; ++ int length; ++#endif /* __NetBSD_Version__ */ + { + + #ifdef XF86_DEBUG diff --git a/sysutils/aperture/patches/patch-ae b/sysutils/aperture/patches/patch-ae new file mode 100644 index 00000000000..a59f7c37ebf --- /dev/null +++ b/sysutils/aperture/patches/patch-ae @@ -0,0 +1,22 @@ +$NetBSD: patch-ae,v 1.1 2000/07/15 06:11:20 jlam Exp $ + +--- memconfig/memconfig.c.orig Sat Jul 15 01:35:01 2000 ++++ memconfig/memconfig.c Sat Jul 15 02:07:45 2000 +@@ -34,7 +34,17 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++/* ++ * This doesn't work if your kernel sources are too divergent from your ++ * installed headers. Just declare the prototypes for getopt() directly. ++ */ ++#if 0 + #include <unistd.h> ++#else ++int getopt(int, char * const [], const char *); ++extern char *optarg; ++extern int optind; ++#endif + + #include "memrange.h" + |