Enable RNNoise now that audio/rnnoise exists

Tested by me
OK rsadowski
This commit is contained in:
kn 2021-12-15 22:25:39 +00:00
parent 3f124e7179
commit 92da9d7051
2 changed files with 21 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.56 2021/11/22 13:55:54 espie Exp $
# $OpenBSD: Makefile,v 1.57 2021/12/15 22:25:39 kn Exp $
COMMENT-main = low-latency voice chat client
COMMENT-server = low-latency voice chat server
@ -7,6 +7,7 @@ VERSION = 1.3.4
DISTNAME = mumble-${VERSION}
PKGNAME-server = murmur-${VERSION}
REVISION-main = 0
REVISION-server = 0
CATEGORIES = audio net
@ -22,7 +23,7 @@ MAINTAINER = Klemens Nanni <kn@openbsd.org>
WANTLIB-main += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Network
WANTLIB-main += Qt5Sql Qt5Svg Qt5Widgets Qt5Xml X11 Xi c crypto
WANTLIB-main += m opus portaudio protobuf sndfile speex speexdsp ssl
WANTLIB-main += m opus portaudio protobuf rnnoise sndfile speex speexdsp ssl
WANTLIB-server += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Network Qt5Sql
WANTLIB-server += Qt5Xml c crypto m protobuf ssl
@ -37,6 +38,7 @@ BUILD_DEPENDS = devel/boost
LIB_DEPENDS-main = audio/libsndfile>=1.0.25p0 \
audio/opus \
audio/portaudio-svn \
audio/rnnoise \
audio/speex \
devel/protobuf \
x11/qt5/qtsvg
@ -55,6 +57,7 @@ MODQMAKE_ARGS = MUMBLE_PREFIX=${PREFIX} \
CONFIG+=no-ice \
CONFIG+=no-bonjour \
CONFIG+=no-bundled-opus \
CONFIG+=no-bundled-rnnoise \
CONFIG+=no-bundled-speex \
CONFIG+=no-crash-report \
CONFIG+=no-embed-qt-translations \

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_mumble_AudioInput_cpp,v 1.1 2021/12/15 22:25:39 kn Exp $
a8e0797f5 "FIX(client): Update rnnoise-src submodule"; remove with next update
Index: src/mumble/AudioInput.cpp
--- src/mumble/AudioInput.cpp.orig
+++ src/mumble/AudioInput.cpp
@@ -106,7 +106,7 @@ AudioInput::AudioInput() : opusBuffer(g.s.iFramesPerPa
#endif
#ifdef USE_RNNOISE
- denoiseState = rnnoise_create();
+ denoiseState = rnnoise_create(nullptr);
#endif
qWarning("AudioInput: %d bits/s, %d hz, %d sample", iAudioQuality, iSampleRate, iFrameSize);