graphics/drm-current-kmod: Update to latest source after linuxkpi update in base

While here remove vboxvideo and vmwgfx as they having been not working for a long time now.

3 files changed, 6 insertions, 24 deletions

diff --git a/graphics/drm-current-kmod/Makefile b/graphics/drm-current-kmod/Makefile
index c04d6fdffad3..53604ed47271 100644
--- a/graphics/drm-current-kmod/Makefile
+++ b/graphics/drm-current-kmod/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	drm-current-kmod
-PORTVERSION=	5.4.62.g20201109
-PORTREVISION=	1
+PORTVERSION=	5.4.62.g20210112
 CATEGORIES=	graphics kld
 
 MAINTAINER=	x11@FreeBSD.org
@@ -35,11 +34,11 @@ USES=		kmod uidfix compiler:c++11-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod
-GH_TAGNAME=	drm_v5.4.62_4
+GH_TAGNAME=	drm_v5.4.62_6
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300108
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300128
 IGNORE=		not supported on older CURRENT, no kernel support
 .endif
 .if ${OPSYS} != FreeBSD
@@ -49,23 +48,15 @@ IGNORE=		not supported on anything but FreeBSD (missing linuxkpi functionality)
 .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}
diff --git a/graphics/drm-current-kmod/distinfo b/graphics/drm-current-kmod/distinfo
index c0759c7adeaf..7dbdb96e2ee2 100644
--- a/graphics/drm-current-kmod/distinfo
+++ b/graphics/drm-current-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604928502
-SHA256 (freebsd-drm-kmod-5.4.62.g20201109-drm_v5.4.62_4_GH0.tar.gz) = 17b0ba158e8fd39e11f1b50bb2ca51a5ff2debe416f12ecc5cc035e6317dffb1
-SIZE (freebsd-drm-kmod-5.4.62.g20201109-drm_v5.4.62_4_GH0.tar.gz) = 18833838
+TIMESTAMP = 1610454131
+SHA256 (freebsd-drm-kmod-5.4.62.g20210112-drm_v5.4.62_6_GH0.tar.gz) = 8ff7e23ee4e51cba17c5d6003728dd893f78586b1ad89886d8039130b87ae08f
+SIZE (freebsd-drm-kmod-5.4.62.g20210112-drm_v5.4.62_6_GH0.tar.gz) = 18829883
diff --git a/graphics/drm-current-kmod/pkg-plist b/graphics/drm-current-kmod/pkg-plist
index ae4946707435..e1392ac2a625 100644
--- a/graphics/drm-current-kmod/pkg-plist
+++ b/graphics/drm-current-kmod/pkg-plist
@@ -4,8 +4,6 @@
 /%%KMODDIR%%/linuxkpi_gplv2.ko
 /%%KMODDIR%%/radeonkms.ko
 /%%KMODDIR%%/ttm.ko
-%%VBOXVIDEO%%/%%KMODDIR%%/vboxvideo.ko
-%%VMWGFX%%/%%KMODDIR%%/vmwgfx.ko
 %%SOURCE%%%%KMODSRC%%/Makefile
 %%SOURCE%%%%KMODSRC%%/kconfig.mk
 %%SOURCE%%%%KMODSRC%%/amd/Makefile
@@ -2229,9 +2227,6 @@
 %%SOURCE%%%%KMODSRC%%/linuxkpi/dummy/include/linux/zlib.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/dummy/include/media/cec-notifier.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/dummy/include/video/of_videomode.h
-%%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/acpi/acpi.h
-%%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/acpi/acpi_bus.h
-%%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/acpi/video.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/asm/barrier.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/asm/cpufeature.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/asm/cpufeatures.h
@@ -2242,13 +2237,11 @@
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/asm/processor.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/asm/required-features.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/asm/set_memory.h
-%%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/acpi.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/agp_backend.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/anon_inodefs.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/anon_inodes.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/ascii85.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/atomic.h
-%%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/bitfield.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/capability.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/circ_buf.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/compiler.h
@@ -2263,7 +2256,6 @@
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/fb.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/firmware.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/fwnode.h
-%%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/gcd.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/genalloc.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/gpio/consumer.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/hash.h
@@ -2337,7 +2329,6 @@
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/video/mipi_display.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/video/vga.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/video/videomode.h
-%%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/src/linux_acpi.c
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/src/linux_anon_inodefs.c
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/src/linux_anon_inodes.c
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/src/linux_compat.c