pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio
Module Name: pkgsrc
Committed By: nia
Date: Mon Sep 2 16:04:24 UTC 2024
Modified Files:
pkgsrc/audio: Makefile
Added Files:
pkgsrc/audio/rnnoise: DESCR Makefile PLIST buildlink3.mk distinfo
pkgsrc/audio/rnnoise/patches: patch-src_common.h patch-src_vec.h
patch-src_vec__avx.h patch-src_vec__neon.h patch-src_x86_x86cpu.h
Log Message:
Import audio/rnnoise
RNNoise is a noise suppression library based on a recurrent neural network.
To generate a diff of this commit:
cvs rdiff -u -r1.702 -r1.703 pkgsrc/audio/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/rnnoise/DESCR \
pkgsrc/audio/rnnoise/Makefile pkgsrc/audio/rnnoise/PLIST \
pkgsrc/audio/rnnoise/buildlink3.mk pkgsrc/audio/rnnoise/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/rnnoise/patches/patch-src_common.h \
pkgsrc/audio/rnnoise/patches/patch-src_vec.h \
pkgsrc/audio/rnnoise/patches/patch-src_vec__avx.h \
pkgsrc/audio/rnnoise/patches/patch-src_vec__neon.h \
pkgsrc/audio/rnnoise/patches/patch-src_x86_x86cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/Makefile
diff -u pkgsrc/audio/Makefile:1.702 pkgsrc/audio/Makefile:1.703
--- pkgsrc/audio/Makefile:1.702 Thu May 16 10:24:46 2024
+++ pkgsrc/audio/Makefile Mon Sep 2 16:04:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.702 2024/05/16 10:24:46 wiz Exp $
+# $NetBSD: Makefile,v 1.703 2024/09/02 16:04:24 nia Exp $
#
COMMENT= Audio tools, players, and libraries
@@ -400,6 +400,7 @@ SUBDIR+= quodlibet
SUBDIR+= rexima
SUBDIR+= rhythmbox
SUBDIR+= rip
+SUBDIR+= rnnoise
SUBDIR+= rosegarden
SUBDIR+= rsynth
SUBDIR+= rtunes
Added files:
Index: pkgsrc/audio/rnnoise/DESCR
diff -u /dev/null pkgsrc/audio/rnnoise/DESCR:1.1
--- /dev/null Mon Sep 2 16:04:24 2024
+++ pkgsrc/audio/rnnoise/DESCR Mon Sep 2 16:04:24 2024
@@ -0,0 +1 @@
+RNNoise is a noise suppression library based on a recurrent neural network.
Index: pkgsrc/audio/rnnoise/Makefile
diff -u /dev/null pkgsrc/audio/rnnoise/Makefile:1.1
--- /dev/null Mon Sep 2 16:04:24 2024
+++ pkgsrc/audio/rnnoise/Makefile Mon Sep 2 16:04:24 2024
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1 2024/09/02 16:04:24 nia Exp $
+
+PKGNAME= rnnoise-0.2
+CATEGORIES= audio
+DIST_SUBDIR= ${PKGNAME_NOREV}
+DISTFILES= rnnoise.tar.gz
+DISTFILES+= rnnoise_data-0b50c45.tar.gz
+SITES.rnnoise.tar.gz= \
+ -https://gitlab.xiph.org/xiph/rnnoise/-/archive/v${PKGVERSION_NOREV}/rnnoise-v${PKGVERSION_NOREV}.tar.gz
+SITES.rnnoise_data-0b50c45.tar.gz= \
+ https://media.xiph.org/rnnoise/models/
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://gitlab.xiph.org/xiph/rnnoise
+COMMENT= Recurrent neural network for audio noise reduction
+LICENSE= modified-bsd
+
+WRKSRC= ${WRKDIR}/rnnoise-v${PKGVERSION_NOREV}
+
+USE_TOOLS+= autoconf automake autoreconf
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+
+CONFIGURE_ARGS+= --disable-doc
+CONFIGURE_ARGS+= --disable-examples
+CONFIGURE_ARGS+= --disable-x86-rtcd
+
+PKGCONFIG_OVERRIDE+= rnnoise.pc.in
+
+post-extract:
+ ${MV} ${WRKDIR}/models ${WRKSRC}/models
+ ${MV} ${WRKDIR}/src/* ${WRKSRC}/src/
+
+pre-configure:
+ cd ${WRKSRC} && autoreconf -fi
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/rnnoise/PLIST
diff -u /dev/null pkgsrc/audio/rnnoise/PLIST:1.1
--- /dev/null Mon Sep 2 16:04:24 2024
+++ pkgsrc/audio/rnnoise/PLIST Mon Sep 2 16:04:24 2024
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1 2024/09/02 16:04:24 nia Exp $
+include/rnnoise.h
+lib/librnnoise.la
+lib/pkgconfig/rnnoise.pc
+share/doc/rnnoise/AUTHORS
+share/doc/rnnoise/COPYING
+share/doc/rnnoise/README
Index: pkgsrc/audio/rnnoise/buildlink3.mk
diff -u /dev/null pkgsrc/audio/rnnoise/buildlink3.mk:1.1
--- /dev/null Mon Sep 2 16:04:24 2024
+++ pkgsrc/audio/rnnoise/buildlink3.mk Mon Sep 2 16:04:24 2024
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2024/09/02 16:04:24 nia Exp $
+
+BUILDLINK_TREE+= rnnoise
+
+.if !defined(RNNOISE_BUILDLINK3_MK)
+RNNOISE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.rnnoise+= rnnoise>=0.2
+BUILDLINK_PKGSRCDIR.rnnoise?= ../../audio/rnnoise
+.endif # RNNOISE_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -rnnoise
Index: pkgsrc/audio/rnnoise/distinfo
diff -u /dev/null pkgsrc/audio/rnnoise/distinfo:1.1
--- /dev/null Mon Sep 2 16:04:24 2024
+++ pkgsrc/audio/rnnoise/distinfo Mon Sep 2 16:04:24 2024
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.1 2024/09/02 16:04:24 nia Exp $
+
+BLAKE2s (rnnoise-0.2/rnnoise.tar.gz) = bc32aeda68de39341ffba86a2920e01f20a3d10baae82362e71ebff20b93865e
+SHA512 (rnnoise-0.2/rnnoise.tar.gz) = 930aa892299edbc1d512803df6b845ea6164eb498cacdab9970e5ae799bc6cf3c8c94d2b9576955fb9a2d8aa13a6d255e58fb99d0367a0d0ef842a1cb938e674
+Size (rnnoise-0.2/rnnoise.tar.gz) = 91370 bytes
+BLAKE2s (rnnoise-0.2/rnnoise_data-0b50c45.tar.gz) = fc810e19085f22052cefda7c12be25bc35de257c4d578af44cc3652ba7ee6ccf
+SHA512 (rnnoise-0.2/rnnoise_data-0b50c45.tar.gz) = c15fef7c88d86264a29a3dab14d94bde769da68f255d131d135f6a40d94037b1ffe521f9e0a26339114750dbdd7cf774c3185ba40279c74200fb32732f57db8b
+Size (rnnoise-0.2/rnnoise_data-0b50c45.tar.gz) = 22270507 bytes
+SHA1 (patch-src_common.h) = 4927f49e3366d77580fab3d377128481bb2107ed
+SHA1 (patch-src_vec.h) = 596dbe10d2d896faee574ca414354ea706f04be4
+SHA1 (patch-src_vec__avx.h) = f969a53582e1c08ae166ddf430db273c4f0d6c96
+SHA1 (patch-src_vec__neon.h) = df0c026f889772db389d059b714f67c01558ee78
+SHA1 (patch-src_x86_x86cpu.h) = 4d88011b34d87bbd341993de59c8c0690fe3e215
Index: pkgsrc/audio/rnnoise/patches/patch-src_common.h
diff -u /dev/null pkgsrc/audio/rnnoise/patches/patch-src_common.h:1.1
--- /dev/null Mon Sep 2 16:04:24 2024
+++ pkgsrc/audio/rnnoise/patches/patch-src_common.h Mon Sep 2 16:04:24 2024
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_common.h,v 1.1 2024/09/02 16:04:24 nia Exp $
+
+From: "Timothy B. Terriberry" <tterribe%xiph.org@localhost>
+Date: Mon, 15 Apr 2024 11:27:25 -0700
+Subject: [PATCH] Fix compilation errors.
+
+vec_avx.h needs x86cpu.h, and x86cpu.h needs to detect SSE2 (or
+ greater) without the Opus macros.
+Also, nobody was defining OPUS_CLEAR (but several things were
+ including the non-existent os_support.h where it is defined in
+ libopus), so replace those calls with RNN_CLEAR and remove the
+ erroneous includes.
+Take the opportunity to hoist OPUS_GNUC_PREREQ to common.h, too,
+ since it is needed in multiple places now.
+
+--- src/common.h.orig 2024-04-15 01:07:37.000000000 +0000
++++ src/common.h
+@@ -43,6 +43,14 @@ static RNN_INLINE void rnnoise_free (voi
+ #define RNN_CLEAR(dst, n) (memset((dst), 0, (n)*sizeof(*(dst))))
+ #endif
+
++# if !defined(OPUS_GNUC_PREREQ)
++# if defined(__GNUC__)&&defined(__GNUC_MINOR__)
++# define OPUS_GNUC_PREREQ(_maj,_min) \
++ ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
++# else
++# define OPUS_GNUC_PREREQ(_maj,_min) 0
++# endif
++# endif
+
+
+ #endif
Index: pkgsrc/audio/rnnoise/patches/patch-src_vec.h
diff -u /dev/null pkgsrc/audio/rnnoise/patches/patch-src_vec.h:1.1
--- /dev/null Mon Sep 2 16:04:24 2024
+++ pkgsrc/audio/rnnoise/patches/patch-src_vec.h Mon Sep 2 16:04:24 2024
@@ -0,0 +1,61 @@
+$NetBSD: patch-src_vec.h,v 1.1 2024/09/02 16:04:24 nia Exp $
+
+From: "Timothy B. Terriberry" <tterribe%xiph.org@localhost>
+Date: Mon, 15 Apr 2024 11:27:25 -0700
+Subject: [PATCH] Fix compilation errors.
+
+vec_avx.h needs x86cpu.h, and x86cpu.h needs to detect SSE2 (or
+ greater) without the Opus macros.
+Also, nobody was defining OPUS_CLEAR (but several things were
+ including the non-existent os_support.h where it is defined in
+ libopus), so replace those calls with RNN_CLEAR and remove the
+ erroneous includes.
+Take the opportunity to hoist OPUS_GNUC_PREREQ to common.h, too,
+ since it is needed in multiple places now.
+
+--- src/vec.h.orig 2024-04-15 01:07:37.000000000 +0000
++++ src/vec.h
+@@ -30,6 +30,7 @@
+ #define VEC_H
+
+ #include "opus_types.h"
++#include "common.h"
+ #include <math.h>
+ #include "arch.h"
+ #include "x86/x86_arch_macros.h"
+@@ -41,8 +42,6 @@
+ #include "vec_neon.h"
+ #else
+
+-#include "os_support.h"
+-
+ #define MAX_INPUTS (2048)
+
+ #define NO_OPTIMIZATIONS
+@@ -50,7 +49,7 @@
+ static inline void sgemv16x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
+ {
+ int i, j;
+- OPUS_CLEAR(out, rows);
++ RNN_CLEAR(out, rows);
+ for (i=0;i<rows;i+=16)
+ {
+ for (j=0;j<cols;j++)
+@@ -84,7 +83,7 @@ static inline void sgemv16x1(float *out,
+ static inline void sgemv8x1(float *out, const float *weights, int rows, int cols, int col_stride, const float *x)
+ {
+ int i, j;
+- OPUS_CLEAR(out, rows);
++ RNN_CLEAR(out, rows);
+ for (i=0;i<rows;i+=8)
+ {
+ for (j=0;j<cols;j++)
+@@ -124,7 +123,7 @@ static inline void sgemv(float *out, con
+ static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x)
+ {
+ int i, j;
+- OPUS_CLEAR(out, rows);
++ RNN_CLEAR(out, rows);
+ for (i=0;i<rows;i+=8)
+ {
+ int cols;
Index: pkgsrc/audio/rnnoise/patches/patch-src_vec__avx.h
diff -u /dev/null pkgsrc/audio/rnnoise/patches/patch-src_vec__avx.h:1.1
--- /dev/null Mon Sep 2 16:04:24 2024
+++ pkgsrc/audio/rnnoise/patches/patch-src_vec__avx.h Mon Sep 2 16:04:24 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_vec__avx.h,v 1.1 2024/09/02 16:04:24 nia Exp $
+
+From: "Timothy B. Terriberry" <tterribe%xiph.org@localhost>
+Date: Mon, 15 Apr 2024 11:27:25 -0700
+Subject: [PATCH] Fix compilation errors.
+
+vec_avx.h needs x86cpu.h, and x86cpu.h needs to detect SSE2 (or
+ greater) without the Opus macros.
+Also, nobody was defining OPUS_CLEAR (but several things were
+ including the non-existent os_support.h where it is defined in
+ libopus), so replace those calls with RNN_CLEAR and remove the
+ erroneous includes.
+Take the opportunity to hoist OPUS_GNUC_PREREQ to common.h, too,
+ since it is needed in multiple places now.
+
+--- src/vec_avx.h.orig 2024-04-15 01:07:37.000000000 +0000
++++ src/vec_avx.h
+@@ -34,7 +34,7 @@
+
+ #include <immintrin.h>
+ #include <math.h>
+-/*#include "celt/x86/x86cpu.h"*/
++#include "x86/x86cpu.h"
+
+ #define MAX_INPUTS (2048)
+
Index: pkgsrc/audio/rnnoise/patches/patch-src_vec__neon.h
diff -u /dev/null pkgsrc/audio/rnnoise/patches/patch-src_vec__neon.h:1.1
--- /dev/null Mon Sep 2 16:04:24 2024
+++ pkgsrc/audio/rnnoise/patches/patch-src_vec__neon.h Mon Sep 2 16:04:24 2024
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_vec__neon.h,v 1.1 2024/09/02 16:04:24 nia Exp $
+
+From: "Timothy B. Terriberry" <tterribe%xiph.org@localhost>
+Date: Mon, 15 Apr 2024 11:27:25 -0700
+Subject: [PATCH] Fix compilation errors.
+
+vec_avx.h needs x86cpu.h, and x86cpu.h needs to detect SSE2 (or
+ greater) without the Opus macros.
+Also, nobody was defining OPUS_CLEAR (but several things were
+ including the non-existent os_support.h where it is defined in
+ libopus), so replace those calls with RNN_CLEAR and remove the
+ erroneous includes.
+Take the opportunity to hoist OPUS_GNUC_PREREQ to common.h, too,
+ since it is needed in multiple places now.
+
+--- src/vec_neon.h.orig 2024-04-15 01:07:37.000000000 +0000
++++ src/vec_neon.h
+@@ -32,7 +32,8 @@
+ #define VEC_NEON_H
+
+ #include <arm_neon.h>
+-#include "os_support.h"
++#include "opus_types.h"
++#include "common.h"
+
+ #if defined(__arm__) && !defined(__aarch64__) && (__ARM_ARCH < 8 || !defined(__clang__))
+ /* Emulate vcvtnq_s32_f32() for ARMv7 Neon. */
+@@ -302,7 +303,7 @@ static inline void sgemv(float *out, con
+ static inline void sparse_sgemv8x4(float *out, const float *w, const int *idx, int rows, const float *x)
+ {
+ int i, j;
+- OPUS_CLEAR(out, rows);
++ RNN_CLEAR(out, rows);
+ for (i=0;i<rows;i+=8)
+ {
+ int cols;
Index: pkgsrc/audio/rnnoise/patches/patch-src_x86_x86cpu.h
diff -u /dev/null pkgsrc/audio/rnnoise/patches/patch-src_x86_x86cpu.h:1.1
--- /dev/null Mon Sep 2 16:04:24 2024
+++ pkgsrc/audio/rnnoise/patches/patch-src_x86_x86cpu.h Mon Sep 2 16:04:24 2024
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_x86_x86cpu.h,v 1.1 2024/09/02 16:04:24 nia Exp $
+
+From: "Timothy B. Terriberry" <tterribe%xiph.org@localhost>
+Date: Mon, 15 Apr 2024 11:27:25 -0700
+Subject: [PATCH] Fix compilation errors.
+
+vec_avx.h needs x86cpu.h, and x86cpu.h needs to detect SSE2 (or
+ greater) without the Opus macros.
+Also, nobody was defining OPUS_CLEAR (but several things were
+ including the non-existent os_support.h where it is defined in
+ libopus), so replace those calls with RNN_CLEAR and remove the
+ erroneous includes.
+Take the opportunity to hoist OPUS_GNUC_PREREQ to common.h, too,
+ since it is needed in multiple places now.
+
+--- src/x86/x86cpu.h.orig 2024-04-15 01:07:37.000000000 +0000
++++ src/x86/x86cpu.h
+@@ -36,8 +36,8 @@
+ int opus_select_arch(void);
+ # endif
+
+-# if defined(OPUS_X86_MAY_HAVE_SSE2)
+-# include "opus_defines.h"
++# if defined(__SSE2__)
++# include "common.h"
+
+ /*MOVD should not impose any alignment restrictions, but the C standard does,
+ and UBSan will report errors if we actually make unaligned accesses.
Home |
Main Index |
Thread Index |
Old Index