svn commit: r562491 - in head/graphics: drm-current-kmod drm-devel-kmod drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-kmod

[Mathieu Arnold]

On Sun, Jan 24, 2021 at 05:16:16PM +0000, Rene Ladan wrote:
> Author: rene
> Date: Sun Jan 24 17:16:15 2021
> New Revision: 562491
> URL: https://svnweb.freebsd.org/changeset/ports/562491
> 
> Log:
>   Hook drm-fbsd13-kmod to the maser drm-kmod port and bump its PORTREVISION.
>   
>   Add new drm-fbsd13-kmod to the conflict lists of the other ports.
>   Be pedantic about version boundaries.

I don't think CONFLICTS_INSTALL is correct.  Only one of the 11.2, 12.0
and 13 can be installed at the same time, because they need 11.x, 12.x
or 13.x.

>   Approved by:	manu (on ports-committers)
>   MFH:		2021Q1
> 
> Modified:
>   head/graphics/drm-current-kmod/Makefile
>   head/graphics/drm-devel-kmod/Makefile
>   head/graphics/drm-fbsd11.2-kmod/Makefile
>   head/graphics/drm-fbsd12.0-kmod/Makefile
>   head/graphics/drm-kmod/Makefile
> 
> Modified: head/graphics/drm-current-kmod/Makefile
> ==============================================================================
> --- head/graphics/drm-current-kmod/Makefile	Sun Jan 24 16:48:25 2021	(r562490)
> +++ head/graphics/drm-current-kmod/Makefile	Sun Jan 24 17:16:15 2021	(r562491)
> @@ -19,6 +19,7 @@ RUN_DEPENDS=	gpu-firmware-kmod>=g20200914:graphics/gpu
>  CONFLICTS_INSTALL=	drm-devel-kmod \
>  			drm-fbsd11.2-kmod \
>  			drm-fbsd12.0-kmod \
> +			drm-fbsd13-kmod \
>  			drm-legacy-kmod
>  
>  OPTIONS_DEFINE=	DEBUG SOURCE
> 
> Modified: head/graphics/drm-devel-kmod/Makefile
> ==============================================================================
> --- head/graphics/drm-devel-kmod/Makefile	Sun Jan 24 16:48:25 2021	(r562490)
> +++ head/graphics/drm-devel-kmod/Makefile	Sun Jan 24 17:16:15 2021	(r562491)
> @@ -19,6 +19,7 @@ RUN_DEPENDS=	gpu-firmware-kmod>=g20200914:graphics/gpu
>  CONFLICTS_INSTALL=	drm-current-kmod \
>  			drm-fbsd11.2-kmod \
>  			drm-fbsd12.0-kmod \
> +			drm-fbsd13-kmod \
>  			drm-legacy-kmod
>  
>  OPTIONS_DEFINE=	DEBUG
> 
> Modified: head/graphics/drm-fbsd11.2-kmod/Makefile
> ==============================================================================
> --- head/graphics/drm-fbsd11.2-kmod/Makefile	Sun Jan 24 16:48:25 2021	(r562490)
> +++ head/graphics/drm-fbsd11.2-kmod/Makefile	Sun Jan 24 17:16:15 2021	(r562491)
> @@ -18,6 +18,7 @@ RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu
>  
>  CONFLICTS_INSTALL=	drm-devel-kmod \
>  			drm-fbsd12.0-kmod \
> +			drm-fbsd13-kmod \
>  			drm-current-kmod \
>  			drm-legacy-kmod
>  
> @@ -32,7 +33,7 @@ GH_TAGNAME=	d7d433d
>  
>  .include <bsd.port.options.mk>
>  
> -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200000
> +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000
>  IGNORE=		only supported on FreeBSD 11.
>  .endif
>  
> 
> Modified: head/graphics/drm-fbsd12.0-kmod/Makefile
> ==============================================================================
> --- head/graphics/drm-fbsd12.0-kmod/Makefile	Sun Jan 24 16:48:25 2021	(r562490)
> +++ head/graphics/drm-fbsd12.0-kmod/Makefile	Sun Jan 24 17:16:15 2021	(r562491)
> @@ -18,6 +18,7 @@ RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu
>  
>  CONFLICTS_INSTALL=	drm-devel-kmod \
>  			drm-fbsd11.2-kmod \
> +			drm-fbsd13-kmod \
>  			drm-current-kmod \
>  			drm-legacy-kmod
>  
> @@ -32,7 +33,7 @@ GH_TAGNAME=	fa1387d
>  
>  .include <bsd.port.options.mk>
>  
> -.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSION} > 1300000)
> +.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSION} >= 1300000)
>  IGNORE=		only supported on FreeBSD 12.
>  .endif
>  .if ${OPSYS} != FreeBSD
> 
> Modified: head/graphics/drm-kmod/Makefile
> ==============================================================================
> --- head/graphics/drm-kmod/Makefile	Sun Jan 24 16:48:25 2021	(r562490)
> +++ head/graphics/drm-kmod/Makefile	Sun Jan 24 17:16:15 2021	(r562491)
> @@ -3,6 +3,7 @@
>  
>  PORTNAME=	drm-kmod
>  PORTVERSION=	g20190710
> +PORTREVISION=	1
>  CATEGORIES=	graphics
>  
>  MAINTAINER=	x11 at FreeBSD.org
> @@ -22,7 +23,9 @@ RUN_DEPENDS=	${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-k
>  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
> 

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20210125/e9b0dc7e/attachment-0001.sig>