From nobody Tue Nov 29 17:18:28 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NM8F05Lqtz4jKL5; Tue, 29 Nov 2022 17:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NM8F04pLsz4Y6P; Tue, 29 Nov 2022 17:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669742308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CAH9jw6mi6U2XUS9f41mD/i5GSrcWcRh+901sQBrHM4=; b=g5Ke/YUlvTsJ6r3KdGsHyA/bHXabIp2zStvjt0xcUErhXpbZH9UuDqcpt73GmJKLcmBrRt 4ltkdnXU4OanR7CVr+jpv8Osz7pZ5q1HeuE+Vn3VO4V2R+/MArT8rARbiYROAaZk2B9qyK /KaTd6ru3TOr36CVShYGpotf94wWEyNZ4J1GlNWh9FLSLj4GHOpXGqczUjTtMVqI5FwOVC vRJSblz0DZCtTehGPl/8BvB5Rdv4MCMpYLX8x9B/w6ayM7Qdeg+uElOqgu5X6CWVE2jFFX YHVP7FLXmnXcA6DvfH6YGUf9qHMpBwjV7zsb/4dy8PV4MR6dj5IsanKH0HrHWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669742308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CAH9jw6mi6U2XUS9f41mD/i5GSrcWcRh+901sQBrHM4=; b=JZ3FnYu1bjHpfZ6jU7NtbvDkL272ITrqc8YnxmKvNKFt51ji2jz59FJrjKYewY6j0xc9Sx V5tdxOIb6SckG6dtAr93mB6WVsRbznn/XePjoIyIRMMR/gWBr1l/vELV3C0703aXTvlTYy y9l2gvJIsUrwo55GcVrW2nsAhUoRrOrd/iM+2lyHM0lR9n78f1aI17bI+9t0n7h9kTArGR uxsh0lDUDmywsc22ZcztKGQrl2queYN7TNpUWVOIw50NZrN7kNxcT1dhYgtOFfZiIIZRmx C25y7R1MNN2N4LX8M6qXIdGRft1M/c4wpUfgprVCcQtHPimfY2T4YTtznXeoNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669742308; a=rsa-sha256; cv=none; b=HgnoIg5CO10Z8bpq7X0Uxsn5WoDHmfafGvPhNmt+LNT9CaJ1Og/a6P7hoKWxQ7hCU5Nug+ FWCfWjtB2EurhGju7KUSejvVNF3P0pUcsLF+pSJlkMAvIpwWYi9o28HXM+rMgg93OZKJVJ aBhjX2DOJQ4o4laxz0+t2nEqoP0hdEdjiUA4LbjSt6aSt5tnFg7Fqh6MGxH2TQp5NqnxC+ Vq+LpUSNV7Snm8TJeaGXcbbg9hOyVashFBitdJzuR8d65nyEeeSwPw81HAj1oTqRDdu7hK 9oaVuDpYyR9oWmALl50ZSMS6DDClXoeZuPXdOp/A37yV8vGEHsDeF6kRZNXHnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NM8F03g3FzQKX; Tue, 29 Nov 2022 17:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2ATHISFi015064; Tue, 29 Nov 2022 17:18:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ATHISXL015063; Tue, 29 Nov 2022 17:18:28 GMT (envelope-from git) Date: Tue, 29 Nov 2022 17:18:28 GMT Message-Id: <202211291718.2ATHISXL015063@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 3f78a234e458 - main - graphics/gpu-firmware-kmod: optionize firmware vendors List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f78a234e45851fc57d23bd86b6362671244ecc6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f78a234e45851fc57d23bd86b6362671244ecc6 commit 3f78a234e45851fc57d23bd86b6362671244ecc6 Author: Dmitry Marakasov AuthorDate: 2022-11-15 20:18:39 +0000 Commit: Dmitry Marakasov CommitDate: 2022-11-29 17:18:21 +0000 graphics/gpu-firmware-kmod: optionize firmware vendors PR: 267796 Approved by: maintainer timeout (x11, 2 weeks) --- graphics/gpu-firmware-kmod/Makefile | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/graphics/gpu-firmware-kmod/Makefile b/graphics/gpu-firmware-kmod/Makefile index 0ad0a428a702..83ff04f80557 100644 --- a/graphics/gpu-firmware-kmod/Makefile +++ b/graphics/gpu-firmware-kmod/Makefile @@ -1,5 +1,6 @@ PORTNAME= gpu-firmware-kmod PORTVERSION= 20220511 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics @@ -9,7 +10,20 @@ WWW= https://github.com/freebsd/drm-kmod USES= metaport -RUN_DEPENDS= gpu-firmware-radeon-kmod-aruba>0:graphics/gpu-firmware-radeon-kmod@aruba \ +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 \ 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 \ @@ -52,10 +66,8 @@ RUN_DEPENDS= gpu-firmware-radeon-kmod-aruba>0:graphics/gpu-firmware-radeon-kmod@ gpu-firmware-radeon-kmod-turks>0:graphics/gpu-firmware-radeon-kmod@turks \ gpu-firmware-radeon-kmod-verde>0:graphics/gpu-firmware-radeon-kmod@verde -.include - -.if ${ARCH} == amd64 || ${ARCH} == i386 -RUN_DEPENDS+= gpu-firmware-intel-kmod-skylake>0:graphics/gpu-firmware-intel-kmod@skylake \ +INTEL_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 \ @@ -64,10 +76,9 @@ RUN_DEPENDS+= gpu-firmware-intel-kmod-skylake>0:graphics/gpu-firmware-intel-kmod 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 -.if ${ARCH} != powerpc64 -RUN_DEPENDS+= gpu-firmware-amd-kmod-banks>0:graphics/gpu-firmware-amd-kmod@banks \ +AMD_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 \ @@ -98,10 +109,13 @@ RUN_DEPENDS+= gpu-firmware-amd-kmod-banks>0:graphics/gpu-firmware-amd-kmod@banks 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 + .if ${OSVERSION} >= 1301000 -RUN_DEPENDS+= gpu-firmware-amd-kmod-green-sardine>0:graphics/gpu-firmware-amd-kmod@green_sardine \ +AMD_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