From owner-svn-ports-head@freebsd.org Sun Jan 24 17:30:11 2021 Return-Path: Delivered-To: svn-ports-head@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 8475D4D370B; Sun, 24 Jan 2021 17:30:11 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (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 (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DP0PZ29vnz3qjX; Sun, 24 Jan 2021 17:30:10 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1611509408; 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=eM+50/JzSx16SkIUOvlbditq/anIMKa5vQPwh7RPbzk=; b=MEF7gT58VCRtBu01i67EFKoE9sXREsVxZiq+bd3m2lzPoWbwtGySLf1aJKnry7XVxUPv7S Xo0yJSdNp/b29JgFi7JrfyIvdaezapYhVJnTML+ii9p5S9E2K9WqgSU8+MBdRXMf+tTlOo IOLnh8qDoP60PvhU/Xj7JYD5Qu9WfUs= Received: from amy (j1a01-1-78-205-69-41.fbx.proxad.net [78.205.69.41]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 6de97681 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 24 Jan 2021 17:30:07 +0000 (UTC) Date: Sun, 24 Jan 2021 18:30:06 +0100 From: Emmanuel Vadot To: Rene Ladan 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: <20210124183006.644e161c6dbc803dc4b061f5@bidouilliste.com> In-Reply-To: <20210124172335.GB46858@freefall.freebsd.org> References: <202101241716.10OHGG26045422@repo.freebsd.org> <20210124181956.ae1376dbf803cf52d7e84d55@bidouilliste.com> <20210124172335.GB46858@freefall.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4DP0PZ29vnz3qjX X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=MEF7gT58; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-3.50 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+mx]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[212.83.155.74:from]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[78.205.69.41:received]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; FREEFALL_USER(0.00)[manu]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[212.83.155.74:from:127.0.2.255]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-ports-head,svn-ports-all] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2021 17:30:11 -0000 On Sun, 24 Jan 2021 17:23:35 +0000 Rene Ladan wrote: > 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: > >=20 > > > Author: rene > > > Date: Sun Jan 24 17:16:15 2021 > > > New Revision: 562491 > > > URL: https://svnweb.freebsd.org/changeset/ports/562491 > > >=20 > > > Log: > > > Hook drm-fbsd13-kmod to the maser drm-kmod port and bump its PORTRE= VISION. > > > =20 > > > Add new drm-fbsd13-kmod to the conflict lists of the other ports. > > > Be pedantic about version boundaries. > > > =20 > > > Approved by: manu (on ports-committers) > > > MFH: 2021Q1 > > >=20 > > > 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 > > >=20 > > > Modified: head/graphics/drm-current-kmod/Makefile > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- 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=3D gpu-firmware-kmod>=3Dg20200914:graph= ics/gpu > > > CONFLICTS_INSTALL=3D drm-devel-kmod \ > > > drm-fbsd11.2-kmod \ > > > drm-fbsd12.0-kmod \ > > > + drm-fbsd13-kmod \ > > > drm-legacy-kmod > > > =20 > > > OPTIONS_DEFINE=3D DEBUG SOURCE > > >=20 > > > Modified: head/graphics/drm-devel-kmod/Makefile > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- head/graphics/drm-devel-kmod/Makefile Sun Jan 24 16:48:25 2021 (r= 562490) > > > +++ head/graphics/drm-devel-kmod/Makefile Sun Jan 24 17:16:15 2021 (r= 562491) > > > @@ -19,6 +19,7 @@ RUN_DEPENDS=3D gpu-firmware-kmod>=3Dg20200914:graph= ics/gpu > > > CONFLICTS_INSTALL=3D drm-current-kmod \ > > > drm-fbsd11.2-kmod \ > > > drm-fbsd12.0-kmod \ > > > + drm-fbsd13-kmod \ > > > drm-legacy-kmod > > > =20 > > > OPTIONS_DEFINE=3D DEBUG > > >=20 > > > Modified: head/graphics/drm-fbsd11.2-kmod/Makefile > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- 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=3D gpu-firmware-kmod>=3Dg20180319:graph= ics/gpu > > > =20 > > > CONFLICTS_INSTALL=3D drm-devel-kmod \ > > > drm-fbsd12.0-kmod \ > > > + drm-fbsd13-kmod \ > > > drm-current-kmod \ > > > drm-legacy-kmod > > > =20 > > > @@ -32,7 +33,7 @@ GH_TAGNAME=3D d7d433d > > > =20 > > > .include > > > =20 > > > -.if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} > 1200000 > > > +.if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} >=3D 1200000 > > > IGNORE=3D only supported on FreeBSD 11. > > > .endif > > > =20 > > >=20 > > > Modified: head/graphics/drm-fbsd12.0-kmod/Makefile > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- 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=3D gpu-firmware-kmod>=3Dg20180319:graph= ics/gpu > > > =20 > > > CONFLICTS_INSTALL=3D drm-devel-kmod \ > > > drm-fbsd11.2-kmod \ > > > + drm-fbsd13-kmod \ > > > drm-current-kmod \ > > > drm-legacy-kmod > > > =20 > > > @@ -32,7 +33,7 @@ GH_TAGNAME=3D fa1387d > > > =20 > > > .include > > > =20 > > > -.if ${OPSYS} =3D=3D FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSIO= N} > 1300000) > > > +.if ${OPSYS} =3D=3D FreeBSD && (${OSVERSION} < 1200058 || ${OSVERSIO= N} >=3D 1300000) > > > IGNORE=3D only supported on FreeBSD 12. > > > .endif > > > .if ${OPSYS} !=3D FreeBSD > > >=20 > > > Modified: head/graphics/drm-kmod/Makefile > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- 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 @@ > > > =20 > > > PORTNAME=3D drm-kmod > > > PORTVERSION=3D g20190710 > > > +PORTREVISION=3D 1 > > > CATEGORIES=3D graphics > > > =20 > > > MAINTAINER=3D x11@FreeBSD.org > > > @@ -22,7 +23,9 @@ RUN_DEPENDS=3D ${KMODDIR}/drm.ko:graphics/drm-fbsd1= 1.2-k > > > RUN_DEPENDS=3D ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod > > > .elif ${OSVERSION} >=3D 1300000 && ${OSVERSION} < 1300108 > > > IGNORE=3D not supported on older 13, no kernel support > > > -.elif ${OSVERSION} >=3D 1300108 > > > +.elif ${OSVERSION} >=3D 1300108 && ${OSVERSION} < 1400000 > >=20 > > OSVERSION should be 1300136 here. > Ah yes, because the drm-fbsd13-kmod port itself is a NOP for early 13. >=20 > Should the line upper limit for the above IGNORE line also be bumped? >=20 > Ren=E9 Yup, replacing 1300108 by 1300136 everywhere seems to right thing to do. --=20 Emmanuel Vadot