From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sat, 16 Mar 2024 13:23: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 1rlT4C-009c2V-1W for lore@lore.pengutronix.de; Sat, 16 Mar 2024 13:23: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 1rlT4B-0003h0-QW; Sat, 16 Mar 2024 13:23:11 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rlT3l-0003Dp-6t; Sat, 16 Mar 2024 13:22:45 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Sat, 16 Mar 2024 13:22:36 +0100 Message-Id: <20240316122236.2136539-2-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240316122236.2136539-1-p.zabel@pengutronix.de> References: <20240316122236.2136539-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH v2 2/2] 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 Enable the asm option only together with fixed-point. Signed-off-by: Philipp Zabel --- rules/opus.in | 1 + rules/opus.make | 50 ++++++++++++++++++++++--------------------------- 2 files changed, 23 insertions(+), 28 deletions(-) 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 -- 2.39.2