Date: Wed, 7 Sep 2022 12:37:28 GMT From: Felix Palmen <zirias@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 1226fa26de03 - 2022Q3 - graphics/drm-kmod: Fix dependency on firmwares Message-ID: <202209071237.287CbSc2031288@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q3 has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=1226fa26de03aebcbe2ade8c516cedf14ce3abbb commit 1226fa26de03aebcbe2ade8c516cedf14ce3abbb Author: Felix Palmen <zirias@FreeBSD.org> AuthorDate: 2022-09-07 11:25:27 +0000 Commit: Felix Palmen <zirias@FreeBSD.org> CommitDate: 2022-09-07 12:36:58 +0000 graphics/drm-kmod: Fix dependency on firmwares Don't overwrite RUN_DEPENDS, add to it. Also allow all architectures supported by the concrete drm port, and IGNORE otherwise instead of only depending on firmwares. While here, indent .if/.elif/.endif correctly. Approved by: x11 (manu), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D36479 (cherry picked from commit 307502b652770970002161d98461d023ecae6df9) --- graphics/drm-kmod/Makefile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/graphics/drm-kmod/Makefile b/graphics/drm-kmod/Makefile index 69d6f671f001..83fd3e9fb504 100644 --- a/graphics/drm-kmod/Makefile +++ b/graphics/drm-kmod/Makefile @@ -2,6 +2,7 @@ PORTNAME= drm-kmod PORTVERSION= 20220907 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= x11@FreeBSD.org @@ -16,15 +17,18 @@ RUN_DEPENDS= gpu-firmware-kmod>=20220511:graphics/gpu-firmware-kmod .if ${OPSYS} != FreeBSD IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) .else -.if ${ARCH} == "amd64" -.if ${OSVERSION} < 1300000 -RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod -.elif ${OSVERSION} >= 1301000 -RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-510-kmod -.else +. if ${OSVERSION} < 1300000 +RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod +_DRM_ARCHS= amd64 i386 +. elif ${OSVERSION} >= 1301000 +RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-510-kmod +_DRM_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le +. else +_DRM_ARCHS= +. endif +. if ! ${_DRM_ARCHS:M${ARCH}} IGNORE= not supported for this configuration -.endif -.endif +. endif .endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209071237.287CbSc2031288>