From owner-svn-ports-all@freebsd.org Sun Jan 24 17:23:35 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 69F6B4D2E7B; Sun, 24 Jan 2021 17:23:35 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DP0Fz2bWmz3qCR; Sun, 24 Jan 2021 17:23:35 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1611509015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bZOF5VBVnm1wjPJlsyheoc2NfTT7S9GV3QAM5x0m9bM=; b=r5n/ncM3ujkdat7PctRXy5cmCNu5HxKcyKtdQA6wpt47u+L3+4AUK4NmDNONf5RnsKFybM i5CZpIS5mxlsq2aCUzShaYeqkTC0bE8SMtLhOc26s7Wd4VzUTY4WwbLDjypaFhw4GmmWW9 6R6/VkRBhik1ZMHMR0pWQpDs0UFmNZPPZqsHYfgaviNaQR24DwsaEqHwOMYAfNFBkHwRqJ qYoTT6XTqdweBnFsPS4geMueaVXCbcLC+uEItQ4L+JRlMvaPC3ShHg8EZ+PqIzXKt/5gkf u8ZtPXxxnn2ddP9m4y7/+BYCt8wEafZYzb4nGkn//bmc6Wp0U/aKH6lSCoRoHA== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 43DA612439; Sun, 24 Jan 2021 17:23:35 +0000 (UTC) Date: Sun, 24 Jan 2021 17:23:35 +0000 From: Rene Ladan To: Emmanuel Vadot Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r562491 - in head/graphics: drm-current-kmod drm-devel-kmod drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-kmod Message-ID: <20210124172335.GB46858@freefall.freebsd.org> References: <202101241716.10OHGG26045422@repo.freebsd.org> <20210124181956.ae1376dbf803cf52d7e84d55@bidouilliste.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210124181956.ae1376dbf803cf52d7e84d55@bidouilliste.com> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1611509015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bZOF5VBVnm1wjPJlsyheoc2NfTT7S9GV3QAM5x0m9bM=; b=D6jINZ7NS5YmNsCT89JVmqyJxLYHjIoXkNVVUQnbEJTsY/8bmhT1FG6rgwnW61U40Io85L sBMsUGsyiZ8ZSWhOyZq2wCTfzu4hEZZTiuQDNCC1N5TBnEcw63l8QXrllaDZ8VTHL6Wtvy iSVCsc3oqCvz4eCLUHpKl6lpoUhnOOHS2yYgXMonNpfjTfxA/zQzqZBuTlQJ4QR0vW81Ri CS6v1IHsGbZlgLvVGv9Nck9fEkmSghSB2hXJw6yw+17UutCyp3RNhuZA4lwV7KqYY/SKnT PSJO7opt9xyT3j6MFOZM/WklT88XgaPUlZhVClrFIuNgv4onU7HGvUMTx+UHsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1611509015; a=rsa-sha256; cv=none; b=Z3OsIlAyY+7H0v2kFq08y/uYY9/4MwvZCbyrwrxvVQC84giEaykzbDSC4hyBEmnJu/+CHb vlODekmkRY448w99rVSAQ1Ix0ij52mukkYEr4MvA63hsgndtepElFXV/BCTmQ3Kn9gsQ9I HbTvrAMo7H/9YGtQH2nMvoFK5vjkT097xCloqg3DT1RHzt0LE6BojxApK4MhuoKVLCvarw ivY/5YUuf5FDEpj73G7MDlcoz9tFkZ6kQM5i7ptAReRkM6wRXOZc+QYyk0ZWSMO18b7cpq w9IXiCT1xrXhSfuZGhKzuRv4PXi2MWyhesARCjf4lP3Wv4AxIdFhYrgvYmKcOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2021 17:23:35 -0000 On Sun, Jan 24, 2021 at 06:19:56PM +0100, Emmanuel Vadot wrote: > On Sun, 24 Jan 2021 17:16:16 +0000 (UTC) > Rene Ladan wrote: > > > Author: rene > > Date: Sun Jan 24 17:16:15 2021 > > New Revision: 562491 > > URL: https://svnweb.freebsd.org/changeset/ports/562491 > > > > Log: > > Hook drm-fbsd13-kmod to the maser drm-kmod port and bump its PORTREVISION. > > > > Add new drm-fbsd13-kmod to the conflict lists of the other ports. > > Be pedantic about version boundaries. > > > > Approved by: manu (on ports-committers) > > MFH: 2021Q1 > > > > Modified: > > head/graphics/drm-current-kmod/Makefile > > head/graphics/drm-devel-kmod/Makefile > > head/graphics/drm-fbsd11.2-kmod/Makefile > > head/graphics/drm-fbsd12.0-kmod/Makefile > > head/graphics/drm-kmod/Makefile > > > > Modified: head/graphics/drm-current-kmod/Makefile > > ============================================================================== > > --- head/graphics/drm-current-kmod/Makefile Sun Jan 24 16:48:25 2021 (r562490) > > +++ head/graphics/drm-current-kmod/Makefile Sun Jan 24 17:16:15 2021 (r562491) > > @@ -19,6 +19,7 @@ RUN_DEPENDS= gpu-firmware-kmod>=g20200914:graphics/gpu > > CONFLICTS_INSTALL= drm-devel-kmod \ > > drm-fbsd11.2-kmod \ > > drm-fbsd12.0-kmod \ > > + drm-fbsd13-kmod \ > > drm-legacy-kmod > > > > OPTIONS_DEFINE= DEBUG SOURCE > > > > Modified: head/graphics/drm-devel-kmod/Makefile > > ============================================================================== > > --- head/graphics/drm-devel-kmod/Makefile Sun Jan 24 16:48:25 2021 (r562490) > > +++ head/graphics/drm-devel-kmod/Makefile Sun Jan 24 17:16:15 2021 (r562491) > > @@ -19,6 +19,7 @@ RUN_DEPENDS= gpu-firmware-kmod>=g20200914:graphics/gpu > > CONFLICTS_INSTALL= drm-current-kmod \ > > drm-fbsd11.2-kmod \ > > drm-fbsd12.0-kmod \ > > + drm-fbsd13-kmod \ > > drm-legacy-kmod > > > > OPTIONS_DEFINE= DEBUG > > > > Modified: head/graphics/drm-fbsd11.2-kmod/Makefile > > ============================================================================== > > --- head/graphics/drm-fbsd11.2-kmod/Makefile Sun Jan 24 16:48:25 2021 (r562490) > > +++ head/graphics/drm-fbsd11.2-kmod/Makefile Sun Jan 24 17:16:15 2021 (r562491) > > @@ -18,6 +18,7 @@ RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu > > > > CONFLICTS_INSTALL= drm-devel-kmod \ > > drm-fbsd12.0-kmod \ > > + drm-fbsd13-kmod \ > > drm-current-kmod \ > > drm-legacy-kmod > > > > @@ -32,7 +33,7 @@ GH_TAGNAME= d7d433d > > > > .include > > > > -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200000 > > +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 > > IGNORE= only supported on FreeBSD 11. > > .endif > > > > > > Modified: head/graphics/drm-fbsd12.0-kmod/Makefile > > ============================================================================== > > --- head/graphics/drm-fbsd12.0-kmod/Makefile Sun Jan 24 16:48:25 2021 (r562490) > > +++ head/graphics/drm-fbsd12.0-kmod/Makefile Sun Jan 24 17:16:15 2021 (r562491) > > @@ -18,6 +18,7 @@ RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu > > > > CONFLICTS_INSTALL= drm-devel-kmod \ > > drm-fbsd11.2-kmod \ > > + drm-fbsd13-kmod \ > > drm-current-kmod \ > > drm-legacy-kmod > > > > @@ -32,7 +33,7 @@ GH_TAGNAME= fa1387d > > > > .include > > > > -.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSION} > 1300000) > > +.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSION} >= 1300000) > > IGNORE= only supported on FreeBSD 12. > > .endif > > .if ${OPSYS} != FreeBSD > > > > Modified: head/graphics/drm-kmod/Makefile > > ============================================================================== > > --- head/graphics/drm-kmod/Makefile Sun Jan 24 16:48:25 2021 (r562490) > > +++ head/graphics/drm-kmod/Makefile Sun Jan 24 17:16:15 2021 (r562491) > > @@ -3,6 +3,7 @@ > > > > PORTNAME= drm-kmod > > PORTVERSION= g20190710 > > +PORTREVISION= 1 > > CATEGORIES= graphics > > > > MAINTAINER= x11@FreeBSD.org > > @@ -22,7 +23,9 @@ RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-k > > RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod > > .elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300108 > > IGNORE= not supported on older 13, no kernel support > > -.elif ${OSVERSION} >= 1300108 > > +.elif ${OSVERSION} >= 1300108 && ${OSVERSION} < 1400000 > > OSVERSION should be 1300136 here. Ah yes, because the drm-fbsd13-kmod port itself is a NOP for early 13. Should the line upper limit for the above IGNORE line also be bumped? René