diff --git a/graphics/drm-515-kmod/Makefile b/graphics/drm-515-kmod/Makefile index 8bc7029d0f13..0aa1c65e7a68 100644 --- a/graphics/drm-515-kmod/Makefile +++ b/graphics/drm-515-kmod/Makefile @@ -1,57 +1,57 @@ PORTNAME= drm-515-kmod PORTVERSION= ${DRM_KMOD_DISTVERSION} -PORTREVISION= 3 +PORTREVISION= 4 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 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 USES= kmod uidfix compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= freebsd GH_PROJECT= drm-kmod GH_TAGNAME= ${DRM_KMOD_GH_TAGNAME} .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400081 IGNORE= not supported on older than 14.0, 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 " .endif MAKE_ENV+= MAKEOBJDIRPREFIX=${WRKSRC}/obj pre-build: ${MKDIR} ${WRKSRC}/obj (cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} obj) .include diff --git a/graphics/drm-515-kmod/Makefile.version b/graphics/drm-515-kmod/Makefile.version index 4a7c27611bc8..ec1260839f29 100644 --- a/graphics/drm-515-kmod/Makefile.version +++ b/graphics/drm-515-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= 5.15.118 -DRM_KMOD_GH_TAGNAME= drm_v5.15.118_4 +DRM_KMOD_GH_TAGNAME= drm_v5.15.118_5 diff --git a/graphics/drm-515-kmod/distinfo b/graphics/drm-515-kmod/distinfo index b72172f15f90..cdf67dbebb04 100644 --- a/graphics/drm-515-kmod/distinfo +++ b/graphics/drm-515-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1708811594 -SHA256 (freebsd-drm-kmod-5.15.118-drm_v5.15.118_4_GH0.tar.gz) = 58e2fc195979e2361346ca57cc158e44413e5de26b83b951a631d09849caf90c -SIZE (freebsd-drm-kmod-5.15.118-drm_v5.15.118_4_GH0.tar.gz) = 26092371 +TIMESTAMP = 1710437576 +SHA256 (freebsd-drm-kmod-5.15.118-drm_v5.15.118_5_GH0.tar.gz) = 66832b4a937e2475f481acdb9a5efe05cba37e43a4a65a198d2df3741904d918 +SIZE (freebsd-drm-kmod-5.15.118-drm_v5.15.118_5_GH0.tar.gz) = 26092274 diff --git a/graphics/drm-61-kmod/Makefile b/graphics/drm-61-kmod/Makefile index 48741c9e1491..f77c3d0d8583 100644 --- a/graphics/drm-61-kmod/Makefile +++ b/graphics/drm-61-kmod/Makefile @@ -1,57 +1,57 @@ PORTNAME= drm-61-kmod PORTVERSION= ${DRM_KMOD_DISTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 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 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64 and powerpc64 CONFLICTS_INSTALL= drm-510-kmod \ drm-515-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 .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) .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 " .endif MAKE_ENV+= MAKEOBJDIRPREFIX=${WRKSRC}/obj pre-build: ${MKDIR} ${WRKSRC}/obj (cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} obj) .include diff --git a/graphics/drm-61-kmod/Makefile.version b/graphics/drm-61-kmod/Makefile.version index 42e5c12ac0b4..5b7796c13d28 100644 --- a/graphics/drm-61-kmod/Makefile.version +++ b/graphics/drm-61-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.1.69 -DRM_KMOD_GH_TAGNAME= drm_v6.1.69_1 +DRM_KMOD_GH_TAGNAME= drm_v6.1.69_2 diff --git a/graphics/drm-61-kmod/distinfo b/graphics/drm-61-kmod/distinfo index 4f081f80bbf2..cc095807c9dc 100644 --- a/graphics/drm-61-kmod/distinfo +++ b/graphics/drm-61-kmod/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1710437648 +SHA256 (freebsd-drm-kmod-6.1.69-drm_v6.1.69_2_GH0.tar.gz) = 958afa04779720b04bfa593c6e3b01869e3c00254e7fe09ce4f23ca1350a8b05 +SIZE (freebsd-drm-kmod-6.1.69-drm_v6.1.69_2_GH0.tar.gz) = 37094835 diff --git a/graphics/nvidia-drm-515-kmod/distinfo b/graphics/nvidia-drm-515-kmod/distinfo index 31f2739535e4..94643e41d151 100644 --- a/graphics/nvidia-drm-515-kmod/distinfo +++ b/graphics/nvidia-drm-515-kmod/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1708813421 +TIMESTAMP = 1710437911 SHA256 (NVIDIA-FreeBSD-x86_64-550.54.14.tar.xz) = 934549ee2e6cf6bc098a0794ad5c84cfa8d55c79396d1d387c37eb91c49de340 SIZE (NVIDIA-FreeBSD-x86_64-550.54.14.tar.xz) = 143184876 -SHA256 (freebsd-drm-kmod-drm_v5.15.118_4_GH0.tar.gz) = 58e2fc195979e2361346ca57cc158e44413e5de26b83b951a631d09849caf90c -SIZE (freebsd-drm-kmod-drm_v5.15.118_4_GH0.tar.gz) = 26092371 +SHA256 (freebsd-drm-kmod-drm_v5.15.118_5_GH0.tar.gz) = 66832b4a937e2475f481acdb9a5efe05cba37e43a4a65a198d2df3741904d918 +SIZE (freebsd-drm-kmod-drm_v5.15.118_5_GH0.tar.gz) = 26092274 diff --git a/graphics/nvidia-drm-61-kmod/distinfo b/graphics/nvidia-drm-61-kmod/distinfo index 52c5c6f384c9..1f82c51fd3e9 100644 --- a/graphics/nvidia-drm-61-kmod/distinfo +++ b/graphics/nvidia-drm-61-kmod/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1708963422 +TIMESTAMP = 1710438089 SHA256 (NVIDIA-FreeBSD-x86_64-550.54.14.tar.xz) = 934549ee2e6cf6bc098a0794ad5c84cfa8d55c79396d1d387c37eb91c49de340 SIZE (NVIDIA-FreeBSD-x86_64-550.54.14.tar.xz) = 143184876 -SHA256 (freebsd-drm-kmod-drm_v6.1.69_1_GH0.tar.gz) = da88f18f0678b12525a236dfd580bc762f42a5d9c29294192d8cf7fa2b36f68a -SIZE (freebsd-drm-kmod-drm_v6.1.69_1_GH0.tar.gz) = 37093608 +SHA256 (freebsd-drm-kmod-drm_v6.1.69_2_GH0.tar.gz) = 958afa04779720b04bfa593c6e3b01869e3c00254e7fe09ce4f23ca1350a8b05 +SIZE (freebsd-drm-kmod-drm_v6.1.69_2_GH0.tar.gz) = 37094835 diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common index 16b9f09620ea..87251dad9970 100644 --- a/graphics/nvidia-drm-kmod/Makefile.common +++ b/graphics/nvidia-drm-kmod/Makefile.common @@ -1,40 +1,41 @@ # Common rules for nvidia-drm-*-kmod ports MAINTAINER= ashafer@badland.io COMMENT= NVIDIA DRM Kernel Module WWW= https://www.nvidia.com/object/unix.html MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${NVIDIA_DISTVERSION}:nvidia \ https://codeload.github.com/freebsd/drm-kmod/tar.gz/${DRM_KMOD_GH_TAGNAME}?dummy=/:drm DISTVERSION?= ${NVIDIA_DISTVERSION} +PORTREVISION= 1 DISTFILES= NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}${EXTRACT_SUFX}:nvidia \ freebsd-drm-kmod-${DRM_KMOD_GH_TAGNAME}_GH0.tar.gz:drm ONLY_FOR_ARCHS= amd64 USES= kmod uidfix tar:xz SUB_FILES= 20-nvidia-drm-outputclass.conf RUN_DEPENDS+= ${KMODDIR}/nvidia.ko:x11/nvidia-driver .include "${.CURDIR}/../../x11/nvidia-driver/Makefile.version" .include "${.CURDIR}/../../x11/nvidia-driver/Makefile.common" LICENSE_FILE= ${WRKSRC}/../../doc/license.txt PLIST_FILES= ${KMODDIR}/nvidia-drm.ko \ share/X11/xorg.conf.d/20-nvidia-drm-outputclass.conf MAKE_ENV+= DEBUG_FLAGS=${DEBUG_FLAGS} \ DRMKMODDIR=${WRKDIR}/drm-kmod-${DRM_KMOD_GH_TAGNAME}/ WRKSRC= ${WRKDIR}/NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}/ WRKSRC_SUBDIR= src/nvidia-drm/ post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d/ ${INSTALL_DATA} ${WRKDIR}/20-nvidia-drm-outputclass.conf ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d/ post-patch: # We should support -CURRENT: kill the check (first #if __FreeBSD_version) linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \ ${WRKSRC}/../nvidia/nv-freebsd.h) ; ${REINPLACE_CMD} \ -e "$$linenum,+2d" ${WRKSRC}/../nvidia/nv-freebsd.h