Date: Thu, 12 Sep 2013 07:16:29 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327039 - head/x11/nvidia-driver Message-ID: <201309120716.r8C7GTi5015461@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Thu Sep 12 07:16:29 2013 New Revision: 327039 URL: http://svnweb.freebsd.org/changeset/ports/327039 Log: - 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 Modified: head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Thu Sep 12 07:05:49 2013 (r327038) +++ head/x11/nvidia-driver/Makefile Thu Sep 12 07:16:29 2013 (r327039) @@ -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 ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309120716.r8C7GTi5015461>