Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 Aug 2018 19:45:04 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r478606 - head/x11/nvidia-driver
Message-ID:  <201808311945.w7VJj4io096795@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius (src committer)
Date: Fri Aug 31 19:45:04 2018
New Revision: 478606
URL: https://svnweb.freebsd.org/changeset/ports/478606

Log:
  Unbreak nVidia drivers on recent -CURRENT, after change to
  kmem_free() in r338318.
  
  PR:		230780

Modified:
  head/x11/nvidia-driver/Makefile

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Fri Aug 31 18:41:08 2018	(r478605)
+++ head/x11/nvidia-driver/Makefile	Fri Aug 31 19:45:04 2018	(r478606)
@@ -12,7 +12,7 @@
 PORTNAME=	nvidia-driver
 DISTVERSION?=	390.77
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@@ -113,9 +113,10 @@ MAKE_ENV+=	WITHOUT_LINUX=yes
 .endif
 
 post-patch: .SILENT
-# KPI of kmem_alloc_contig() changed in FreeBSD src r338143
+# KPI of kmem_alloc_contig(),kmem_free() changed in FreeBSD src r338143,r338318
 .if ${OSVERSION} >= 1200079
 	${REINPLACE_CMD} -e 's/kmem_alloc_contig(kmem_arena, /kmem_alloc_contig(/' ${WRKSRC}/src/${NVSRC}/nvidia_subr.c
+	${REINPLACE_CMD} -e 's/kmem_free(kmem_arena, /kmem_free(/' ${WRKSRC}/src/${NVSRC}/nvidia_subr.c
 .endif
 # We should support -CURRENT: kill the check
 	${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/${NVSRC}/nv-freebsd.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808311945.w7VJj4io096795>