Date: Sat, 6 Feb 2021 11:50:32 +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: r564218 - in head/x11/nvidia-driver: . files Message-ID: <202102061150.116BoWfV087120@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Feb 6 11:50:32 2021 New Revision: 564218 URL: https://svnweb.freebsd.org/changeset/ports/564218 Log: Forward-port ``extra-patch-src-nvidia_ctl.c'' patch to 460.xx branch, I somehow missed it when rebasing other changes. While here, flatten and rename 460-* patches, they do not need %%NVSRC%% substitution. Pointy hat to: danfe Added: head/x11/nvidia-driver/files/460-patch-src-nvidia-nvidia_ctl.c - copied, changed from r564006, head/x11/nvidia-driver/files/extra-patch-src-nvidia_ctl.c.in head/x11/nvidia-driver/files/460-patch-src-nvidia-nvidia_linux.c - copied, changed from r564217, head/x11/nvidia-driver/files/460-patch-src-nvidia_linux.c.in Deleted: head/x11/nvidia-driver/files/460-patch-src-nvidia_linux.c.in Modified: head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Sat Feb 6 11:48:48 2021 (r564217) +++ head/x11/nvidia-driver/Makefile Sat Feb 6 11:50:32 2021 (r564218) @@ -13,7 +13,7 @@ PORTNAME= nvidia-driver DISTVERSION?= 460.39 # 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} @@ -72,8 +72,9 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia-mod SUB_PATCHES+= extra-patch-src-nvidia_ctl.c \ extra-patch-src-nvidia_linux.c .else -EXTRA_PATCHES+= ${FILESDIR}/460-patch-lib-libGLX_nvidia-Makefile -SUB_PATCHES+= 460-patch-src-nvidia_linux.c +EXTRA_PATCHES+= ${FILESDIR}/460-patch-lib-libGLX_nvidia-Makefile \ + ${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \ + ${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c .endif OPTIONS_DEFINE= ACPI_PM LINUX WBINVD DOCS Copied and modified: head/x11/nvidia-driver/files/460-patch-src-nvidia-nvidia_ctl.c (from r564006, head/x11/nvidia-driver/files/extra-patch-src-nvidia_ctl.c.in) ============================================================================== --- head/x11/nvidia-driver/files/extra-patch-src-nvidia_ctl.c.in Thu Feb 4 09:21:55 2021 (r564006, copy source) +++ head/x11/nvidia-driver/files/460-patch-src-nvidia-nvidia_ctl.c Sat Feb 6 11:50:32 2021 (r564218) @@ -1,5 +1,5 @@ ---- src/%%NVSRC%%/nvidia_ctl.c.orig 2017-09-14 20:46:30 UTC -+++ src/%%NVSRC%%/nvidia_ctl.c +--- src/nvidia/nvidia_ctl.c.orig 2021-01-21 21:50:34 UTC ++++ src/nvidia/nvidia_ctl.c @@ -13,6 +13,12 @@ #include "nv.h" #include "nv-freebsd.h" @@ -43,7 +43,7 @@ } nvidia_count++; -@@ -153,13 +175,28 @@ int nvidia_ctl_attach(void) +@@ -153,10 +175,25 @@ int nvidia_ctl_attach(void) int nvidia_ctl_detach(void) { @@ -58,9 +58,6 @@ + .linux_char_device = 1 + }; +#endif - struct nvidia_softc *sc; - - sc = &nvidia_ctl_sc; nvidia_count--; - if (nvidia_count == 0) Copied and modified: head/x11/nvidia-driver/files/460-patch-src-nvidia-nvidia_linux.c (from r564217, head/x11/nvidia-driver/files/460-patch-src-nvidia_linux.c.in) ============================================================================== --- head/x11/nvidia-driver/files/460-patch-src-nvidia_linux.c.in Sat Feb 6 11:48:48 2021 (r564217, copy source) +++ head/x11/nvidia-driver/files/460-patch-src-nvidia-nvidia_linux.c Sat Feb 6 11:50:32 2021 (r564218) @@ -1,5 +1,5 @@ ---- src/%%NVSRC%%/nvidia_linux.c.orig 2017-09-14 20:46:30 UTC -+++ src/%%NVSRC%%/nvidia_linux.c +--- src/nvidia/nvidia_linux.c.orig 2021-01-21 21:50:34 UTC ++++ src/nvidia/nvidia_linux.c @@ -35,21 +35,16 @@ int linux_ioctl_nvidia( struct linux_ioctl_args *args )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102061150.116BoWfV087120>