Index: branches/2019Q3/graphics/drm-current-kmod/Makefile =================================================================== --- branches/2019Q3/graphics/drm-current-kmod/Makefile (revision 506354) +++ branches/2019Q3/graphics/drm-current-kmod/Makefile (revision 506355) @@ -1,64 +1,64 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-current-kmod -PORTVERSION= 4.16.g20190519 +PORTVERSION= 4.16.g20190710 CATEGORIES= graphics kld -MAINTAINER= jmd@FreeBSD.org +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 powerpc64 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-fbsd12.0-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= b890994 +GH_TAGNAME= 083d2f3 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300029 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="" 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/2019Q3/graphics/drm-current-kmod/distinfo =================================================================== --- branches/2019Q3/graphics/drm-current-kmod/distinfo (revision 506354) +++ branches/2019Q3/graphics/drm-current-kmod/distinfo (revision 506355) @@ -1,3 +1,3 @@ -TIMESTAMP = 1558292907 -SHA256 (FreeBSDDesktop-kms-drm-4.16.g20190519-b890994_GH0.tar.gz) = 3292e6e795df47d077784e0e84aa7d774ad030e78da0a3913889ae5f4c8cda29 -SIZE (FreeBSDDesktop-kms-drm-4.16.g20190519-b890994_GH0.tar.gz) = 13089654 +TIMESTAMP = 1562757916 +SHA256 (FreeBSDDesktop-kms-drm-4.16.g20190710-083d2f3_GH0.tar.gz) = 5993300983cf9c532416abf9f6687b34b079c35e72312c6bf94f0aa04c5f9ecb +SIZE (FreeBSDDesktop-kms-drm-4.16.g20190710-083d2f3_GH0.tar.gz) = 13089216 Index: branches/2019Q3/graphics/drm-devel-kmod/Makefile =================================================================== --- branches/2019Q3/graphics/drm-devel-kmod/Makefile (revision 506354) +++ branches/2019Q3/graphics/drm-devel-kmod/Makefile (revision 506355) @@ -1,65 +1,65 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-devel-kmod PORTVERSION= 5.0.g20190520 PORTREVISION= 1 CATEGORIES= graphics kld -MAINTAINER= jmd@FreeBSD.org +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= amd64 i386 powerpc64 ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64, i386 and powerpc64 RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod CONFLICTS_INSTALL= drm-current-kmod \ drm-fbsd11.2-kmod \ drm-fbsd12.0-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= 4d4b2ba .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300029 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="" .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/2019Q3/graphics/drm-fbsd11.2-kmod/Makefile =================================================================== --- branches/2019Q3/graphics/drm-fbsd11.2-kmod/Makefile (revision 506354) +++ branches/2019Q3/graphics/drm-fbsd11.2-kmod/Makefile (revision 506355) @@ -1,39 +1,39 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-fbsd11.2-kmod PORTVERSION= 4.11g20190424 CATEGORIES= graphics -MAINTAINER= jmd@FreeBSD.org +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-current-kmod \ drm-legacy-kmod OPTIONS_DEFINE= DEBUG USES= kmod uidfix USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= kms-drm GH_TAGNAME= d2e0075 .include .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) .endif .include Index: branches/2019Q3/graphics/drm-fbsd12.0-kmod/Makefile =================================================================== --- branches/2019Q3/graphics/drm-fbsd12.0-kmod/Makefile (revision 506354) +++ branches/2019Q3/graphics/drm-fbsd12.0-kmod/Makefile (revision 506355) @@ -1,64 +1,64 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-fbsd12.0-kmod -PORTVERSION= 4.16.g20190624 +PORTVERSION= 4.16.g20190710 CATEGORIES= graphics -MAINTAINER= jmd@FreeBSD.org +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-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= d989a80 +GH_TAGNAME= 6365030 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200058 IGNORE= only supported on FreeBSD 12.0 and later .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/2019Q3/graphics/drm-fbsd12.0-kmod/distinfo =================================================================== --- branches/2019Q3/graphics/drm-fbsd12.0-kmod/distinfo (revision 506354) +++ branches/2019Q3/graphics/drm-fbsd12.0-kmod/distinfo (revision 506355) @@ -1,3 +1,3 @@ -TIMESTAMP = 1561411114 -SHA256 (FreeBSDDesktop-kms-drm-4.16.g20190624-d989a80_GH0.tar.gz) = ce04ad81dc0bafdcdbb2b98ba75e2f41eb46002e31720110a543b1fb92f148d3 -SIZE (FreeBSDDesktop-kms-drm-4.16.g20190624-d989a80_GH0.tar.gz) = 13090594 +TIMESTAMP = 1562758038 +SHA256 (FreeBSDDesktop-kms-drm-4.16.g20190710-6365030_GH0.tar.gz) = 8a5ba7454837a3d6ddb66e2d2273e5bdc6705b49668ade6896e643c672fc6d19 +SIZE (FreeBSDDesktop-kms-drm-4.16.g20190710-6365030_GH0.tar.gz) = 13089567 Index: branches/2019Q3/graphics/drm-kmod/Makefile =================================================================== --- branches/2019Q3/graphics/drm-kmod/Makefile (revision 506354) +++ branches/2019Q3/graphics/drm-kmod/Makefile (revision 506355) @@ -1,41 +1,43 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-kmod -PORTVERSION= g20181126 +PORTVERSION= g20190710 CATEGORIES= graphics -MAINTAINER= jmd@FreeBSD.org +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} >= 1200080 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-legacy-kmod .elif ${OSVERSION} < 1200080 IGNORE= legacy kmod not required on less than 12.0 .endif .else .if ${OSVERSION} >= 1101510 && ${OSVERSION} < 1200000 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod .elif ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200045 IGNORE= not supported on older 12, no kernel support .elif ${OSVERSION} >= 1200045 && ${OSVERSION} < 1200058 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 +.elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300029 +IGNORE= not supported on older 13, no kernel support +.elif ${OSVERSION} >= 1300029 RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-current-kmod .else IGNORE= not supported for this configuration .endif .endif .endif .include Index: branches/2019Q3/graphics/drm-legacy-kmod/Makefile =================================================================== --- branches/2019Q3/graphics/drm-legacy-kmod/Makefile (revision 506354) +++ branches/2019Q3/graphics/drm-legacy-kmod/Makefile (revision 506355) @@ -1,47 +1,47 @@ # Created by: Johannes Dieterich # $FreeBSD$ PORTNAME= drm-legacy-kmod PORTVERSION= g20190709 CATEGORIES= graphics -MAINTAINER= jmd@FreeBSD.org +MAINTAINER= x11@FreeBSD.org COMMENT= Legacy DRM modules for the linuxkpi-based KMS components LICENSE= BSD2CLAUSE MIT GPLv2 LICENSE_COMB= multi BROKEN_aarch64= src/dev/drm2/ttm/ttm_bo_util.c:453:2: error: Port me RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod USES= kmod uidfix OPTIONS_DEFINE= DEBUG CONFLICTS_INSTALL= drm-devel-kmod \ drm-fbsd11.2-kmod \ drm-fbsd12.0-kmod \ drm-current-kmod USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= drm-legacy GH_TAGNAME= 990f64b .include .if ${ARCH} == amd64 || ${ARCH} == i386 PLIST_SUB+= X86="" .else PLIST_SUB+= X86="@comment " .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200080 IGNORE= only for 12.0 or higher after removal of base components .endif .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD .endif .include Index: branches/2019Q3 =================================================================== --- branches/2019Q3 (revision 506354) +++ branches/2019Q3 (revision 506355) Property changes on: branches/2019Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r506311,506335,506353-506354