diff --git a/graphics/drm-latest-kmod/Makefile b/graphics/drm-latest-kmod/Makefile index 2b7549c69550..0eaf192a138a 100644 --- a/graphics/drm-latest-kmod/Makefile +++ b/graphics/drm-latest-kmod/Makefile @@ -1,66 +1,46 @@ PORTNAME= drm-latest-kmod -PORTVERSION= ${DRM_KMOD_DISTVERSION} -PORTREVISION= 1 +DISTVERSION= ${DRM_KMOD_DISTVERSION} CATEGORIES= graphics kld .include "Makefile.version" MAINTAINER= x11@FreeBSD.org COMMENT= DRM drivers modules WWW= https://github.com/freebsd/drm-kmod/ LICENSE= BSD2CLAUSE MIT GPLv2 LICENSE_COMB= multi ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64 CONFLICTS_INSTALL= drm-515-kmod \ drm-61-kmod USES= kmod uidfix compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= freebsd GH_PROJECT= drm-kmod GH_TAGNAME= ${DRM_KMOD_GH_TAGNAME} .include SUB_FILES= pkg-message SUB_LIST= PORTNAME=${PORTNAME} OPSYS=${OPSYS} OSREL=${OSREL} -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500058 -IGNORE= not supported on older than 1500058, no kernel support -.endif .if ${OPSYS} != FreeBSD -IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) -.endif - -.if ${ARCH} == "amd64" -PLIST_SUB+= AMDGPU="" -PLIST_SUB+= I915="" -.elif ${ARCH} == "i386" -PLIST_SUB+= AMDGPU="@comment " -PLIST_SUB+= I915="" -.elif ${ARCH} == "aarch64" || ${ARCH:Mpowerpc*} -PLIST_SUB+= AMDGPU="" -PLIST_SUB+= I915="@comment " -.else -PLIST_SUB+= AMDGPU="@comment " -PLIST_SUB+= I915="@comment " +IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) +.elif ${OSVERSION} < 1500509 +IGNORE= not supported on FreeBSD < 1500509, no kernel support +.elif 1600000 <= ${OSVERSION} && ${OSVERSION} < 1600018 +IGNORE= not supported on FreeBSD 16 before 1600018, no kernel support .endif MAKE_ENV+= MAKEOBJDIRPREFIX=${WRKSRC}/obj -.include - -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 211 -CFLAGS+= -Wno-default-const-init-var-unsafe -.endif - pre-build: ${MKDIR} ${WRKSRC}/obj (cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} obj) -.include +.include diff --git a/graphics/drm-latest-kmod/Makefile.version b/graphics/drm-latest-kmod/Makefile.version index 5fa7d0963110..b47b83e4a314 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.9 -DRM_KMOD_GH_TAGNAME= drm_v6.9_1 +DRM_KMOD_DISTVERSION= 6.12 +DRM_KMOD_GH_TAGNAME= drm_v6.12 diff --git a/graphics/drm-latest-kmod/distinfo b/graphics/drm-latest-kmod/distinfo index b801c3d21098..b3e1e57dc71b 100644 --- a/graphics/drm-latest-kmod/distinfo +++ b/graphics/drm-latest-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1765611228 -SHA256 (freebsd-drm-kmod-6.9-drm_v6.9_1_GH0.tar.gz) = df7933202e61ebf8c9decb6835e4908817923fe4e76213e532873b0b611e8c63 -SIZE (freebsd-drm-kmod-6.9-drm_v6.9_1_GH0.tar.gz) = 41512758 +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 diff --git a/graphics/drm-latest-kmod/pkg-descr b/graphics/drm-latest-kmod/pkg-descr index af39d0f3fff6..37c8f1eb6e1a 100644 --- a/graphics/drm-latest-kmod/pkg-descr +++ b/graphics/drm-latest-kmod/pkg-descr @@ -1,4 +1,4 @@ amdgpu, i915, and radeon DRM drivers modules. -Currently corresponding to Linux 6.9 DRM. -This version is for FreeBSD 15 1500058 -and above. +Currently corresponding to Linux 6.12 DRM. +This version is for FreeBSD 15 1500509 +and above, or FreeBSD 16 1600018 and above. diff --git a/graphics/drm-latest-kmod/pkg-plist b/graphics/drm-latest-kmod/pkg-plist index 42f54df26cff..79c8a2a04c13 100644 --- a/graphics/drm-latest-kmod/pkg-plist +++ b/graphics/drm-latest-kmod/pkg-plist @@ -1,6 +1,6 @@ /%%KMODDIR%%/dmabuf.ko -%%AMDGPU%%/%%KMODDIR%%/amdgpu.ko +/%%KMODDIR%%/amdgpu.ko /%%KMODDIR%%/drm.ko -%%I915%%/%%KMODDIR%%/i915kms.ko +/%%KMODDIR%%/i915kms.ko /%%KMODDIR%%/radeonkms.ko /%%KMODDIR%%/ttm.ko