From nobody Wed Dec 15 03:03:20 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6AE9F18F346D; Wed, 15 Dec 2021 03:03:22 +0000 (UTC) (envelope-from git@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 4JDKnP399cz4fZj; Wed, 15 Dec 2021 03:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 199DF14AB1; Wed, 15 Dec 2021 03:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BF33KtM025990; Wed, 15 Dec 2021 03:03:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BF33Kb8025989; Wed, 15 Dec 2021 03:03:20 GMT (envelope-from git) Date: Wed, 15 Dec 2021 03:03:20 GMT Message-Id: <202112150303.1BF33Kb8025989@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: c1eb97fea020 - main - x11/nvidia-driver: try to unbreak the build on recent -CURRENT List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1eb97fea020ac09dc329651c4f33436e071997b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639537401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X1Cy/L3TobboZViv6XNDvDp2sVfaq01CAoFOF7IHv/w=; b=TJRVorreG+oWXIpjPbqtoySrPWdvDQb/uQi282n8IO2Y7eNtpc1xiMDXzX85Ko4WFkh0un oJ/lPp+zqJl473J/nOlBZtx8TsV/P0BZjLSfYRIidbUXjYBIqPh9MtMAQVsP3WwIBlgM/c cY6veYYTui5rJWrU814DifX9iXdIAlLRTyQ+bpxRTN+LjDT+9awbYO1dUbV+qlzelnfoxI QxgYdUcR0BNXRi6gQJnoo31y77r/JazVRzMqwgDv1R36SiZrYlMVOiYJhMAkZiaG1943zs pjSkcRwVGFdKY0O40BQ5imo0iuexssgp0xbOUNGk/LT/Wdvtc0HHcAcKkSUiZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639537401; a=rsa-sha256; cv=none; b=mN9Ox/ZX+TkN+DqmqwKfhk94K3sac6P9ZvHdvaLeHXJ2GChHqzsw2GV244e8F3zRAAzGpv gcJ1w49f5kZQNbSLm/k/SN3PxufkLS+Pg82ny2TSlIN1fFoG2vt6QatGXgoBSI4BispVbl gfcBEIMsroUgCXkLcVYlBoi3qelPqPuPWYcaCPGEdVUR/VJ7b0zcF672kKD9V1Lt+62XxF xFV1+22zQs8E1yjcyqWYkYygmMwvmii96JDd3MXzYbW//L3Uh96kSHVRh08Vj5qPij6/Ma BghFh6Wkl9GeRbwAzxZfbBruq+Gq8QiWjA0ly1G4Qam2sN5Ty+9+pox04qfN2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=c1eb97fea020ac09dc329651c4f33436e071997b commit c1eb97fea020ac09dc329651c4f33436e071997b Author: Alexey Dokuchaev AuthorDate: 2021-12-15 03:02:06 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-12-15 03:02:06 +0000 x11/nvidia-driver: try to unbreak the build on recent -CURRENT After src commit df38ada2931f, `sys/module.h' must be included after `sys/param.h'. PR: 260318 --- x11/nvidia-driver/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 6899b455b65c..e7de4d18e89a 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -168,6 +168,12 @@ post-patch: .SILENT ${REINPLACE_CMD} -e '/^#include/s:lock\.h:mutex.h:' \ ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c .endif +# After src df38ada2931f, `sys/module.h' must be included after `sys/param.h' +.if ${OSVERSION} >= 1400042 && ${NVVERSION} >= 358.009 + @${REINPLACE_CMD} -e '/^#include :; G; }; 14d' \ + ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c +.endif # Disable installation of Linux libraries (provided by the corresponding # `x11/linux-nvidia-libs' port or its slaves) ${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& 0/' \