<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b6dddf5526680cba0b601314b2d0d2bb231ac1a8">https://github.com/macports/macports-ports/commit/b6dddf5526680cba0b601314b2d0d2bb231ac1a8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b6dddf5526680cba0b601314b2d0d2bb231ac1a8
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat Apr 20 09:17:53 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> rnnoise: update to 0.2
</span>---
audio/rnnoise/Portfile | 26 +++-
...h-372f7b4b76cde4ca1ec4605353dd17898a99de38.diff | 141 +++++++++++++++++++++
2 files changed, 161 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/rnnoise/Portfile b/audio/rnnoise/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3309dc1585b..e6232fcd191 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/rnnoise/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/rnnoise/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup xiph rnnoise 1cbdbcf1283499bbb2230a6b0f126eb9b236defd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup xiph rnnoise 0.2 v
</span> revision 0
categories audio
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,9 +14,24 @@ description recurrent neural network for audio noise reduction
</span> long_description RNNoise is a noise suppression library based on a \
recurrent neural network.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f20927ca9c17df721cc75a959075868d13e8dff6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 786eaa37dd1158ea6ba920e88432c469609c08d93d6519fe3b345109fac50c28 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 173778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a3460eb584cab6dad4607ca2f12fec0964407581 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e4a17eb1493b7551f9f7781d2acc67b8847d6ed7c4b64db0fd62c017021ae1ec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 91363
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/xiph/rnnoise/issues/222
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-372f7b4b76cde4ca1ec4605353dd17898a99de38.diff
</span>
use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_automake yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Used by download_model.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:wget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# FIXME: no Altivec support at the moment:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/xiph/rnnoise/issues/223
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/rnnoise/files/patch-372f7b4b76cde4ca1ec4605353dd17898a99de38.diff b/audio/rnnoise/files/patch-372f7b4b76cde4ca1ec4605353dd17898a99de38.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5b845cc9ad8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/rnnoise/files/patch-372f7b4b76cde4ca1ec4605353dd17898a99de38.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,141 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 372f7b4b76cde4ca1ec4605353dd17898a99de38 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Timothy B. Terriberry" <tterribe@xiph.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 15 Apr 2024 11:27:25 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix compilation errors.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+vec_avx.h needs x86cpu.h, and x86cpu.h needs to detect SSE2 (or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ greater) without the Opus macros.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Also, nobody was defining OPUS_CLEAR (but several things were
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ including the non-existent os_support.h where it is defined in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libopus), so replace those calls with RNN_CLEAR and remove the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ erroneous includes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Take the opportunity to hoist OPUS_GNUC_PREREQ to common.h, too,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ since it is needed in multiple places now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes GitHub #222
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/common.h | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/vec.h | 9 ++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/vec_avx.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/vec_neon.h | 5 +++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/x86/x86cpu.h | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 18 insertions(+), 10 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/common.h b/src/common.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5005bfff..f9095ca5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/common.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/common.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +43,14 @@ static RNN_INLINE void rnnoise_free (void *ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RNN_CLEAR(dst, n) (memset((dst), 0, (n)*sizeof(*(dst))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if !defined(OPUS_GNUC_PREREQ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(__GNUC__)&&defined(__GNUC_MINOR__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define OPUS_GNUC_PREREQ(_maj,_min) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define OPUS_GNUC_PREREQ(_maj,_min) 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/vec.h b/src/vec.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8e96cbf3..71b7afbb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/vec.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/vec.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,6 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VEC_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "opus_types.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "common.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "arch.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "x86/x86_arch_macros.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,8 +42,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "vec_neon.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "os_support.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MAX_INPUTS (2048)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NO_OPTIMIZATIONS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline void sgemv16x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OPUS_CLEAR(out, rows);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RNN_CLEAR(out, rows);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i=0;i<rows;i+=16)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (j=0;j<cols;j++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,7 +83,7 @@ static inline void sgemv16x1(float *out, const float *weights, int rows, int col
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline void sgemv8x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OPUS_CLEAR(out, rows);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RNN_CLEAR(out, rows);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i=0;i<rows;i+=8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (j=0;j<cols;j++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,7 +123,7 @@ static inline void sgemv(float *out, const float *weights, int rows, int cols, i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OPUS_CLEAR(out, rows);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RNN_CLEAR(out, rows);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i=0;i<rows;i+=8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int cols;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/vec_avx.h b/src/vec_avx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b73a3533..a5040b45 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/vec_avx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/vec_avx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <immintrin.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/*#include "celt/x86/x86cpu.h"*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "x86/x86cpu.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MAX_INPUTS (2048)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/vec_neon.h b/src/vec_neon.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e6432e2f..31b736c3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/vec_neon.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/vec_neon.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VEC_NEON_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <arm_neon.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "os_support.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "opus_types.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "common.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__arm__) && !defined(__aarch64__) && (__ARM_ARCH < 8 || !defined(__clang__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Emulate vcvtnq_s32_f32() for ARMv7 Neon. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -302,7 +303,7 @@ static inline void sgemv(float *out, const float *weights, int rows, int cols, i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OPUS_CLEAR(out, rows);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RNN_CLEAR(out, rows);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i=0;i<rows;i+=8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int cols;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/x86/x86cpu.h b/src/x86/x86cpu.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 97dcdbde..e214abab 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/x86/x86cpu.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/x86/x86cpu.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,8 +36,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int opus_select_arch(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if defined(OPUS_X86_MAY_HAVE_SSE2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include "opus_defines.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(__SSE2__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include "common.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*MOVD should not impose any alignment restrictions, but the C standard does,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and UBSan will report errors if we actually make unaligned accesses.
</span></pre><pre style='margin:0'>
</pre>