From nobody Wed Sep 07 12:17:08 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 4MN1Tc332pz4cK30; Wed, 7 Sep 2022 12:17:08 +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 4MN1Tc2K3Jz3Gk4; Wed, 7 Sep 2022 12:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662553028; 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=0/QjYVxYfEXx4DmIrA2p+NR/9DgWuGaJ9qLofVIq9oI=; b=sakBA4qagPdL5N9/5KFI5aKoMZm/8zppSrTNaXRlIp/tzwtsAEyr5BAShW+RFHD0kqoSSz 3Mv3Ijz4kNQj3WyQZRstKoFv1Yt0VyDRMCn/gtujrgN1smEl2dXBpGbGtlYzPdy4Onmjbp v2lqCutkaXppa68NbGAY6RyrbESvr+VU80/djzPFFjICc9QPjnx7XUjmxvk58W9q5JK9nw 7h5OgO7SnOVSr/5AL2eExjaB3AaI8MdenfL5OjQQJnDF0vvn9f6VuGcEnZUVqpANcMRgq1 h9Ja/4P59Jn+cCMmSOM9g+Ui/5ECiR5S3NA8VqaZ7O791pxpNM5+LqkpWK0EAg== 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 4MN1Tc1NXfzWyt; Wed, 7 Sep 2022 12:17:08 +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 287CH8II006169; Wed, 7 Sep 2022 12:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287CH826006168; Wed, 7 Sep 2022 12:17:08 GMT (envelope-from git) Date: Wed, 7 Sep 2022 12:17:08 GMT Message-Id: <202209071217.287CH826006168@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 307502b65277 - main - graphics/drm-kmod: Fix dependency on firmwares 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: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 307502b652770970002161d98461d023ecae6df9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662553028; 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=0/QjYVxYfEXx4DmIrA2p+NR/9DgWuGaJ9qLofVIq9oI=; b=JzQS1wIamQb3T6guKDTl+7fvHJfuBHHaOomwYZjZcg9USxC9gLMySg43JV13GPMwPi6UlX A34sCFUumtTtSD1y0ZyiXwWntZS/MF1F5IMhrITfxJnJrZr6IrXoSNERt5mPsQTNOO/DJo 7ergEGXDtQiMeeXsunSEs9WSLaWMPRKQlvv0PBA8nubEfdfA1OvgQdeUbjRvqrm9VbwuPn ZMwcXklZPJ9ZJjagLXFSsIPB4amHcu5CRtUzRLGFKn3ZiaCCseUVwqPXPAjhMzTJdGB2aB fIhMSH4OAzOTdNNkvfv7aazb92r8ztgSzHgnwfDu+mlh7YqLlPBQRwUjOxRlAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662553028; a=rsa-sha256; cv=none; b=RE8Bkgg55jTpfWYkD5yVUkVt22JUsQZU2BVey1zZ3rEQiwR0Q80GLdFaPAJPi9i0Q1Ngyf 8a3y7S9/CEynpe83Z4uSVumQ5AjImrsyo2J3aurddLXHTuz3HcjwaKJb9wKc04jwPDdKDz n1AtuaudUZCrChfIJ1lcNvO+BR87Xv45d+bVdnimM40Mw6y5as3gjldtnfOcHkHIbL3aaA TIG8Ltwe0kFslZzii58FKfOz86+mxKE+o0JNGNGDLGdMogM7IgxXDhZMwhgt9ycwzwRtyA HjMqyxJvrUphl8Icbg7cPuzwMfXMaA+LAOyHYM20Y6/85mHmMOoLBZeDond0Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=307502b652770970002161d98461d023ecae6df9 commit 307502b652770970002161d98461d023ecae6df9 Author: Felix Palmen AuthorDate: 2022-09-07 11:25:27 +0000 Commit: Felix Palmen CommitDate: 2022-09-07 12:14:49 +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 --- 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 15a8d9fc0ee1..4ebbc802906a 100644 --- a/graphics/drm-kmod/Makefile +++ b/graphics/drm-kmod/Makefile @@ -1,5 +1,6 @@ PORTNAME= drm-kmod PORTVERSION= 20220907 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= x11@FreeBSD.org @@ -14,15 +15,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