From nobody Mon Dec 05 19:28:23 2022 X-Original-To: dev-commits-ports-main@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 4NQtr73LS6z4jHQC; Mon, 5 Dec 2022 19:28:23 +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 4NQtr72Njrz3Jt6; Mon, 5 Dec 2022 19:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670268503; 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=Oni1KHax+SjSCirIcN7bo/onGTdHjICvrtOqwnPYyXI=; b=qakN/nOIfBtYh/Di9PmrAZ3uFwIM3Y24tI1mTT27Mzpcg+oqpn8ClSL5QLe5DJhz7smpOm 6zGfU2pcbsj9EZ7O/zst8qGwFFaWVphUCRo0BdhAfK9IsULVzCuoDLLUrSocdyi0kMaRe6 Vsngwicy/heCsFy0HaRX5pOA1BYs0Pngxv8rKCimDk7fwFKGWg/DAxZEXkp8ocIyppzAE9 TsOVGoa+UOPpuV5TQeVLqXa6ST6NuuWxsqxq1TQ9kl0ycJBdUQARBzKhCSWRGdo+2B5NOC f6t6ryCD/sPNcgGMJ7NE4uk6aKCpqvm0igy5SBJRo2E4wNr1pFY8ppi7WSC1Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670268503; 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=Oni1KHax+SjSCirIcN7bo/onGTdHjICvrtOqwnPYyXI=; b=MLp/Ajeiuslt6U1gk/QPQyHxV8vxFoCh4D1FjWGLj1mOMuAiKkiHOkaQthV29171LzaMXs Dxv42Ni5FxrF3cLvmoAwqfluPm4fGQAEBok4xQs4004yvPZrmTD9efFI2xxbyvLIqqRiDG XeRqJ+mM6AByifdkkK3H4LEnwt6Q3ZzrOaq3WtgJfbG4omtVvZWuvW277cLOqx0zHXgE26 7/6XCcJyDav/2XbNgFR6Np44p3eptPNWq+7J8gvjrtSArcqLNef3aBqMyji0RvWjit6PqS ydB2qIaP1RWTtgsOu/4+tVfS1S4RyUhg5vyVREja65ESBfuVBpemgQgYwjtRpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670268503; a=rsa-sha256; cv=none; b=ETKaxGTWIvh7JI78+3BzHqrZpYo2OHR+EcODWDsdvWHu53FdnJURCNQbh45hsBGOf41/h5 eadmK/D6sAX4VpwhO858dV+hORl3HImOtsojwemuHq0t5jJ4Cb5TLC2AzpsIxJq42I8ca5 tHROYW2w7ONys1cseeVY0ix/A5HuFdQT/b+cIitKXunIsmq7dlOXUeRJsMi2caVVIFY5OX r6TMDVq32hwxcknNVMBRb53BYCDBAbzZqv+Bs32kzmTei7C6XvIscQG45dsLolmieITzVl RwimR9AV9Jb/bf+ziT+7yAPUNKXCEWssTv7XD+ayhaA9AFjMwn1x9WK+ACfr/w== 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 4NQtr713c4z182N; Mon, 5 Dec 2022 19:28:23 +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 2B5JSN98083596; Mon, 5 Dec 2022 19:28:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B5JSND1083595; Mon, 5 Dec 2022 19:28:23 GMT (envelope-from git) Date: Mon, 5 Dec 2022 19:28:23 GMT Message-Id: <202212051928.2B5JSND1083595@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: 2c3b2260f8e7 - main - graphics/gpu-firmware-kmod: revert "optionize firmware vendors" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 2c3b2260f8e771bf9515174be237b564061004d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c3b2260f8e771bf9515174be237b564061004d2 commit 2c3b2260f8e771bf9515174be237b564061004d2 Author: Dmitry Marakasov AuthorDate: 2022-12-05 18:19:49 +0000 Commit: Dmitry Marakasov 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 + +.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 - .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