git: 4885183c12d6 - main - graphics/drm-latest-kmod: Update to drm_v6.12.85_3 to fix build

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Joseph Mingrone <jrm_at_FreeBSD.org>
Date: Mon, 28 Sep 2026 23:02:06 UTC
The branch main has been updated by jrm:

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

commit 4885183c12d6d573b0bdb53776cc85311a6c9262
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2026-09-27 21:11:22 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2026-09-28 23:01:04 +0000

    graphics/drm-latest-kmod: Update to drm_v6.12.85_3 to fix build
    
    After src commit 33595d4ae01c added pci_map_rom() and pci_unmap_rom() to
    linuxkpi, graphics/drm-latest-kmod failed to build because drm-kmod
    defined the same macros itself.
    
    Upstream drm-kmod made its definitions conditional, and ports commit
    7e420adaf6ef pulled that fix in for drm-515-kmod, drm-61-kmod,
    drm-66-kmod, and drm-612-kmod.  drm-latest-kmod was missed, so move it
    to the same tag as drm-612-kmod.
    
    Bump PORTREVISION of the nvidia-drm-latest-kmod ports, which build
    against the drm-kmod sources, and update their distinfo for the new
    tarball.
    
    Reference: https://github.com/freebsd/drm-kmod/pull/503
    
    Reviewed by:    dumbbell
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D60084
---
 graphics/drm-latest-kmod/Makefile.version      | 4 ++--
 graphics/drm-latest-kmod/distinfo              | 6 +++---
 graphics/nvidia-drm-latest-kmod-580/Makefile   | 2 +-
 graphics/nvidia-drm-latest-kmod-580/distinfo   | 6 +++---
 graphics/nvidia-drm-latest-kmod-devel/Makefile | 2 +-
 graphics/nvidia-drm-latest-kmod-devel/distinfo | 6 +++---
 graphics/nvidia-drm-latest-kmod/Makefile       | 2 +-
 graphics/nvidia-drm-latest-kmod/distinfo       | 6 +++---
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/graphics/drm-latest-kmod/Makefile.version b/graphics/drm-latest-kmod/Makefile.version
index b47b83e4a314..15f2886cc816 100644
--- a/graphics/drm-latest-kmod/Makefile.version
+++ b/graphics/drm-latest-kmod/Makefile.version
@@ -1,5 +1,5 @@
 # drm-kmod common version definition
 #
 # This will be included from consumers such as nvidia-drm
-DRM_KMOD_DISTVERSION=	6.12
-DRM_KMOD_GH_TAGNAME=	drm_v6.12
+DRM_KMOD_DISTVERSION=	6.12.85
+DRM_KMOD_GH_TAGNAME=	drm_v6.12.85_3
diff --git a/graphics/drm-latest-kmod/distinfo b/graphics/drm-latest-kmod/distinfo
index b3e1e57dc71b..2924b7930e75 100644
--- a/graphics/drm-latest-kmod/distinfo
+++ b/graphics/drm-latest-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1778245340
-SHA256 (freebsd-drm-kmod-6.12-drm_v6.12_GH0.tar.gz) = d14ee33f3ff5e32aa0d1dffa43a27d93b2083ec9c4216508b29cf4c519ffc5df
-SIZE (freebsd-drm-kmod-6.12-drm_v6.12_GH0.tar.gz) = 44013275
+TIMESTAMP = 1790543312
+SHA256 (freebsd-drm-kmod-6.12.85-drm_v6.12.85_3_GH0.tar.gz) = 664bc6d77ddc0e103d523563a804644aca14b46d8a3c1af268ea79846139ef60
+SIZE (freebsd-drm-kmod-6.12.85-drm_v6.12.85_3_GH0.tar.gz) = 44076233
diff --git a/graphics/nvidia-drm-latest-kmod-580/Makefile b/graphics/nvidia-drm-latest-kmod-580/Makefile
index 99a90ff836bb..f8a1953a6d55 100644
--- a/graphics/nvidia-drm-latest-kmod-580/Makefile
+++ b/graphics/nvidia-drm-latest-kmod-580/Makefile
@@ -1,6 +1,6 @@
 NVIDIA_DISTVERSION?=	580.178.04
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	0
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../nvidia-drm-latest-kmod
 PKGNAMESUFFIX=	-580
 
diff --git a/graphics/nvidia-drm-latest-kmod-580/distinfo b/graphics/nvidia-drm-latest-kmod-580/distinfo
index 7924357100aa..7f8ea5c3286b 100644
--- a/graphics/nvidia-drm-latest-kmod-580/distinfo
+++ b/graphics/nvidia-drm-latest-kmod-580/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1785909371
+TIMESTAMP = 1790544610
 SHA256 (NVIDIA-FreeBSD-x86_64-580.178.04.tar.xz) = 5d9f704562f43f05e30b2c99964b3b3ff6397740bbb4ebb61840b48352b1d347
 SIZE (NVIDIA-FreeBSD-x86_64-580.178.04.tar.xz) = 289102996
-SHA256 (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = d14ee33f3ff5e32aa0d1dffa43a27d93b2083ec9c4216508b29cf4c519ffc5df
-SIZE (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = 44013275
+SHA256 (freebsd-drm-kmod-drm_v6.12.85_3_GH0.tar.gz) = 664bc6d77ddc0e103d523563a804644aca14b46d8a3c1af268ea79846139ef60
+SIZE (freebsd-drm-kmod-drm_v6.12.85_3_GH0.tar.gz) = 44076233
diff --git a/graphics/nvidia-drm-latest-kmod-devel/Makefile b/graphics/nvidia-drm-latest-kmod-devel/Makefile
index cd1501e0277f..7d85c76bd90d 100644
--- a/graphics/nvidia-drm-latest-kmod-devel/Makefile
+++ b/graphics/nvidia-drm-latest-kmod-devel/Makefile
@@ -1,6 +1,6 @@
 NVIDIA_DISTVERSION?=	615.71.09
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	0
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../nvidia-drm-latest-kmod
 PKGNAMESUFFIX=	-devel
 
diff --git a/graphics/nvidia-drm-latest-kmod-devel/distinfo b/graphics/nvidia-drm-latest-kmod-devel/distinfo
index 41fd2f76bdc3..f5aecee136c8 100644
--- a/graphics/nvidia-drm-latest-kmod-devel/distinfo
+++ b/graphics/nvidia-drm-latest-kmod-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1789005016
+TIMESTAMP = 1790544621
 SHA256 (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 7f81d9e722e9c0ec21def990f1d50bc6db3701caabbb7346cd7f76ae3f01288c
 SIZE (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 346334360
-SHA256 (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = d14ee33f3ff5e32aa0d1dffa43a27d93b2083ec9c4216508b29cf4c519ffc5df
-SIZE (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = 44013275
+SHA256 (freebsd-drm-kmod-drm_v6.12.85_3_GH0.tar.gz) = 664bc6d77ddc0e103d523563a804644aca14b46d8a3c1af268ea79846139ef60
+SIZE (freebsd-drm-kmod-drm_v6.12.85_3_GH0.tar.gz) = 44076233
diff --git a/graphics/nvidia-drm-latest-kmod/Makefile b/graphics/nvidia-drm-latest-kmod/Makefile
index bff909dfdf6b..67bca41228f5 100644
--- a/graphics/nvidia-drm-latest-kmod/Makefile
+++ b/graphics/nvidia-drm-latest-kmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nvidia-drm-latest-kmod
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 RUN_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-latest-kmod
diff --git a/graphics/nvidia-drm-latest-kmod/distinfo b/graphics/nvidia-drm-latest-kmod/distinfo
index 1653a309bcd6..2265739e772f 100644
--- a/graphics/nvidia-drm-latest-kmod/distinfo
+++ b/graphics/nvidia-drm-latest-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1787841422
+TIMESTAMP = 1790544600
 SHA256 (NVIDIA-FreeBSD-x86_64-595.99.02.tar.xz) = 6230a8393bb4f941f8cd139ddfa5eee85ee4986452d434c0134ca089c8a52bb6
 SIZE (NVIDIA-FreeBSD-x86_64-595.99.02.tar.xz) = 329239560
-SHA256 (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = d14ee33f3ff5e32aa0d1dffa43a27d93b2083ec9c4216508b29cf4c519ffc5df
-SIZE (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = 44013275
+SHA256 (freebsd-drm-kmod-drm_v6.12.85_3_GH0.tar.gz) = 664bc6d77ddc0e103d523563a804644aca14b46d8a3c1af268ea79846139ef60
+SIZE (freebsd-drm-kmod-drm_v6.12.85_3_GH0.tar.gz) = 44076233