svn commit: r564012 - in head/x11/nvidia-driver: . files

[Alexey Dokuchaev]

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);