diff options
| author | danfe <danfe@FreeBSD.org> | 2013-09-12 15:16:29 +0800 |
|---|---|---|
| committer | danfe <danfe@FreeBSD.org> | 2013-09-12 15:16:29 +0800 |
| commit | 4faf5455e945b8bd1cf03bff95b8484e704394b2 (patch) | |
| tree | 189a36c92286bd6ea9fe453940b8fe9b07d0123a /x11 | |
| parent | 396a3f697991a65cfb02332732790bd4c4728951 (diff) | |
| download | freebsd-ports-gnome-4faf5455e945b8bd1cf03bff95b8484e704394b2.tar.gz freebsd-ports-gnome-4faf5455e945b8bd1cf03bff95b8484e704394b2.tar.zst freebsd-ports-gnome-4faf5455e945b8bd1cf03bff95b8484e704394b2.zip | |
- Unbreak on recent -CURRENT (after r255426): vm_map_find() now takes 10
(ten) arguments rather than 9 (nine)
- Adjust OSVERSION check of the previous patch, after properly bumped by
pjd@ in r255305
PR: ports/181972
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/nvidia-driver/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index e7bbf1c1c94d..1c373651d25f 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -155,11 +155,16 @@ post-patch: .SILENT ${WRKSRC}/src/nvidia_subr.c .endif # Adopt to cap_rights_t type change in FreeBSD src SVN r255219 -.if ${OSVERSION} > 1000051 +.if ${OSVERSION} > 1000052 ${REINPLACE_CMD} -e 's/u_long cmd;/& cap_rights_t rights;/ ; \ s/CAP_IOCTL/cap_rights_init(\&rights, &)/' \ ${WRKSRC}/src/nvidia_linux.c .endif +# Argument count of vm_map_find() changed in FreeBSD src SVN r255426 +.if ${OSVERSION} > 1000054 + ${REINPLACE_CMD} -e 's/virtual_address, size,/& 0,/' \ + ${WRKSRC}/src/nvidia_subr.c +.endif # Fix stack buffer overflow in nvidia_sysctl_bus_type() .if ${NVVERSION} < 3192300 ${REINPLACE_CMD} -E '/bus_type\[4\]/d ; \ |