git: 0d8479ccccca - main - graphics/drm-61-kmod: Update to drm_v6.1.69_1

The branch main has been updated by wulf:

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

commit 0d8479cccccad632779b640524cdb4d156fb7431
Author:     Vladimir Kondratyev <wulf@FreeBSD.org>
AuthorDate: 2024-02-24 13:29:50 +0000
Commit:     Vladimir Kondratyev <wulf@FreeBSD.org>
CommitDate: 2024-02-24 13:52:15 +0000

    graphics/drm-61-kmod: Update to drm_v6.1.69_1
    
    - Allow build on recent 14-STABLE
    - Fix https://github.com/freebsd/drm-kmod/issues/277
    - Attempt to fix PR/274770
    
    Sponsored by:   Serenity Cyber Security, LLC
    Approved by:    x11 (manu, implicit)
---
 graphics/drm-61-kmod/Makefile         | 7 ++++---
 graphics/drm-61-kmod/Makefile.version | 2 +-
 graphics/drm-61-kmod/distinfo         | 6 +++---
 graphics/drm-61-kmod/pkg-descr        | 3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/graphics/drm-61-kmod/Makefile b/graphics/drm-61-kmod/Makefile
index 43f0d5be31aa..1327241c9177 100644
--- a/graphics/drm-61-kmod/Makefile
+++ b/graphics/drm-61-kmod/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	drm-61-kmod
 PORTVERSION=	${DRM_KMOD_DISTVERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kld
 
 .include "Makefile.version"
@@ -15,7 +16,7 @@ ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64 and powerpc64
 
 CONFLICTS_INSTALL=	drm-510-kmod \
-			drm-61-kmod
+			drm-515-kmod
 
 USES=		kmod uidfix compiler:c++11-lang
 
@@ -26,8 +27,8 @@ GH_TAGNAME=	${DRM_KMOD_GH_TAGNAME}
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500008
-IGNORE=		not supported on older than 15.0, no kernel support
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500008 || ( ${OSVERSION} >= 1400508 && ${OSVERSION} < 1500000 )
+IGNORE=		not supported on older than 14-STABLE 1400508, no kernel support
 .endif
 .if ${OPSYS} != FreeBSD
 IGNORE=		not supported on anything but FreeBSD (missing linuxkpi functionality)
diff --git a/graphics/drm-61-kmod/Makefile.version b/graphics/drm-61-kmod/Makefile.version
index c96b856be7d1..42e5c12ac0b4 100644
--- a/graphics/drm-61-kmod/Makefile.version
+++ b/graphics/drm-61-kmod/Makefile.version
@@ -2,4 +2,4 @@
 #
 # This will be included from consumers such as nvidia-drm
 DRM_KMOD_DISTVERSION=	6.1.69
-DRM_KMOD_GH_TAGNAME=	drm_v6.1.69
+DRM_KMOD_GH_TAGNAME=	drm_v6.1.69_1
diff --git a/graphics/drm-61-kmod/distinfo b/graphics/drm-61-kmod/distinfo
index 80cbb156b286..4f081f80bbf2 100644
--- a/graphics/drm-61-kmod/distinfo
+++ b/graphics/drm-61-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704471820
-SHA256 (freebsd-drm-kmod-6.1.69-drm_v6.1.69_GH0.tar.gz) = 2327b60eb403f07c9782894cff70de04920cb14a70efc565d68d4b5ad12bc5cb
-SIZE (freebsd-drm-kmod-6.1.69-drm_v6.1.69_GH0.tar.gz) = 37088102
+TIMESTAMP = 1708780832
+SHA256 (freebsd-drm-kmod-6.1.69-drm_v6.1.69_1_GH0.tar.gz) = da88f18f0678b12525a236dfd580bc762f42a5d9c29294192d8cf7fa2b36f68a
+SIZE (freebsd-drm-kmod-6.1.69-drm_v6.1.69_1_GH0.tar.gz) = 37093608
diff --git a/graphics/drm-61-kmod/pkg-descr b/graphics/drm-61-kmod/pkg-descr
index 1e3881cc4eff..a2e7a2515a87 100644
--- a/graphics/drm-61-kmod/pkg-descr
+++ b/graphics/drm-61-kmod/pkg-descr
@@ -1,3 +1,4 @@
 amdgpu, i915, and radeon DRM drivers modules.
 Currently corresponding to Linux 6.1 DRM.
-This version is for FreeBSD 15.0 and above.
+This version is for FreeBSD 14-STABLE 1400508
+and above.