From owner-svn-ports-all@freebsd.org Sat Feb 6 11:50:33 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 7C32B546524; Sat, 6 Feb 2021 11:50:33 +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 4DXrFj32WMz4VtQ; Sat, 6 Feb 2021 11:50:33 +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 5B13F10C6F; Sat, 6 Feb 2021 11:50:33 +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 116BoXb8087123; Sat, 6 Feb 2021 11:50:33 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 116BoWfV087120; Sat, 6 Feb 2021 11:50:32 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202102061150.116BoWfV087120@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sat, 6 Feb 2021 11:50:32 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11/nvidia-driver: . files X-SVN-Commit-Revision: 564218 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: Sat, 06 Feb 2021 11:50:33 -0000 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 )