From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH 2/2] opus: switch to meson build system
Date: Fri, 8 Mar 2024 12:57:56 +0100 [thread overview]
Message-ID: <20240308115756.271085-2-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20240308115756.271085-1-p.zabel@pengutronix.de>
Enable the asm option only together with fixed-point.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
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 3b8e6444cd3e..6751e17cfe24 100644
--- a/rules/opus.in
+++ b/rules/opus.in
@@ -3,6 +3,7 @@
menuconfig 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 ea1f04837cf1..0feb0ebc401b 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 \
- --$(call ptx/endis, PTXCONF_OPUS_DRED)-dred \
- --$(call ptx/endis, PTXCONF_OPUS_DEEP_PLC)-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 \
- --$(call ptx/endis, PTXCONF_OPUS_OSCE)-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=$(call ptx/truefalse, PTXCONF_OPUS_DEEP_PLC) \
+ -Denable-dnn-debug-float=false \
+ -Denable-dred=$(call ptx/truefalse, PTXCONF_OPUS_DRED) \
+ -Denable-osce=$(call ptx/truefalse, PTXCONF_OPUS_OSCE) \
+ -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
next prev parent reply other threads:[~2024-03-08 11:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-08 11:57 [ptxdist] [PATCH 1/2] opus: version bump 1.4 -> 1.5.1 Philipp Zabel
2024-03-08 11:57 ` Philipp Zabel [this message]
2024-03-15 6:19 ` Michael Olbrich
2024-03-15 12:00 ` Philipp Zabel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240308115756.271085-2-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox