diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile index f68919e2763f..4d4c48dc482b 100644 --- a/audio/mumble/Makefile +++ b/audio/mumble/Makefile @@ -1,105 +1,104 @@ PORTNAME= mumble -DISTVERSION= 1.5.634 -PORTREVISION= 8 +DISTVERSION= 1.5.735 CATEGORIES= audio MASTER_SITES= https://github.com/${PORTNAME}-voip/${PORTNAME}/releases/download/v${DISTVERSION}/ MAINTAINER= vvd@FreeBSD.org COMMENT= Voice chat software primarily intended for use while gaming WWW= https://www.mumble.info/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ microsoft-gsl>=3.0.0:devel/microsoft-gsl \ ${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json LIB_DEPENDS= libsndfile.so:audio/libsndfile \ libopus.so:audio/opus \ libspeexdsp.so:audio/speexdsp \ libabsl_base.so:devel/abseil \ libpcre2-8.so:devel/pcre2 \ libPocoXML.so:devel/poco \ libPocoZip.so:devel/poco \ libprotobuf.so:devel/protobuf \ libexpat.so:textproc/expat2 USES= cmake compiler:c++17-lang cpe desktop-file-utils \ pkgconfig python:build qt:5 ssl xorg USE_CXXSTD= c++17 USE_LDCONFIG= yes USE_QT= buildtools:build concurrent core dbus gui l10n linguist:build network \ qmake:build sql sql-sqlite3:run svg widgets xml USE_XORG= x11 xext xi CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 CMAKE_ON= client oss overlay plugins translations xinput2 CMAKE_OFF= bundled-gsl bundled-json bundle-qt-translations bundled-speex \ crash-report g15 server tracy update CONFIGURE_ENV= MUMBLE_PYTHON=${PYTHON_CMD} CXXFLAGS+= -Wno-deprecated-declarations PLIST_SUB= MUMBLE_VERSION="${DISTVERSION:R}" OPTIONS_DEFINE= ALSA AVAHI JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RENAMENOISE OPTIONS_DEFINE_amd64= OVERLAY_32BIT OPTIONS_DEFAULT= RENAMENOISE OPTIONS_DEFAULT_amd64= OVERLAY_32BIT OPTIONS_RADIO= SPEECH OPTIONS_RADIO_SPEECH= QTSPEECH SPEECHD OVERLAY_32BIT_DESC= Build and install 32bit overlay module QTSPEECH_DESC= Use Qt's text-to-speech system RENAMENOISE_DESC= Use ReNameNoise for machine learning noise reduction SPEECHD_DESC= Support for Speech Dispatcher SPEECH_DESC= Support text-to-speech ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= alsa AVAHI_LIB_DEPENDS= libdns_sd.so:net/avahi-libdns AVAHI_CMAKE_BOOL= zeroconf JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_BOOL= jackaudio LTO_BROKEN= "QWidget: Cannot create a QWidget without QApplication": \ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273078 LTO_CMAKE_BOOL= lto OVERLAY_32BIT_CMAKE_BOOL= overlay-xcompile PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PIPEWIRE_CMAKE_BOOL= pipewire PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_CMAKE_BOOL= portaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= pulseaudio QTSPEECH_USE= QT=speech QTSPEECH_CMAKE_BOOL= qtspeech RENAMENOISE_CMAKE_BOOL= bundled-renamenoise renamenoise SPEECHD_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher SPEECHD_USES= gettext-runtime gnome SPEECHD_USE= GNOME=glib20 SPEECHD_CMAKE_BOOL= speechd .include .if ${PORT_OPTIONS:MOVERLAY_32BIT} . if ${ARCH} == amd64 PLIST_SUB+= OVERLAY_32BIT="" PLIST_SUB+= OVERLAY_32BIT_SUFFIX=.x86 PLIST_SUB+= OVERLAY_NATIVE_SUFFIX=.x86_64 . endif .else PLIST_SUB+= OVERLAY_32BIT="@comment " PLIST_SUB+= OVERLAY_NATIVE_SUFFIX="" .endif .include diff --git a/audio/mumble/distinfo b/audio/mumble/distinfo index b43ce7981b85..e4ccc9f88981 100644 --- a/audio/mumble/distinfo +++ b/audio/mumble/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716672642 -SHA256 (mumble-1.5.634.tar.gz) = 904f3633d28ab0e6925caeff2c65802f586abefdf6d20162f20a71805c2c5929 -SIZE (mumble-1.5.634.tar.gz) = 26001230 +TIMESTAMP = 1736001274 +SHA256 (mumble-1.5.735.tar.gz) = db8990079f556a877218d471bcf2c24eb5e4520b652f3c20793d0aadedaae6ae +SIZE (mumble-1.5.735.tar.gz) = 26010842 diff --git a/audio/mumble/files/patch-src_MumbleProtocol.cpp b/audio/mumble/files/patch-src_MumbleProtocol.cpp deleted file mode 100644 index 2f05950b011a..000000000000 --- a/audio/mumble/files/patch-src_MumbleProtocol.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/MumbleProtocol.cpp.orig 2024-03-03 17:26:27 UTC -+++ src/MumbleProtocol.cpp -@@ -781,7 +781,7 @@ namespace Protocol { - } - - -- m_audioData.payload = gsl::span< byte >(payloadBegin, payloadSize); -+ m_audioData.payload = gsl::span< byte >(payloadBegin, static_cast< size_t >(payloadSize)); - - if (stream.left() == 3 * sizeof(float)) { - // If there are further bytes after the audio payload, this means that there is positional data attached to diff --git a/audio/mumble/files/patch-src_mumble_Audio.cpp b/audio/mumble/files/patch-src_mumble_Audio.cpp deleted file mode 100644 index 5d7719c14c7c..000000000000 --- a/audio/mumble/files/patch-src_mumble_Audio.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mumble/Audio.cpp.orig 2024-03-03 17:26:27 UTC -+++ src/mumble/Audio.cpp -@@ -43,7 +43,7 @@ void LoopUser::addFrame(const Mumble::Protocol::AudioD - QMutexLocker l(&qmLock); - bool restart = (qetLastFetch.elapsed() > 100); - -- long time = qetTicker.elapsed(); -+ long long time = qetTicker.elapsed(); - - float r; - if (restart) diff --git a/audio/mumble/files/patch-src_mumble_AudioOutput.cpp b/audio/mumble/files/patch-src_mumble_AudioOutput.cpp deleted file mode 100644 index 04aaaa44bbb3..000000000000 --- a/audio/mumble/files/patch-src_mumble_AudioOutput.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- src/mumble/AudioOutput.cpp.orig 2024-03-03 17:26:27 UTC -+++ src/mumble/AudioOutput.cpp -@@ -617,11 +617,11 @@ bool AudioOutput::mix(void *outbuff, unsigned int fram - // Mix down stereo to mono. TODO: stereo record support - // frame: for a stereo stream, the [LR] pair inside ...[LR]LRLRLR.... is a frame - for (unsigned int i = 0; i < frameCount; ++i) { -- recbuff[i] += (pfBuffer[2 * i] / 2.0f + pfBuffer[2 * i + 1] / 2.0f) * volumeAdjustment; -+ recbuff[static_cast< int >(i)] += (pfBuffer[2 * i] / 2.0f + pfBuffer[2 * i + 1] / 2.0f) * volumeAdjustment; - } - } else { - for (unsigned int i = 0; i < frameCount; ++i) { -- recbuff[i] += pfBuffer[i] * volumeAdjustment; -+ recbuff[static_cast< int >(i)] += pfBuffer[i] * volumeAdjustment; - } - } -