svn commit: r563190 - in branches/2021Q1/graphics: drm-current-kmod drm-devel-kmod

Emmanuel Vadot manu at FreeBSD.org
Fri Jan 29 10:28:58 UTC 2021 

Author: manu
Date: Fri Jan 29 10:28:56 2021
New Revision: 563190
URL: https://svnweb.freebsd.org/changeset/ports/563190

Log:
  MFH: r561321 r561457 r561813 r561978 r563147 r563158 r563159 r563167
  
  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.
  
  graphics/drm-{current,devel}-kmod: Update to latest source
  
  This fix a compilation problem with a pre 1300135 source tree.
  
  Reported by:	Filippo Moretti <filippomore at yahoo.com>
  
  drm-{current,devel}-kmod: Update to latest sources
  
  Include needed change for new irq_work code from base.
  
  graphics/drm-{current,devel}-kmod: Update to latest source
  
  Fix radeon for __FreeBSD_version >= 1300135
  
  Reported by:	tilj
  
  drm-{current,devel}-kmod: Update to v5.4.92
  
  While here only allow building on FreeBSD 14 and remove
  some extra CONFLICTS_INSTALL that cannot happens.
  
  graphics/drm-{current,devel}-kmod: Update plist
  
  Those files have been removed from the tree.
  
  While here bump the port version to the right one
  
  Reported by:	glebius
  
  drm-current-kmod: Re-add OSVERSION check
  
  Pointy hat to: manu
  
  drm-{current,devel}-kmod: Update distinfo
  
  Reported by:	glebius

Modified:
  branches/2021Q1/graphics/drm-current-kmod/Makefile
  branches/2021Q1/graphics/drm-current-kmod/distinfo
  branches/2021Q1/graphics/drm-current-kmod/pkg-plist
  branches/2021Q1/graphics/drm-devel-kmod/Makefile
  branches/2021Q1/graphics/drm-devel-kmod/distinfo
Directory Properties:
  branches/2021Q1/   (props changed)

Modified: branches/2021Q1/graphics/drm-current-kmod/Makefile
==============================================================================
--- branches/2021Q1/graphics/drm-current-kmod/Makefile	Fri Jan 29 10:14:59 2021	(r563189)
+++ branches/2021Q1/graphics/drm-current-kmod/Makefile	Fri Jan 29 10:28:56 2021	(r563190)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	drm-current-kmod
-PORTVERSION=	5.4.62.g20201109
-PORTREVISION=	1
+PORTVERSION=	5.4.92.g20210128
 CATEGORIES=	graphics kld
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -17,11 +16,7 @@ ONLY_FOR_ARCHS_REASON=	the new KMS components are only
 
 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
+CONFLICTS_INSTALL=	drm-devel-kmod
 
 OPTIONS_DEFINE=	DEBUG SOURCE
 
@@ -36,11 +31,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.92_1
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300108
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400000
 IGNORE=		not supported on older CURRENT, no kernel support
 .endif
 .if ${OPSYS} != FreeBSD
@@ -50,23 +45,15 @@ IGNORE=		not supported on anything but FreeBSD (missin
 .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}

Modified: branches/2021Q1/graphics/drm-current-kmod/distinfo
==============================================================================
--- branches/2021Q1/graphics/drm-current-kmod/distinfo	Fri Jan 29 10:14:59 2021	(r563189)
+++ branches/2021Q1/graphics/drm-current-kmod/distinfo	Fri Jan 29 10:28:56 2021	(r563190)
@@ -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 = 1611876331
+SHA256 (freebsd-drm-kmod-5.4.92.g20210128-drm_v5.4.92_1_GH0.tar.gz) = 4c16ee4e94d3676c763ffeec0f5ebcb63c881a34e7aa693859b42b6411bbfa54
+SIZE (freebsd-drm-kmod-5.4.92.g20210128-drm_v5.4.92_1_GH0.tar.gz) = 18825277

Modified: branches/2021Q1/graphics/drm-current-kmod/pkg-plist
==============================================================================
--- branches/2021Q1/graphics/drm-current-kmod/pkg-plist	Fri Jan 29 10:14:59 2021	(r563189)
+++ branches/2021Q1/graphics/drm-current-kmod/pkg-plist	Fri Jan 29 10:28:56 2021	(r563190)
@@ -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,26 +2227,20 @@
 %%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
-%%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/asm/fpu/api.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/asm/iosf_mbi.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/asm/mtrr.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/asm/pgtable.h
 %%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 +2255,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
@@ -2284,7 +2275,6 @@
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/kconfig.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/kernel.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/kobject.h
-%%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/llist.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/mm.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/mmu_context.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/mmu_notifier.h
@@ -2314,7 +2304,6 @@
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/sched.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/sched/mm.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/seqlock.h
-%%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/shrinker.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/sort.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/stackdepot.h
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/include/linux/stop_machine.h
@@ -2337,7 +2326,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
@@ -2348,7 +2336,6 @@
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/src/linux_interval_tree.c
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/src/linux_irq.c
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/src/linux_kmod_gplv2.c
-%%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/src/linux_llist.c
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/src/linux_mtrr.c
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/src/linux_notifier.c
 %%SOURCE%%%%KMODSRC%%/linuxkpi/gplv2/src/linux_page.c

Modified: branches/2021Q1/graphics/drm-devel-kmod/Makefile
==============================================================================
--- branches/2021Q1/graphics/drm-devel-kmod/Makefile	Fri Jan 29 10:14:59 2021	(r563189)
+++ branches/2021Q1/graphics/drm-devel-kmod/Makefile	Fri Jan 29 10:28:56 2021	(r563190)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	drm-devel-kmod
-PORTVERSION=	5.4.62.g20201109
+PORTVERSION=	5.4.92.g20210128
 CATEGORIES=	graphics kld
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -16,11 +16,7 @@ ONLY_FOR_ARCHS_REASON=	the new KMS components are only
 
 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
+CONFLICTS_INSTALL=	drm-current-kmod
 
 OPTIONS_DEFINE=	DEBUG
 
@@ -29,11 +25,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.92_1
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300118
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400000
 IGNORE=		not supported on older CURRENT, no kernel support
 .endif
 .if ${OPSYS} != FreeBSD

Modified: branches/2021Q1/graphics/drm-devel-kmod/distinfo
==============================================================================
--- branches/2021Q1/graphics/drm-devel-kmod/distinfo	Fri Jan 29 10:14:59 2021	(r563189)
+++ branches/2021Q1/graphics/drm-devel-kmod/distinfo	Fri Jan 29 10:28:56 2021	(r563190)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604928365
-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 = 1611876357
+SHA256 (freebsd-drm-kmod-5.4.92.g20210128-drm_v5.4.92_1_GH0.tar.gz) = 4c16ee4e94d3676c763ffeec0f5ebcb63c881a34e7aa693859b42b6411bbfa54
+SIZE (freebsd-drm-kmod-5.4.92.g20210128-drm_v5.4.92_1_GH0.tar.gz) = 18825277

More information about the svn-ports-branches mailing list