From nobody Mon Aug 21 14:41:56 2023 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 4RTwDD5bK5z4qsN8; Mon, 21 Aug 2023 14:42:04 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4RTwDD1PcJz4Fcp; Mon, 21 Aug 2023 14:42:04 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; none Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 7F64132006F5; Mon, 21 Aug 2023 10:42:00 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 21 Aug 2023 10:42:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm3; t= 1692628920; x=1692715320; bh=GBz15tHPUBwbuD01MwF0NkQsOEbxcyw7+11 mkI3FcHY=; b=BxZ+F1b3fWTtpjvLPSP5JCd2m6rlJjvHCSEeEQyBqtmnT50Ck8G l5B2KzftlPEn7ItE/NLA4mI/Feh3ZzN23WLirISht6ZPTAyboTVy61Gkv7BYlSUi FutRAOMepzdeklaXilDpw2evFe7KbWS4nZVbKtTxomDIDK5xKSW8E+DhaY53wxxz h3NLaHOLPQGfujzHI3MrFjvbMXe/rG2Gs2ksGX8fA+URs2HAPbU2sqvrCpRUqeSP 1OjBkm8lBxv3KvSCeccS/wtRHgKH2EfCXKWsBbI9VS2HXTehfo8Pxbg3KYrOBjdk KVYKGD8qz1pfLnMg/FwHS2bhy/77CSC1rFQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1692628920; x= 1692715320; bh=GBz15tHPUBwbuD01MwF0NkQsOEbxcyw7+11mkI3FcHY=; b=q P0Y/UZ8fXdFp4xzNci2G8jqhZcXOGfHhWhcAc9yKr7Jicf+o7t+vQcT6h1qIyJAK kdcyr03B0GUD6P9CLLf8PJBQxMo9iMXFwLPGLG5yBPYu+xFYJ1pn/nSPbqQawa30 JZQJp63LjHeZSpqllch/qZTEVRoPnguSjt1xKIIgfp7yF2WH1ibD3cQ2mcWOzSo/ W7QG6gYggM28j/QXWRzvfMQCJWcUitd4arWts7/vgnknNKALimSB5fhO6WYuaejO 1n/IGro1dbApwuHp4YFE8qWh9dGhW9P7/LuW35H6GFfN7tDiqXOa66DexlKVJt2Y eVlePyBJl+pVJe7N4/9oQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudduledgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvfhfhjggtgfesthejredttddvjeenucfhrhhomhepjghurhhi uceohihurhhisegrvghtvghrnhdrohhrgheqnecuggftrfgrthhtvghrnhephfejuddtve eljeekhffhtdfhheeftddvgfehgffhledutdekhedvgfetuefghfeinecuffhomhgrihhn pehfrhgvvggsshgurdhorhhgpdguvghfrghulhhtqdhvvghrshhiohhnshdrmhhknecuve hluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephihurhhisegr vghtvghrnhdrohhrgh X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 21 Aug 2023 10:41:58 -0400 (EDT) Message-ID: Date: Mon, 21 Aug 2023 16:41:56 +0200 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 3b2ff2ef194c - main - Mk: Add Uses/ebur128.mk Content-Language: en-US To: "Jason E. Hale" , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202308211424.37LEOQli014118@gitrepo.freebsd.org> From: Yuri In-Reply-To: <202308211424.37LEOQli014118@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4RTwDD1PcJz4Fcp X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US] Jason E. Hale wrote: > The branch main has been updated by jhale: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3b2ff2ef194c83835fe7dc6618427b8fd50ea31d > > commit 3b2ff2ef194c83835fe7dc6618427b8fd50ea31d > Author: Jason E. Hale > AuthorDate: 2023-08-21 13:57:29 +0000 > Commit: Jason E. Hale > CommitDate: 2023-08-21 14:24:20 +0000 > > Mk: Add Uses/ebur128.mk > > Handles dependencies for the chosen implementation of libebur128 set > via DEFAULT_VERSIONS: audio/libebur128 (legacy) and audio/ebur128 > (rust). > > PR: 272843 > --- > CHANGES | 19 ++++++++++++++++ > Mk/Uses/ebur128.mk | 55 ++++++++++++++++++++++++++++++++++++++++++++++ > Mk/bsd.default-versions.mk | 8 ++++++- > 3 files changed, 81 insertions(+), 1 deletion(-) > > diff --git a/CHANGES b/CHANGES > index 3a28ea34e815..2f6c9a61499d 100644 > --- a/CHANGES > +++ b/CHANGES > @@ -10,6 +10,25 @@ in the release notes and/or placed into UPDATING. > > All ports committers are allowed to commit to this file. > > +20230821: > +AUTHOR: jhale@FreeBSD.org > + > + A new uses 'ebur128' has been added to transparently depend on the > + proper variant of 'rust' or 'legacy' depending on the default version > + set by the user. > + > + Usage: USES=ebur128:ARGS > + Valid ARGS: , build, lib, run, test > + : (default) same as lib > + build: add BUILD_DEPENDS > + lib: add LIB_DEPENDS > + run: add RUN_DEPENDS > + test: add TEST_DEPENDS > + > + If you prefer not to use rust, add the following to your make.conf: > + > + DEFAULT_VERSIONS+=ebur128=legacy > + > 20230728: > AUTHOR: andrew@tao11.riddles.org.uk, fuz@FreeBSD.org > > diff --git a/Mk/Uses/ebur128.mk b/Mk/Uses/ebur128.mk > new file mode 100644 > index 000000000000..eb5df3630777 > --- /dev/null > +++ b/Mk/Uses/ebur128.mk > @@ -0,0 +1,55 @@ > +# Handle dependency on audio/[lib]ebur128 > +# Feature: ebur128 > +# Usage: USES=ebur128:ARGS > +# Valid ARGS: , build, lib, run, test > +# : (default) same as lib > +# build: add BUILD_DEPENDS > +# lib: add LIB_DEPENDS > +# run: add RUN_DEPENDS > +# test: add TEST_DEPENDS > +# > +# MAINTAINER: ports@FreeBSD.org > +# > + > +.if !defined(_INCLUDE_USES_EBUR128_MK) > +_INCLUDE_USES_EBUR128_MK= YES > + > +#=== Check for invalid arguments === > +. if !empty(ebur128_ARGS:Nbuild:Nlib:Nrun:Ntest) > +IGNORE= Invalid USES=ebur128 - unsupported argument(s): ${ebur128_ARGS} > +. endif > + > +#=== Dependency selection === > +_ebur128_depends= build lib run test > +_ebur128_depend= # > +. for _depend in ${_ebur128_depends:O:u} > +. if ${ebur128_ARGS:M${_depend}} > +_ebur128_depend+= ${_depend} > +. endif > +. endfor > + > +. if empty(_ebur128_depend) > +_ebur128_depend= lib > +. endif > + > +#=== Prefixes === > +_ebur128_prefix_rust= # > +_ebur128_prefix_legacy= lib > +_ebur128_prefix= ${_ebur128_prefix_${EBUR128_DEFAULT}} > + > +#=== Dependency setup === > +_EBUR128_PORT= audio/${_ebur128_prefix}ebur128 > +_EBUR128_LIB= libebur128.so > +_EBUR128_PKG= ${_ebur128_prefix}ebur128 > + > +_EBUR128_BUILD_DEPENDS= ${_EBUR128_PKG}>=0:${_EBUR128_PORT} > +_EBUR128_LIB_DEPENDS= ${_EBUR128_LIB}:${_EBUR128_PORT} > +_EBUR128_RUN_DEPENDS= ${_EBUR128_PKG}>=0:${_EBUR128_PORT} > +_EBUR128_TEST_DEPENDS= ${_EBUR128_PKG}>=0:${_EBUR128_PORT} > + > +#=== Actual dependency creation === > +. for _depend in ${_ebur128_depend} > +${_depend:tu}_DEPENDS+= ${_EBUR128_${_depend:tu}_DEPENDS} > +. endfor > + > +.endif > diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk > index 93c4c1a5cd28..ad9011da03a5 100644 > --- a/Mk/bsd.default-versions.mk > +++ b/Mk/bsd.default-versions.mk > @@ -17,7 +17,7 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes > > LOCALBASE?= /usr/local > > -. for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC \ > +. for lang in APACHE BDB COROSYNC EBUR128 EMACS FIREBIRD FORTRAN FPC GCC \ > GHOSTSCRIPT GL GO GUILE IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \ > LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP \ > PYCRYPTOGRAPHY PYTHON PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH > @@ -38,6 +38,12 @@ APACHE_DEFAULT?= 2.4 > BDB_DEFAULT?= 5 > # Possible values: 2, 3 > COROSYNC_DEFAULT?= 2 > +# Possible values: rust, legacy > +. if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64) > ++EBUR128_DEFAULT?= rust > +. else > ++EBUR128_DEFAULT?= legacy Are these '+' at the start of the line intended? > +. endif > # Possible_values: full canna nox devel_full devel_nox > #EMACS_DEFAULT?= let the flavor be the default if not explicitly set > # Possible values: 3.0, 4.0 >