From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sat, 23 Mar 2024 10:00:12 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rnxEa-000yeG-1e for lore@lore.pengutronix.de; Sat, 23 Mar 2024 10:00:12 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rnxEZ-0004Qa-JU; Sat, 23 Mar 2024 10:00:11 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rnxDy-0003t3-KM; Sat, 23 Mar 2024 09:59:34 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rnxDy-0080JM-7C; Sat, 23 Mar 2024 09:59:34 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rnxDy-00ASjS-0a; Sat, 23 Mar 2024 09:59:34 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Sat, 23 Mar 2024 09:59:34 +0100 Message-Id: <20240323085934.2493719-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240316122236.2136539-2-p.zabel@pengutronix.de> References: <20240316122236.2136539-2-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] opus: switch to meson build system X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 2dcef33c7a975f99664811f96c0bee9665c1a65a. Michael [sent from post-receive hook] On Sat, 23 Mar 2024 09:59:34 +0100, Philipp Zabel wrote: > Enable the asm option only together with fixed-point. > > Signed-off-by: Philipp Zabel > Message-Id: <20240316122236.2136539-2-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/opus.in b/rules/opus.in > index 7412eb76a538..237928a29453 100644 > --- a/rules/opus.in > +++ b/rules/opus.in > @@ -3,5 +3,6 @@ > config OPUS > tristate > prompt "opus" > + select HOST_MESON > help > Opus is a totally open, royalty-free, highly versatile audio codec. > diff --git a/rules/opus.make b/rules/opus.make > index 490ef6ea44d6..f666ab9a8f03 100644 > --- a/rules/opus.make > +++ b/rules/opus.make > @@ -27,35 +27,29 @@ OPUS_LICENSE := BSD-3-Clause > # Prepare > # ---------------------------------------------------------------------------- > > -# > -# autoconf > -# > -OPUS_CONF_TOOL := autoconf > +OPUS_CONF_TOOL := meson > OPUS_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --disable-static \ > - --$(call ptx/disen, PTXCONF_HAS_HARDFLOAT)-fixed-point \ > - --disable-fixed-point-debug \ > - --enable-float-api \ > - --disable-custom-modes \ > - --disable-dred \ > - --disable-deep-plc \ > - --disable-lossgen \ > - --enable-float-approx \ > - --enable-asm \ > - --enable-rtcd \ > - --enable-intrinsics \ > - --disable-assertions \ > - --enable-hardening \ > - --disable-fuzzing \ > - --disable-check-asm \ > - --disable-doc \ > - --disable-dot-product \ > - --disable-dnn-debug-float \ > - --disable-osce-training-data \ > - --disable-osce \ > - --disable-extra-programs \ > - --enable-rfc8251 > + $(CROSS_MESON_USR) \ > + -Dasm=$(call ptx/disen, PTXCONF_HAS_HARDFLOAT)d \ > + -Dassertions=false \ > + -Dcheck-asm=false \ > + -Dcustom-modes=false \ > + -Ddocdir=doc/opus \ > + -Ddocs=disabled \ > + -Denable-deep-plc=false \ > + -Denable-dnn-debug-float=false \ > + -Denable-dred=false \ > + -Denable-osce=false \ > + -Dextra-programs=disabled \ > + -Dfixed-point=$(call ptx/falsetrue, PTXCONF_HAS_HARDFLOAT) \ > + -Dfixed-point-debug=false \ > + -Dfloat-api=true \ > + -Dfloat-approx=true \ > + -Dfuzzing=false \ > + -Dhardening=true \ > + -Dintrinsics=enabled \ > + -Drtcd=enabled \ > + -Dtests=disabled > > # ---------------------------------------------------------------------------- > # Target-Install