From owner-svn-ports-all@freebsd.org Thu Feb 4 10:11:37 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 94D1A53EE88; Thu, 4 Feb 2021 10:11:37 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DWZ8T3spsz3PgR; Thu, 4 Feb 2021 10:11:37 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 763AA211D; Thu, 4 Feb 2021 10:11:37 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 114ABbMT039217; Thu, 4 Feb 2021 10:11:37 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 114ABaFK039214; Thu, 4 Feb 2021 10:11:36 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202102041011.114ABaFK039214@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 4 Feb 2021 10:11:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564012 - in head/x11/nvidia-driver: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11/nvidia-driver: . files X-SVN-Commit-Revision: 564012 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2021 10:11:37 -0000 Author: danfe Date: Thu Feb 4 10:11:36 2021 New Revision: 564012 URL: https://svnweb.freebsd.org/changeset/ports/564012 Log: Move the comment inside the patch file, as it now only applies to one particular hunk, and there are several unrelated changes in that file. While here, explain why LICENSE_FILE is set in the consumer ports. Modified: head/x11/nvidia-driver/Makefile head/x11/nvidia-driver/Makefile.common head/x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Thu Feb 4 10:10:10 2021 (r564011) +++ head/x11/nvidia-driver/Makefile Thu Feb 4 10:11:36 2021 (r564012) @@ -68,9 +68,6 @@ NVSRC= nvidia .endif .if ${NVVERSION} >= 358.009 -# Initialize memory allocations to avoid spurious "lock re-initialization" -# errors. A little more detail can be found in bug 201340 starting around -# comment #50. EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c .endif Modified: head/x11/nvidia-driver/Makefile.common ============================================================================== --- head/x11/nvidia-driver/Makefile.common Thu Feb 4 10:10:10 2021 (r564011) +++ head/x11/nvidia-driver/Makefile.common Thu Feb 4 10:11:36 2021 (r564012) @@ -1,5 +1,6 @@ # $FreeBSD$ +# LICENSE_FILE is set in the consumer ports because its location varies LICENSE= NVIDIA LICENSE_NAME= License For Customer Use of NVIDIA Software LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept Modified: head/x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c ============================================================================== --- head/x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c Thu Feb 4 10:10:10 2021 (r564011) +++ head/x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c Thu Feb 4 10:11:36 2021 (r564012) @@ -16,11 +16,16 @@ #endif -@@ -250,7 +252,7 @@ struct nvkms_ref_ptr { +@@ -252,7 +254,12 @@ struct nvkms_ref_ptr { struct nvkms_ref_ptr* NVKMS_API_CALL nvkms_alloc_ref_ptr(void *ptr) { - struct nvkms_ref_ptr *ref_ptr = nvkms_alloc(sizeof(*ref_ptr), NV_FALSE); ++ /* ++ * Initialize memory to avoid spurious "lock re-initialization" errors. ++ * A little more detail can be found in the PR 201340 starting around ++ * comment #50. ++ */ + struct nvkms_ref_ptr *ref_ptr = nvkms_alloc(sizeof(*ref_ptr), NV_TRUE); if (ref_ptr) { mtx_init(&ref_ptr->lock, "nvkms-ref-ptr-lock", NULL, MTX_SPIN);