git: dd3d40263140 - main - nvidia-drm-kmod: Update with fix for PRIME

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Fri, 01 Sep 2023 16:17:07 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dd3d40263140265bb9ac5c855230fcde9f628c3e

commit dd3d40263140265bb9ac5c855230fcde9f628c3e
Author:     Austin Shafer <ashafer@badland.io>
AuthorDate: 2023-09-01 15:56:13 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
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