Date: Mon, 5 Dec 2022 19:28:23 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2c3b2260f8e7 - main - graphics/gpu-firmware-kmod: revert "optionize firmware vendors" Message-ID: <202212051928.2B5JSND1083595@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c3b2260f8e771bf9515174be237b564061004d2 commit 2c3b2260f8e771bf9515174be237b564061004d2 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2022-12-05 18:19:49 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2022-12-05 19:28:13 +0000 graphics/gpu-firmware-kmod: revert "optionize firmware vendors" This reverts commit 3f78a234e45851fc57d23bd86b6362671244ecc6. This change was made on assumption that gpu-firmware-kmod is mandatory for drm users, while in fact drm-kmod which requires gpu-firmware-kmod is itself an optional metaport. Since the sole purpose of these metaports is to just install everything, there's no purpose in having options in them. Requested by: manu --- graphics/gpu-firmware-kmod/Makefile | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/graphics/gpu-firmware-kmod/Makefile b/graphics/gpu-firmware-kmod/Makefile index 83ff04f80557..0ad0a428a702 100644 --- a/graphics/gpu-firmware-kmod/Makefile +++ b/graphics/gpu-firmware-kmod/Makefile @@ -1,6 +1,5 @@ PORTNAME= gpu-firmware-kmod PORTVERSION= 20220511 -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics @@ -10,20 +9,7 @@ WWW= https://github.com/freebsd/drm-kmod USES= metaport -OPTIONS_DEFINE= RADEON AMD -OPTIONS_DEFAULT=RADEON AMD -OPTIONS_DEFINE_i386= INTEL -OPTIONS_DEFAULT_i386= INTEL -OPTIONS_DEFINE_amd64= INTEL -OPTIONS_DEFAULT_amd64= INTEL -OPTIONS_EXCLUDE_powerpc64= AMD - -RADEON_DESC= Firmware modules for Radeon GPUs -AMD_DESC= Firmware modules for AMD GPUs -INTEL_DESC= Firmware modules for Intel GPUs - -RADEON_RUN_DEPENDS= \ - gpu-firmware-radeon-kmod-aruba>0:graphics/gpu-firmware-radeon-kmod@aruba \ +RUN_DEPENDS= gpu-firmware-radeon-kmod-aruba>0:graphics/gpu-firmware-radeon-kmod@aruba \ gpu-firmware-radeon-kmod-barts>0:graphics/gpu-firmware-radeon-kmod@barts \ gpu-firmware-radeon-kmod-bonaire>0:graphics/gpu-firmware-radeon-kmod@bonaire \ gpu-firmware-radeon-kmod-btc>0:graphics/gpu-firmware-radeon-kmod@btc \ @@ -66,8 +52,10 @@ RADEON_RUN_DEPENDS= \ gpu-firmware-radeon-kmod-turks>0:graphics/gpu-firmware-radeon-kmod@turks \ gpu-firmware-radeon-kmod-verde>0:graphics/gpu-firmware-radeon-kmod@verde -INTEL_RUN_DEPENDS= \ - gpu-firmware-intel-kmod-skylake>0:graphics/gpu-firmware-intel-kmod@skylake \ +.include <bsd.port.pre.mk> + +.if ${ARCH} == amd64 || ${ARCH} == i386 +RUN_DEPENDS+= gpu-firmware-intel-kmod-skylake>0:graphics/gpu-firmware-intel-kmod@skylake \ gpu-firmware-intel-kmod-broxton>0:graphics/gpu-firmware-intel-kmod@broxton \ gpu-firmware-intel-kmod-kabylake>0:graphics/gpu-firmware-intel-kmod@kabylake \ gpu-firmware-intel-kmod-geminilake>0:graphics/gpu-firmware-intel-kmod@geminilake \ @@ -76,9 +64,10 @@ INTEL_RUN_DEPENDS= \ gpu-firmware-intel-kmod-elkhartlake>0:graphics/gpu-firmware-intel-kmod@elkhartlake \ gpu-firmware-intel-kmod-tigerlake>0:graphics/gpu-firmware-intel-kmod@tigerlake \ gpu-firmware-intel-kmod-rocketlake>0:graphics/gpu-firmware-intel-kmod@rocketlake +.endif -AMD_RUN_DEPENDS= \ - gpu-firmware-amd-kmod-banks>0:graphics/gpu-firmware-amd-kmod@banks \ +.if ${ARCH} != powerpc64 +RUN_DEPENDS+= gpu-firmware-amd-kmod-banks>0:graphics/gpu-firmware-amd-kmod@banks \ gpu-firmware-amd-kmod-bonaire>0:graphics/gpu-firmware-amd-kmod@bonaire \ gpu-firmware-amd-kmod-carrizo>0:graphics/gpu-firmware-amd-kmod@carrizo \ gpu-firmware-amd-kmod-fiji>0:graphics/gpu-firmware-amd-kmod@fiji \ @@ -109,13 +98,10 @@ AMD_RUN_DEPENDS= \ gpu-firmware-amd-kmod-vega20>0:graphics/gpu-firmware-amd-kmod@vega20 \ gpu-firmware-amd-kmod-vegam>0:graphics/gpu-firmware-amd-kmod@vegam \ gpu-firmware-amd-kmod-verde>0:graphics/gpu-firmware-amd-kmod@verde - -.include <bsd.port.pre.mk> - .if ${OSVERSION} >= 1301000 -AMD_RUN_DEPENDS+= \ - gpu-firmware-amd-kmod-green-sardine>0:graphics/gpu-firmware-amd-kmod@green_sardine \ +RUN_DEPENDS+= gpu-firmware-amd-kmod-green-sardine>0:graphics/gpu-firmware-amd-kmod@green_sardine \ gpu-firmware-amd-kmod-sienna-cichlid>0:graphics/gpu-firmware-amd-kmod@sienna_cichlid .endif +.endif .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212051928.2B5JSND1083595>