From nobody Wed Sep 07 12:37:28 2022 X-Original-To: dev-commits-ports-branches@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 4MN1x4399Yz4cM8Y; Wed, 7 Sep 2022 12:37: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 4MN1x42Vslz3HZY; Wed, 7 Sep 2022 12:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662554248; 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=YQEQ2qnNGVVxct1cfdSI1yJ6ZzYV+s+lPdlFgPDI6bU=; b=TKLlJ5FPnadjrDO/tceeJMNQ1KD0DlXxkVSLJmk71Ft8Bu1796d7NlrV450ygV3Mq5qRdm fbJxRsL5F9C92/apUe9Ehmzx2f2RXvVmyFqrlEE9ZGTXPhhYkt7K5rzbXQOxWsUoLV7V2K X5jsJ+1At1bw1Kth2shjUHfSlMt/yzaj+IMpkfBq/x61cn5SGuHuBGyESeRH0hkdhy3OWO ZLUVmKlfBck1UVRYTw/G6wX/kU8I/26LRz5QyUQ44RAQh30wxrqzjy9NpjFwumWcjcKLK/ IiJDzv++/VsKtyot8PEuKRLhlANH3bbrEoa3g29d3s9S/54phcsRgBFhUjODzg== 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 4MN1x41cJVzXJF; Wed, 7 Sep 2022 12:37: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 287CbSQM031289; Wed, 7 Sep 2022 12:37:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287CbSc2031288; Wed, 7 Sep 2022 12:37:28 GMT (envelope-from git) Date: Wed, 7 Sep 2022 12:37:28 GMT Message-Id: <202209071237.287CbSc2031288@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Felix Palmen Subject: git: 1226fa26de03 - 2022Q3 - graphics/drm-kmod: Fix dependency on firmwares List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 1226fa26de03aebcbe2ade8c516cedf14ce3abbb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662554248; 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=YQEQ2qnNGVVxct1cfdSI1yJ6ZzYV+s+lPdlFgPDI6bU=; b=rUHaPIyQBHIV+Zpa27mj2NAm4csVTkqShURMZd4s6bQSuClDxKVtTnegRPujDvwO4STQgS 0oe1XG8Kqxw79d3ymIJ99VD+9eJxJrZlv8qlxNz8W4zAeNvQJ6/ImyqEmvngSVzAWhj/AP X3sF6HdcbDLSJ0XVrngOMKgMbsI9qhj5kFUO9sM0dxsCwNG703EIHZv62q8+w/d+aQfsYG AhpZDBuGmqJO6Fc2dnewQvUIn2pdI4FKrSnrH3O0vjZU/U+sRnFO/U5+ANZSy1dgcD2mse qMB7M692GiEBPg/RzcEQ9T3ni+yPdTKP2F8YSu/DnGyo19F0tPM2BOGHiyyXDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662554248; a=rsa-sha256; cv=none; b=FYfN5bKVRye8kOGPYgumomGDG4p2bhIUhlOmuqe7kenT9n/G74YRybDEBoriOA8yKOIG7p pD87DLCYdvg1WC0VCPb7HSPZSzhZ056/8bFHd7j182zy0Rr6soTZaihyKLF2K/UAzUvpOI 9XkzqrRhIgtJwXsvJ8z4CeFprlRjUrvSRne5gF9UvJ9+oSbC/vMYoTwWgCsV9u1uB8HpQi 1Az6hqZPIz3HFQEXIGRZSuk+QA7uodQWO+r8GLgc+LZIVz9dcbvRbhsPKHF2G43+pVmwHn ac9rjPuiKbXLAfBsO4SUjsDhDnvXttBhal/uhrXty+qIhVktwUoW8cmetcYYWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=1226fa26de03aebcbe2ade8c516cedf14ce3abbb commit 1226fa26de03aebcbe2ade8c516cedf14ce3abbb Author: Felix Palmen AuthorDate: 2022-09-07 11:25:27 +0000 Commit: Felix Palmen 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