From nobody Fri Sep 01 16:17:07 2023 X-Original-To: dev-commits-ports-all@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 4Rcjpq4dR1z4rg15; Fri, 1 Sep 2023 16:17:07 +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 4Rcjpq2W7zz3NlP; Fri, 1 Sep 2023 16:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693585027; 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=NqTobGzgF28Md6ZQty1Hqygnk0Gz7hs11RWyM6GmMzQ=; b=Cnc//5bGG7AVKTKPCruyEX0IFDB4bkVXDlJ1k6WX3Z7JmQ3v6V69ZI+ULG2ng5GtEAk0CV PSbephAZbMYH39qrcvl9cBRfvVTuycTSdN9kLxPxzM+7aYAQh86Dj5JzMzxMoBqthJtkqt mUCEu+dFMRfJeA0bUWyvzEeDrPcbJz+gqtIyODfv5dh4UZkkx62xEk0ncz15iY8gA5gx9P bE4VWvnp9l1tl4+hFdsmvXEsZqxH6zscyj83PxavGcDPgPcM9k/o3U5SFMpzjBuhfk4Pp9 kc0EF1tSb/CYKmJ9YnC7YlZoS73RCwZw2116w1fEwML7zwzs8rrGEXIOfyNlOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693585027; a=rsa-sha256; cv=none; b=J7dNh2AaCbAPhAfOToplHX/AMuFws5TI937jfBLtJtYbacNM0PDblTXBDMij3JMbSnSwtZ 1GzuMv0CAdzabcqS+xilve3HImkvlh2PGmKZyeXN/863rMRrig/W/SVxO7Vw4i2LTrxSZK fXGeopDz5lctFOdRs19PuLhEj+FTEt9DR0bdiOEO3aB1m2bN4NU6eSavh4tTetvpD7dFGt b5thyyqdOYTliuYGV5adxLZzHPnNy2WXkDYzmz9Mh6hArgk0RpHeh7Qj+szRiXWNnQMlW+ ZpAkeXfT99DklSIzwiPc13Yxbb/G7NFwBg2f02GHg+VHKhHrJ9hjFfr0EwDzRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693585027; 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=NqTobGzgF28Md6ZQty1Hqygnk0Gz7hs11RWyM6GmMzQ=; b=FCJBxtVDUCdnXWkMuBKoTP4Wlqxhwtid+VJzgiqeP0i0qCpaL+byU/PBX7HQFVMZXXweej uoi3TU7cy8lEQ8b5IOGmbVS4bH+AoyYeIJ/rcvbv2mYQ8z+Du6aSEzoRVZN3/WpAJtiQeu sQXC7Ksm70oLY3PidlZO3N7T1r7WPenRXneffAMxJ2Uc40lHX9FmtYydWRGxAdqHWpL5aH dRJKIjBTTRfloK57UFwKFavUMB9147kK84EKIpkHbUr0qJMkqb/UhWK4wNeNwFBLYPUslZ 4l/a9v8Mz5LXnRdlPOZPpYZe9QFC++lOErrYedW6spyMsfxIkc7TAqXQo6bMoQ== 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 4Rcjpq1b5Cz16y7; Fri, 1 Sep 2023 16:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 381GH7Sm004715; Fri, 1 Sep 2023 16:17:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 381GH7ub004712; Fri, 1 Sep 2023 16:17:07 GMT (envelope-from git) Date: Fri, 1 Sep 2023 16:17:07 GMT Message-Id: <202309011617.381GH7ub004712@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: dd3d40263140 - main - nvidia-drm-kmod: Update with fix for PRIME List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd3d40263140265bb9ac5c855230fcde9f628c3e Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd3d40263140265bb9ac5c855230fcde9f628c3e commit dd3d40263140265bb9ac5c855230fcde9f628c3e Author: Austin Shafer AuthorDate: 2023-09-01 15:56:13 +0000 Commit: Gleb Popov CommitDate: 2023-09-01 16:16:56 +0000 nvidia-drm-kmod: Update with fix for PRIME This updates the nvidia-drm ports to contain the fix for https://github.com/amshafer/nvidia-driver/issues/20 Also updates the port Makefiles to use CONFLICTS_INSTALL to resolve PR 273261, and adds PORTREVISION to the github tag referenced. Differential Revision: https://reviews.freebsd.org/D41591 PR: 273261 Tested by: arrowd --- graphics/nvidia-drm-510-kmod/Makefile | 2 ++ graphics/nvidia-drm-510-kmod/distinfo | 6 +++--- graphics/nvidia-drm-515-kmod/Makefile | 2 ++ graphics/nvidia-drm-515-kmod/distinfo | 6 +++--- graphics/nvidia-drm-kmod/Makefile.common | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/graphics/nvidia-drm-510-kmod/Makefile b/graphics/nvidia-drm-510-kmod/Makefile index 13b2c26c6c3f..bf60cd20d648 100644 --- a/graphics/nvidia-drm-510-kmod/Makefile +++ b/graphics/nvidia-drm-510-kmod/Makefile @@ -1,8 +1,10 @@ PORTNAME= nvidia-drm-510-kmod PORTVERSION= ${NVIDIA_DISTVERSION} +PORTREVISION= 1 CATEGORIES= graphics RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-510-kmod +CONFLICTS_INSTALL= nvidia-drm-515-kmod .include "${.CURDIR}/../drm-510-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-510-kmod/distinfo b/graphics/nvidia-drm-510-kmod/distinfo index 3b60248b1ff9..19b11189a6ba 100644 --- a/graphics/nvidia-drm-510-kmod/distinfo +++ b/graphics/nvidia-drm-510-kmod/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1692304583 -SHA256 (amshafer-nvidia-driver-535.98-nvidia-drm-510-kmod-535.98_GH0.tar.gz) = c11fb17f9f8cddc11ec699c63bbc288bd1124537dd7ae698538ebd8bb399e225 -SIZE (amshafer-nvidia-driver-535.98-nvidia-drm-510-kmod-535.98_GH0.tar.gz) = 185499361 +TIMESTAMP = 1692885801 +SHA256 (amshafer-nvidia-driver-535.98-nvidia-drm-510-kmod-535.98_1_GH0.tar.gz) = c09de4543af3bd6287aaf07172cbf53612a8cd3575c4904d2312ff03a36dee29 +SIZE (amshafer-nvidia-driver-535.98-nvidia-drm-510-kmod-535.98_1_GH0.tar.gz) = 185495971 SHA256 (freebsd-drm-kmod-drm_v5.10.163_6_GH0.tar.gz) = 342eb5073f318d18667c605e639bd85e48de3be25861d8a730d0ca3dd7ba7726 SIZE (freebsd-drm-kmod-drm_v5.10.163_6_GH0.tar.gz) = 20096515 diff --git a/graphics/nvidia-drm-515-kmod/Makefile b/graphics/nvidia-drm-515-kmod/Makefile index c20e7d25f126..aa8adc6442b6 100644 --- a/graphics/nvidia-drm-515-kmod/Makefile +++ b/graphics/nvidia-drm-515-kmod/Makefile @@ -1,8 +1,10 @@ PORTNAME= nvidia-drm-515-kmod PORTVERSION= ${NVIDIA_DISTVERSION} +PORTREVISION= 1 CATEGORIES= graphics RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-515-kmod +CONFLICTS_INSTALL= nvidia-drm-510-kmod .include "${.CURDIR}/../drm-515-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-515-kmod/distinfo b/graphics/nvidia-drm-515-kmod/distinfo index ea026477bc17..b8cad4dd2c69 100644 --- a/graphics/nvidia-drm-515-kmod/distinfo +++ b/graphics/nvidia-drm-515-kmod/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1692308433 -SHA256 (amshafer-nvidia-driver-535.98-nvidia-drm-515-kmod-535.98_GH0.tar.gz) = 973bb7d81e894767f1e9e5cbe394be15289084098d782fb4adb3758a8face51c -SIZE (amshafer-nvidia-driver-535.98-nvidia-drm-515-kmod-535.98_GH0.tar.gz) = 185499765 +TIMESTAMP = 1692885959 +SHA256 (amshafer-nvidia-driver-535.98-nvidia-drm-515-kmod-535.98_1_GH0.tar.gz) = 87e4d34bdfe61db858c6f7ebf63e09f782d9c25fce00bafe751cf39e2c8a6193 +SIZE (amshafer-nvidia-driver-535.98-nvidia-drm-515-kmod-535.98_1_GH0.tar.gz) = 185497980 SHA256 (freebsd-drm-kmod-drm_v5.15.25_5_GH0.tar.gz) = bd5eb5a39cd46f532d0310958bfc2870da1c1a003e92874f18f7f88c8baac6a5 SIZE (freebsd-drm-kmod-drm_v5.15.25_5_GH0.tar.gz) = 26084713 diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common index f97266bc03e1..4a0ab146dadc 100644 --- a/graphics/nvidia-drm-kmod/Makefile.common +++ b/graphics/nvidia-drm-kmod/Makefile.common @@ -15,7 +15,7 @@ RUN_DEPENDS+= ${KMODDIR}/nvidia.ko:x11/nvidia-driver LICENSE_FILE= ${WRKSRC}/nvidia/doc/license.txt -NVIDIA_GH_TAGNAME= ${PORTNAME}-${PORTVERSION} +NVIDIA_GH_TAGNAME= ${PKGNAME} USE_GITHUB= yes GH_ACCOUNT= amshafer freebsd:drm GH_PROJECT= nvidia-driver drm-kmod:drm