From nobody Mon May 29 10:06:27 2023 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 4QVB5015Gjz4XWDm; Mon, 29 May 2023 10:06:28 +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 4QVB500cWWz4PRG; Mon, 29 May 2023 10:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685354788; 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=6HEiM1wlvKPrEqs7XeP0rtYEB4XzzDfJk5ZLbWNca7c=; b=S61Y39VtntHAYpa20cmGTflfeZwgYVzbhcOAxqRaKtrNBFwSlIyMSRsasL2a5SD3lbJacx 7OLm2va0gcJp+BFjCyw0BQALqEJsg4tFqxeeoTpZCBi+yIhvuXzgf/P+ZQK8b9CRQ496x/ Txv5Ji+rXjLkYLWDxixISK2SHXrVIsvCkeU7uTtD3Zj0aKhe97HQX6RxzrFaCiaU1FlHAJ ZNk8TnBjK2FeyCc0GAYtG3AF3BHoCWnZ0lBLOkfKucbwBG02Pk3e3x5PMPj2UZUDcUTHse idWPCH+YbthUrkkMoPg1HR+sDUoY0aAmnP7wx5fzSwBV6pbAD8g9B01u/evljA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685354788; 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=6HEiM1wlvKPrEqs7XeP0rtYEB4XzzDfJk5ZLbWNca7c=; b=kkjYiZ5hGTAt/5Ttj7Tb8SepfDpTJYdAKkTUYNOu4o2fur+1sJbyw4cEX2wgTaLEmxVA9m YSfL3La7H11RuhtrwRajkw2WWWDxFSmVlwCjp83/AJxD8QAJrGrfzKdBhepG8b3ULE0vGr pj6kCnwORr4dh9xwlg2Iq6Yc+1YNUyMorzvq/IyIoSYAA8EwuWQkxP5PQCiKS2ByTpqxQH kJNBIpbOPmT5smQZEN/5w+Qo1NxhwS4ZN1NuJcAO2vJi2bKSGng8+Ggx0uvtnXDlME9VGo ErmuwMy2APshPw+0nv6Vm7P49nBxMRIC6eEE1QQdlsZNGkSTz60AY1ra83tW1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685354788; a=rsa-sha256; cv=none; b=I3fusVx/A/F0hZ491d0gJzGnHMPtufyi+Zv9fevsdk8T/WrD+pvRPCf/OMIiLk+BxhG6er 3bERcTLde30+hU4VbKdMwM5wPuDgD62cFttJ8fs81klqpMggzgMgzRtPLC/lrX9JLVhx0F eckSKvw2ZZ/hV8PmDJaZygBODF0B4blibaR9QHxE7wcoFXkVnhjIgHvyjk7afxXu7IrN7C pgvPK417EMRDN4dFVvtZlAOHwyA69svRwRJDTn8IelafSvpQI4vXo7j0t0jbLIMy4l/Gr1 FO9AqLmMEq3+vuWdS/AKFr5sv9HEd4dcjbhi9jBuZ+Myk0F0dNuYnusg5jz3sA== 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 4QVB4z6dXRz16s7; Mon, 29 May 2023 10:06:27 +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 34TA6RwQ045131; Mon, 29 May 2023 10:06:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34TA6RIN045130; Mon, 29 May 2023 10:06:27 GMT (envelope-from git) Date: Mon, 29 May 2023 10:06:27 GMT Message-Id: <202305291006.34TA6RIN045130@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: 167434b6544d - main - x11/nvidia-driver: unbreak the build of two legacy driver versions 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: 167434b6544d627882603149e8bfd1db0e33a917 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=167434b6544d627882603149e8bfd1db0e33a917 commit 167434b6544d627882603149e8bfd1db0e33a917 Author: Alexey Dokuchaev AuthorDate: 2023-05-29 10:05:20 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-05-29 10:05:20 +0000 x11/nvidia-driver: unbreak the build of two legacy driver versions - Limit the scope of the K&R prototype fix to versions which actually have that `nvlink_freebsd.c' file - Adjust the version check for `lib/libnvidia-wayland-client.so' which had first appeared in 515.43.04 beta release and add a comment on the PLIST_FILES usage there Reported by: pkg-fallout --- x11/nvidia-driver/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 697c9ed82422..9146c1a35a6b 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -139,7 +139,8 @@ PLIST_SUB+= LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment " PLIST_SUB+= LIBGLDIR="@comment " LIBGLMAP="" .endif -.if ${NVVERSION} >= 515.08601 +# Not part of the pkg-plist because DISTVERSION is not on PLIST_SUB +.if ${NVVERSION} >= 515.04304 PLIST_FILES+= lib/libnvidia-wayland-client.so.${DISTVERSION} .endif @@ -267,8 +268,10 @@ post-patch: .SILENT ${WRKSRC}/src/${NVSRC}/nvidia_subr.c .endif # Fix a K&R prototype +.if ${NVVERSION:R} >= 390 ${REINPLACE_CMD} -e '/nvlink_allocLock/s,(),(void),' \ ${WRKSRC}/src/${NVSRC}/nvlink_freebsd.c +.endif # Finally, process OPTIONS .if ${PORT_OPTIONS:MFREEBSD_AGP} ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \