Date: Sat, 30 Mar 2024 15:30:26 GMT From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7f16d732f526 - main - audio/mumble: update to 1.5.613 Message-ID: <202403301530.42UFUQuR046355@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f16d732f52630bd355e77aab4a0814325e09e6b commit 7f16d732f52630bd355e77aab4a0814325e09e6b Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2024-03-30 15:24:51 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-03-30 15:24:51 +0000 audio/mumble: update to 1.5.613 Upstream removed option for build without DBus even for mumble-server. Changelog: https://www.mumble.info/blog/mumble-1.5.613-rc-2 Approved by: arrowd (mentor, implicit) --- audio/mumble/Makefile | 16 ++++--------- audio/mumble/distinfo | 10 +++----- audio/mumble/files/patch-protobuf | 11 --------- audio/mumble/files/patch-src__mumble__OSS.cpp | 33 ++++++++------------------- 4 files changed, 17 insertions(+), 53 deletions(-) diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile index e9243566cda8..ed4802b5337f 100644 --- a/audio/mumble/Makefile +++ b/audio/mumble/Makefile @@ -1,13 +1,8 @@ PORTNAME= mumble -DISTVERSION= 1.5.517 -PORTREVISION= 5 +DISTVERSION= 1.5.613 CATEGORIES= audio MASTER_SITES= https://github.com/${PORTNAME}-voip/${PORTNAME}/releases/download/v${DISTVERSION}/ -PATCH_SITES= https://github.com/${PORTNAME}-voip/${PORTNAME}/commit/ -PATCHFILES= 952dfaf4983097d7b9c9b5d9f5b01ffeb6d3463d.patch:-p1 # Fix detection of unbundled GSL -PATCHFILES+= 589bfbfd634925b47b3a812745bc5a423b7f4285.patch:-p1 # Install 32-bit lib on FreeBSD - MAINTAINER= vvd@FreeBSD.org COMMENT= Voice chat software primarily intended for use while gaming WWW= https://www.mumble.info/ @@ -32,22 +27,22 @@ 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 gui l10n linguist:build network \ +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_ON= client oss overlay plugins translations xinput2 CMAKE_OFF= bundled-gsl bundled-json bundle-qt-translations bundled-speex \ crash-report g15 server tracy update +CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 CONFIGURE_ENV= MUMBLE_PYTHON=${PYTHON_CMD} CXXFLAGS+= -Wno-deprecated-declarations PLIST_SUB= MUMBLE_VERSION="${DISTVERSION:R}" -OPTIONS_DEFINE= ALSA AVAHI DBUS JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RNNOISE +OPTIONS_DEFINE= ALSA AVAHI JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RNNOISE OPTIONS_DEFINE_amd64= OVERLAY_32BIT -OPTIONS_DEFAULT= DBUS OPTIONS_DEFAULT_amd64= OVERLAY_32BIT OPTIONS_RADIO= SPEECH OPTIONS_RADIO_SPEECH= QTSPEECH SPEECHD @@ -64,9 +59,6 @@ ALSA_CMAKE_BOOL= alsa AVAHI_LIB_DEPENDS= libdns_sd.so:net/avahi-libdns AVAHI_CMAKE_BOOL= zeroconf -DBUS_USE= QT=dbus -DBUS_CMAKE_BOOL= dbus - JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_BOOL= jackaudio diff --git a/audio/mumble/distinfo b/audio/mumble/distinfo index 11cda2f86fdd..5a6118f3a1f5 100644 --- a/audio/mumble/distinfo +++ b/audio/mumble/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1705577723 -SHA256 (mumble-1.5.517.tar.gz) = 8efd06a0f47ebfe27735f7575ba0becfb21d0f400a5082202dbbd998ab8351de -SIZE (mumble-1.5.517.tar.gz) = 12091432 -SHA256 (952dfaf4983097d7b9c9b5d9f5b01ffeb6d3463d.patch) = 3316fd3cab0d797d78fa34df358892699db0bde6c45c61a87f095e514c2e5575 -SIZE (952dfaf4983097d7b9c9b5d9f5b01ffeb6d3463d.patch) = 1138 -SHA256 (589bfbfd634925b47b3a812745bc5a423b7f4285.patch) = acd9f69856df9218c5a5e6eb8a70eaec3ae7bca0ce1c1f7c59e955db638523cf -SIZE (589bfbfd634925b47b3a812745bc5a423b7f4285.patch) = 923 +TIMESTAMP = 1711719590 +SHA256 (mumble-1.5.613.tar.gz) = 157d8f4bbcc0f1d91a4795927fb30bdadf196da6fbff216b8eb0c5b2e0e0f746 +SIZE (mumble-1.5.613.tar.gz) = 21415705 diff --git a/audio/mumble/files/patch-protobuf b/audio/mumble/files/patch-protobuf deleted file mode 100644 index 765ca8ee3f39..000000000000 --- a/audio/mumble/files/patch-protobuf +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2023-01-18 06:54:18 UTC -+++ CMakeLists.txt -@@ -37,7 +37,7 @@ project(Mumble - set(3RDPARTY_DIR "${CMAKE_SOURCE_DIR}/3rdparty") - set(PLUGINS_DIR "${CMAKE_SOURCE_DIR}/plugins") - --set(CMAKE_CXX_STANDARD 14) -+set(CMAKE_CXX_STANDARD 17) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) - - list(APPEND CMAKE_MODULE_PATH diff --git a/audio/mumble/files/patch-src__mumble__OSS.cpp b/audio/mumble/files/patch-src__mumble__OSS.cpp index ac8e05ab5bff..73040cad1d11 100644 --- a/audio/mumble/files/patch-src__mumble__OSS.cpp +++ b/audio/mumble/files/patch-src__mumble__OSS.cpp @@ -1,6 +1,6 @@ ---- src/mumble/OSS.cpp.orig 2019-08-30 01:01:56 UTC +--- src/mumble/OSS.cpp.orig 2024-03-03 17:26:27 UTC +++ src/mumble/OSS.cpp -@@ -130,7 +130,6 @@ OSSEnumerator::OSSEnumerator() { +@@ -128,7 +128,6 @@ OSSEnumerator::OSSEnumerator() { qhOutput.insert(QString(), QLatin1String("Default OSS Device")); qhDevices.insert(QString(), QLatin1String("/dev/dsp")); @@ -8,7 +8,7 @@ int mixerfd = open("/dev/mixer", O_RDWR, 0); if (mixerfd == -1) { qWarning("OSSEnumerator: Failed to open /dev/mixer"); -@@ -159,15 +158,14 @@ OSSEnumerator::OSSEnumerator() { +@@ -157,15 +156,14 @@ OSSEnumerator::OSSEnumerator() { if (ainfo.caps & PCM_CAP_HIDDEN) continue; @@ -27,39 +27,26 @@ } OSSInput::OSSInput() { -@@ -198,20 +196,23 @@ void OSSInput::run() { +@@ -212,12 +210,14 @@ void OSSInput::run() { ival = AFMT_S16_NE; if ((ioctl(fd, SNDCTL_DSP_SETFMT, &ival) == -1) || (ival != AFMT_S16_NE)) { qWarning("OSSInput: Failed to set sound format"); -- goto out; + close(fd); -+ return; + return; } ival = 1; if ((ioctl(fd, SNDCTL_DSP_CHANNELS, &ival) == -1)) { qWarning("OSSInput: Failed to set mono mode"); -- goto out; + close(fd); -+ return; + return; } - iMicChannels = ival; - + iMicChannels = static_cast< unsigned int >(ival); +@@ -225,6 +225,7 @@ void OSSInput::run() { ival = SAMPLE_RATE; if (ioctl(fd, SNDCTL_DSP_SPEED, &ival) == -1) { qWarning("OSSInput: Failed to set speed"); -- goto out; + close(fd); -+ return; + return; } - iMicFreq = ival; - -@@ -235,8 +236,6 @@ void OSSInput::run() { - qWarning("OSSInput: Releasing."); - ioctl(fd, SNDCTL_DSP_RESET, NULL); - --out: -- close(fd); - } - - OSSOutput::OSSOutput() { + iMicFreq = static_cast< unsigned int >(ival);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403301530.42UFUQuR046355>