Enable the asm option only together with fixed-point. Signed-off-by: Philipp Zabel <p.za...@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