* [ptxdist] [PATCH v2 1/2] opus: version bump 1.4 -> 1.5.1
@ 2024-03-16 12:22 Philipp Zabel
2024-03-16 12:22 ` [ptxdist] [PATCH v2 2/2] opus: switch to meson build system Philipp Zabel
2024-03-23 8:59 ` [ptxdist] [APPLIED] opus: version bump 1.4 -> 1.5.1 Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Philipp Zabel @ 2024-03-16 12:22 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
https://opus-codec.org/demo/opus-1.5/
New machine learning features (DRED, deep PLC, and OSCE) disabled for
now, as they increase library size by a few MiB.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
v2: Remove ML feature options.
---
rules/opus.make | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/rules/opus.make b/rules/opus.make
index 4dd2f9d9b653..490ef6ea44d6 100644
--- a/rules/opus.make
+++ b/rules/opus.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPUS) += opus
#
# Paths and names
#
-OPUS_VERSION := 1.4
-OPUS_MD5 := 0d89c15268c5c5984f583d7997d2a148
+OPUS_VERSION := 1.5.1
+OPUS_MD5 := 06c0e626ea3ad72f7b006e9130c8b15d
OPUS := opus-$(OPUS_VERSION)
OPUS_SUFFIX := tar.gz
OPUS_URL := http://downloads.xiph.org/releases/opus/$(OPUS).$(OPUS_SUFFIX)
@@ -38,6 +38,9 @@ OPUS_CONF_OPT := \
--disable-fixed-point-debug \
--enable-float-api \
--disable-custom-modes \
+ --disable-dred \
+ --disable-deep-plc \
+ --disable-lossgen \
--enable-float-approx \
--enable-asm \
--enable-rtcd \
@@ -47,6 +50,10 @@ OPUS_CONF_OPT := \
--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
--
2.39.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH v2 2/2] opus: switch to meson build system
2024-03-16 12:22 [ptxdist] [PATCH v2 1/2] opus: version bump 1.4 -> 1.5.1 Philipp Zabel
@ 2024-03-16 12:22 ` Philipp Zabel
2024-03-23 8:59 ` [ptxdist] [APPLIED] " Michael Olbrich
2024-03-23 8:59 ` [ptxdist] [APPLIED] opus: version bump 1.4 -> 1.5.1 Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Philipp Zabel @ 2024-03-16 12:22 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
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 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] opus: version bump 1.4 -> 1.5.1
2024-03-16 12:22 [ptxdist] [PATCH v2 1/2] opus: version bump 1.4 -> 1.5.1 Philipp Zabel
2024-03-16 12:22 ` [ptxdist] [PATCH v2 2/2] opus: switch to meson build system Philipp Zabel
@ 2024-03-23 8:59 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2024-03-23 8:59 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 69c3ecfb6d8edb33c3959d520e352c06a7a20f88.
Michael
[sent from post-receive hook]
On Sat, 23 Mar 2024 09:59:33 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> https://opus-codec.org/demo/opus-1.5/
>
> New machine learning features (DRED, deep PLC, and OSCE) disabled for
> now, as they increase library size by a few MiB.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20240316122236.2136539-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/opus.make b/rules/opus.make
> index 4dd2f9d9b653..490ef6ea44d6 100644
> --- a/rules/opus.make
> +++ b/rules/opus.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPUS) += opus
> #
> # Paths and names
> #
> -OPUS_VERSION := 1.4
> -OPUS_MD5 := 0d89c15268c5c5984f583d7997d2a148
> +OPUS_VERSION := 1.5.1
> +OPUS_MD5 := 06c0e626ea3ad72f7b006e9130c8b15d
> OPUS := opus-$(OPUS_VERSION)
> OPUS_SUFFIX := tar.gz
> OPUS_URL := http://downloads.xiph.org/releases/opus/$(OPUS).$(OPUS_SUFFIX)
> @@ -38,6 +38,9 @@ OPUS_CONF_OPT := \
> --disable-fixed-point-debug \
> --enable-float-api \
> --disable-custom-modes \
> + --disable-dred \
> + --disable-deep-plc \
> + --disable-lossgen \
> --enable-float-approx \
> --enable-asm \
> --enable-rtcd \
> @@ -47,6 +50,10 @@ OPUS_CONF_OPT := \
> --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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] opus: switch to meson build system
2024-03-16 12:22 ` [ptxdist] [PATCH v2 2/2] opus: switch to meson build system Philipp Zabel
@ 2024-03-23 8:59 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2024-03-23 8:59 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 2dcef33c7a975f99664811f96c0bee9665c1a65a.
Michael
[sent from post-receive hook]
On Sat, 23 Mar 2024 09:59:34 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Enable the asm option only together with fixed-point.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20240316122236.2136539-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-23 9:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-16 12:22 [ptxdist] [PATCH v2 1/2] opus: version bump 1.4 -> 1.5.1 Philipp Zabel
2024-03-16 12:22 ` [ptxdist] [PATCH v2 2/2] opus: switch to meson build system Philipp Zabel
2024-03-23 8:59 ` [ptxdist] [APPLIED] " Michael Olbrich
2024-03-23 8:59 ` [ptxdist] [APPLIED] opus: version bump 1.4 -> 1.5.1 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox