Index: branches/2021Q1/graphics/drm-current-kmod/Makefile =================================================================== --- branches/2021Q1/graphics/drm-current-kmod/Makefile (revision 562491) +++ branches/2021Q1/graphics/drm-current-kmod/Makefile (revision 562492) @@ -1,90 +1,91 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-current-kmod PORTVERSION= 5.4.62.g20201109 PORTREVISION= 1 CATEGORIES= graphics kld MAINTAINER= x11@FreeBSD.org COMMENT= DRM modules for the linuxkpi-based KMS components LICENSE= BSD2CLAUSE MIT GPLv2 LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64, i386, aarch64 and powerpc64 RUN_DEPENDS= gpu-firmware-kmod>=g20200914:graphics/gpu-firmware-kmod CONFLICTS_INSTALL= drm-devel-kmod \ drm-fbsd11.2-kmod \ drm-fbsd12.0-kmod \ + drm-fbsd13-kmod \ drm-legacy-kmod OPTIONS_DEFINE= DEBUG SOURCE OPTIONS_DEFAULT= SOURCE SOURCE_DESC= Install kernel module sources OPTIONS_SUB= yes USES= kmod uidfix compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= freebsd GH_PROJECT= drm-kmod GH_TAGNAME= drm_v5.4.62_4 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300108 IGNORE= not supported on older CURRENT, 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="" PLIST_SUB+= VMWGFX="" PLIST_SUB+= VBOXVIDEO="" .elif ${ARCH} == "i386" PLIST_SUB+= AMDGPU="@comment " PLIST_SUB+= I915="" PLIST_SUB+= VMWGFX="" PLIST_SUB+= VBOXVIDEO="" .elif ${ARCH} == "aarch64" || ${ARCH:Mpowerpc*} PLIST_SUB+= AMDGPU="" PLIST_SUB+= I915="@comment " PLIST_SUB+= VBOXVIDEO="@comment " PLIST_SUB+= VMWGFX="@comment " .else PLIST_SUB+= AMDGPU="@comment " PLIST_SUB+= I915="@comment " PLIST_SUB+= VBOXVIDEO="@comment " PLIST_SUB+= VMWGFX="@comment " .endif KMODSRC= ${STAGEDIR}${PREFIX}/sys/modules/${PORTNAME} SRCDIRS= amd drivers drm i915 include linuxkpi radeon ttm vmwgfx vboxvideo PLIST_SUB+= KMODSRC="sys/modules/${PORTNAME}" MAKE_ENV+= MAKEOBJDIRPREFIX=${WRKSRC}/obj pre-build: ${MKDIR} ${WRKSRC}/obj (cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} obj) post-install-SOURCE-on: ${MKDIR} ${KMODSRC} ${INSTALL_DATA} ${WRKSRC}/Makefile ${KMODSRC} ${INSTALL_DATA} ${WRKSRC}/kconfig.mk ${KMODSRC} .for dir in ${SRCDIRS} cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${KMODSRC} .endfor .include Index: branches/2021Q1/graphics/drm-devel-kmod/Makefile =================================================================== --- branches/2021Q1/graphics/drm-devel-kmod/Makefile (revision 562491) +++ branches/2021Q1/graphics/drm-devel-kmod/Makefile (revision 562492) @@ -1,68 +1,69 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-devel-kmod PORTVERSION= 5.4.62.g20201109 CATEGORIES= graphics kld MAINTAINER= x11@FreeBSD.org COMMENT= DRM modules for the linuxkpi-based KMS components (development version) LICENSE= BSD2CLAUSE MIT GPLv2 LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64, arm64, i386 and powerpc64 RUN_DEPENDS= gpu-firmware-kmod>=g20200914:graphics/gpu-firmware-kmod CONFLICTS_INSTALL= drm-current-kmod \ drm-fbsd11.2-kmod \ drm-fbsd12.0-kmod \ + drm-fbsd13-kmod \ drm-legacy-kmod OPTIONS_DEFINE= DEBUG USES= kmod uidfix compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= freebsd GH_PROJECT= drm-kmod GH_TAGNAME= drm_v5.4.62_4 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300118 IGNORE= not supported on older CURRENT, 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+= AMDKFD="@comment " PLIST_SUB+= I915="" PLIST_SUB+= VMWGFX="" PLIST_SUB+= VBOXVIDEO="" .elif ${ARCH} == "i386" PLIST_SUB+= AMDGPU="@comment " PLIST_SUB+= AMDKFD="@comment " PLIST_SUB+= I915="" PLIST_SUB+= VMWGFX="" PLIST_SUB+= VBOXVIDEO="" .elif ${ARCH} == "aarch64" || ${ARCH:Mpowerpc*} PLIST_SUB+= AMDGPU="" PLIST_SUB+= AMDKFD="@comment " PLIST_SUB+= I915="@comment " PLIST_SUB+= VBOXVIDEO="@comment " PLIST_SUB+= VMWGFX="@comment " .else PLIST_SUB+= AMDGPU="@comment " PLIST_SUB+= AMDKFD="@comment " PLIST_SUB+= I915="@comment " PLIST_SUB+= VBOXVIDEO="@comment " PLIST_SUB+= VMWGFX="@comment " .endif .include Index: branches/2021Q1/graphics/drm-fbsd11.2-kmod/Makefile =================================================================== --- branches/2021Q1/graphics/drm-fbsd11.2-kmod/Makefile (revision 562491) +++ branches/2021Q1/graphics/drm-fbsd11.2-kmod/Makefile (revision 562492) @@ -1,43 +1,44 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-fbsd11.2-kmod PORTVERSION= 4.11g20200420 CATEGORIES= graphics MAINTAINER= x11@FreeBSD.org COMMENT= DRM modules for the linuxkpi-based KMS components LICENSE= BSD2CLAUSE MIT GPLv2 LICENSE_COMB= multi ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64 RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod CONFLICTS_INSTALL= drm-devel-kmod \ drm-fbsd12.0-kmod \ + drm-fbsd13-kmod \ drm-current-kmod \ drm-legacy-kmod OPTIONS_DEFINE= DEBUG USES= kmod uidfix USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= kms-drm GH_TAGNAME= d7d433d .include -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200000 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 IGNORE= only supported on FreeBSD 11. .endif .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) .endif .include Index: branches/2021Q1/graphics/drm-fbsd12.0-kmod/Makefile =================================================================== --- branches/2021Q1/graphics/drm-fbsd12.0-kmod/Makefile (revision 562491) +++ branches/2021Q1/graphics/drm-fbsd12.0-kmod/Makefile (revision 562492) @@ -1,64 +1,65 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-fbsd12.0-kmod PORTVERSION= 4.16.g20201016 CATEGORIES= graphics MAINTAINER= x11@FreeBSD.org COMMENT= DRM modules for the linuxkpi-based KMS components LICENSE= BSD2CLAUSE MIT GPLv2 LICENSE_COMB= multi ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64 and i386 RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod CONFLICTS_INSTALL= drm-devel-kmod \ drm-fbsd11.2-kmod \ + drm-fbsd13-kmod \ drm-current-kmod \ drm-legacy-kmod OPTIONS_DEFINE= DEBUG USES= kmod uidfix compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= kms-drm GH_TAGNAME= fa1387d .include -.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSION} > 1300000) +.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSION} >= 1300000) IGNORE= only supported on FreeBSD 12. .endif .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) .endif .if ${ARCH} == "amd64" PLIST_SUB+= AMDGPU="" PLIST_SUB+= AMDKFD="" PLIST_SUB+= I915="" PLIST_SUB+= VMWGFX="" .elif ${ARCH} == "i386" PLIST_SUB+= AMDGPU="@comment " PLIST_SUB+= AMDKFD="@comment " PLIST_SUB+= I915="" PLIST_SUB+= VMWGFX="" .elif ${ARCH} == "powerpc64" PLIST_SUB+= AMDGPU="" PLIST_SUB+= AMDKFD="@comment " PLIST_SUB+= I915="@comment " PLIST_SUB+= VMWGFX="@comment " .else PLIST_SUB+= AMDGPU="@comment " PLIST_SUB+= AMDKFD="@comment " PLIST_SUB+= I915="@comment " PLIST_SUB+= VMWGFX="@comment " .endif .include Index: branches/2021Q1/graphics/drm-kmod/Makefile =================================================================== --- branches/2021Q1/graphics/drm-kmod/Makefile (revision 562491) +++ branches/2021Q1/graphics/drm-kmod/Makefile (revision 562492) @@ -1,33 +1,36 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-kmod PORTVERSION= g20190710 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= x11@FreeBSD.org COMMENT= Metaport of DRM modules for the linuxkpi-based KMS components USES= metaport .include .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) .else .if ${ARCH} == "amd64" .if ${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod .elif ${OSVERSION} >= 1200058 && ${OSVERSION} < 1300000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod .elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300108 IGNORE= not supported on older 13, no kernel support -.elif ${OSVERSION} >= 1300108 +.elif ${OSVERSION} >= 1300108 && ${OSVERSION} < 1400000 +RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd13-kmod +.elif ${OSVERSION} >= 1400000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-current-kmod .else IGNORE= not supported for this configuration .endif .endif .endif .include Index: branches/2021Q1 =================================================================== --- branches/2021Q1 (revision 562491) +++ branches/2021Q1 (revision 562492) Property changes on: branches/2021Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r562491