Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Aug 2023 19:06:28 GMT
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 0897f2afd590 - 2023Q3 - audio/mumble: update to 1.5.517 and take maintainership
Message-ID:  <202308281906.37SJ6S99028891@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2023Q3 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0897f2afd59089d1cdaf8a7f1a15ff2a2b7c8c03

commit 0897f2afd59089d1cdaf8a7f1a15ff2a2b7c8c03
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2023-07-29 10:54:06 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2023-08-28 19:02:57 +0000

    audio/mumble: update to 1.5.517 and take maintainership
    
    Changelog: https://www.mumble.info/blog/mumble-1.5.517-rc/
    
    PR:                     261395
    Approved by:            arrowd (mentor)
    Differential Revision:  https://reviews.freebsd.org/D41047
    MFH:                    2023Q3
    
    (cherry picked from commit d055a8e8c80b70e3f826c46e038f5fd83919b290)
---
 audio/mumble/Makefile                              | 159 ++++++++++++---------
 audio/mumble/distinfo                              |  24 ++--
 audio/mumble/files/patch-overlay_gl-overlay.c      |  10 --
 audio/mumble/files/patch-qmake_builddir.pri        |  24 ----
 audio/mumble/files/patch-src-mumble-CELTCodec.cpp  |  10 --
 .../files/patch-src_SelfSignedCertificate.cpp      |  15 --
 audio/mumble/pkg-descr                             |   4 +-
 audio/mumble/pkg-plist                             |  19 +--
 8 files changed, 114 insertions(+), 151 deletions(-)

diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index 9ab6479d5e05..795513e38fc2 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -1,113 +1,136 @@
 PORTNAME=	mumble
-PORTVERSION=	1.3.3
-PORTREVISION=	10
+DISTVERSION=	1.5.517
 CATEGORIES=	audio
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Voice chat software primarily intended for use while gaming
-WWW=		http://mumble.sourceforge.net/
+WWW=		https://www.mumble.info/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS+=	libspeex.so:audio/speex \
+BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
+		${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libopus.so:audio/opus \
 		libspeexdsp.so:audio/speexdsp \
-		libsndfile.so:audio/libsndfile \
-		libboost_iostreams.so:devel/boost-libs \
-		libprotoc.so:devel/protobuf \
-		libopus.so:audio/opus
+		libpcre2-8.so:devel/pcre2 \
+		libPocoXML.so:devel/poco \
+		libPocoZip.so:devel/poco \
+		libprotobuf.so:devel/protobuf \
+		libexpat.so:textproc/expat2
 
-USES=		compiler:c++11-lang cpe desktop-file-utils gl gmake gnome pkgconfig python:build qmake qt:5 ssl xorg
-BROKEN_SSL=	openssl30 openssl31
-BROKEN_SSL_REASON=	Requires OpenSSL 3.0.0 deprecated CRYPTO_MEM_CHECK_ON
+USES=		cmake compiler:c++14-lang cpe desktop-file-utils gl \
+		pkgconfig python:build qmake qt:5 ssl xorg
 
-PATCHVERSION=	${PORTVERSION}
-MINORVERSION=	${PORTVERSION:R}
-MAJORVERSION=	${PORTVERSION:R:R}
+PATCHVERSION=	${DISTVERSION}
+MINORVERSION=	${DISTVERSION:R}
+MAJORVERSION=	${DISTVERSION:R:R}
 
 PLIST_SUB+=	PATCHVERSION="${PATCHVERSION}"
 PLIST_SUB+=	MINORVERSION="${MINORVERSION}"
 PLIST_SUB+=	MAJORVERSION="${MAJORVERSION}"
 
-USE_CXXSTD=	c++11
+USE_CXXSTD=	c++14
 USE_GITHUB=	yes
-GH_TUPLE=	mumble-voip:mumble:${DISTVERSION} \
-		mumble-voip:celt-0.7.0:5a16cda:mumble_celt_0_7/3rdparty/celt-0.7.0-src \
-		mumble-voip:celt-0.11.0:e18de77:mumble_celt_0_11/3rdparty/celt-0.11.0-src \
+GH_TUPLE=	mumble-voip:mumble:v${DISTVERSION} \
+		Krzmbrzl:FindPythonInterpreter:bb4d3ea:mumble_FindPythonInterpreter/3rdparty/FindPythonInterpreter \
+		microsoft:GSL:0f6dbc9:mumble_gsl/3rdparty/gsl \
 		mumble-voip:mach_override:919148f:mumble_mach_override/3rdparty/mach-override-src \
-		mumble-voip:minhook:5e338f8:mumble_minhook/3rdparty/minhook-src \
-		mumble-voip:rnnoise:b30f2bb:mumble_rnnoise/3rdparty/rnnoise-src \
-		mumble-voip:sbcelt:045493d:mumble_sbcelt/3rdparty/sbcelt-src \
-		mumble-voip:mumble-theme:9467fe8:mumble_theme/themes/Mumble
+		mumble-voip:minhook:5e338f8:mumble_minhook/3rdparty/minhook \
+		mumble-voip:speexdsp:6e4634f:mumble_speexdsp/3rdparty/speexdsp \
+		wolfpld:tracy:1a4f369:mumble_tracy/3rdparty/tracy
 
-USE_QT=		buildtools:build core gui l10n linguist:build network opengl sql sql-sqlite3:run svg widgets xml
+USE_QT=		buildtools:build concurrent core gui l10n linguist:build network \
+		sql sql-sqlite3:run svg widgets xml
 USE_LDCONFIG=	yes
 
-USE_XORG=	ice xi x11
+USE_XORG=	x11 xext xi
 USE_GL=		gl
 
-CONFIG=		bundled-celt bundled-rnnoise no-bundled-opus no-bundled-speex no-bundled-speexdsp \
-		no-embed-qt-translations no-g15 no-server no-update
+CMAKE_ON=	bundled-gsl client oss overlay overlay-xcompile plugins \
+		translations xinput2
+CMAKE_OFF=	bundled-json bundle-qt-translations bundled-speex crash-report \
+		g15 server tracy update
 
-QMAKE_ARGS=	"CONFIG+=${CONFIG}"
+OPTIONS_DEFINE=		ALSA AVAHI DBUS JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RNNOISE
+OPTIONS_DEFAULT=	DBUS LTO
+OPTIONS_RADIO=		SPEECH
+OPTIONS_RADIO_SPEECH=	QTSPEECH SPEECHD
 
-OPTIONS_DEFINE=	ALSA DBUS BONJOUR JACK PORTAUDIO PULSEAUDIO SPEECHD
-OPTIONS_DEFAULT=	DBUS
+QTSPEECH_DESC=		Use Qt's text-to-speech system
+RNNOISE_DESC=		Use RNNoise for machine learning noise reduction
+SPEECH_DESC=		Support text-to-speech
+SPEECHD_DESC=		Support for Speech Dispatcher
 
-ALSA_VARS_OFF=		CONFIG+=no-alsa
+ALSA_CMAKE_BOOL=	alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 
-DBUS_VARS_OFF=		CONFIG+=no-dbus
-DBUS_USE=		QT=dbus
+AVAHI_CMAKE_BOOL=	zeroconf
+AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
 
-BONJOUR_DESC=		Bonjour support
-BONJOUR_VARS_OFF=	CONFIG+=no-bonjour
-BONJOUR_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
+DBUS_USE=		QT=dbus
+DBUS_CMAKE_BOOL=	dbus
 
-JACK_VARS_OFF=		CONFIG+=no-jackaudio
+JACK_CMAKE_BOOL=	jackaudio
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 
-PORTAUDIO_VARS_OFF=	CONFIG+=no-portaudio
+LTO_CMAKE_BOOL=		lto
+
+PIPEWIRE_CMAKE_BOOL=	pipewire
+PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
+
+PORTAUDIO_CMAKE_BOOL=	portaudio
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
-PULSEAUDIO_VARS_OFF=	CONFIG+=no-pulseaudio
+PULSEAUDIO_CMAKE_BOOL=	pulseaudio
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
-SPEECHD_DESC=		Support for Speech Dispatcher
-SPEECHD_VARS_OFF=	CONFIG+=no-speechd
-SPEECHD_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
-
-CONFIGURE_ENV+=	MUMBLE_PYTHON=${PYTHON_CMD}
+QTSPEECH_USES=		qt:5
+QTSPEECH_USE=		QT=speech
+QTSPEECH_CMAKE_BOOL=	qtspeech
 
-.include <bsd.port.pre.mk>
+RNNOISE_CMAKE_BOOL=	rnnoise
+RNNOISE_CMAKE_ON=	-Dbundled-rnnoise:BOOL=off
+RNNOISE_LIB_DEPENDS=	librnnoise.so:audio/rnnoise
 
-# PCH is broken on GCC
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-CONFIG+=	no-pch
-.endif
+SPEECHD_USES=		gettext-runtime gnome
+SPEECHD_USE=		GNOME=glib20
+SPEECHD_CMAKE_BOOL=	speechd
+SPEECHD_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
 
-MAKE_JOBS_UNSAFE=yes
+CONFIGURE_ENV+=		MUMBLE_PYTHON=${PYTHON_CMD}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
-	@${REINPLACE_CMD} -e 's|--no-add-needed|--no-copy-dt-needed-entries|' ${WRKSRC}/qmake/compiler.pri
-	@${RM} ${WRKSRC}/plugins/manual/.qmake.cache
+.include <bsd.port.pre.mk>
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.7.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0
-	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.11.0
-	${INSTALL_LIB} ${WRKSRC}/release/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION}
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${MAJORVERSION}
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${MINORVERSION}
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/services
-	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${STAGEDIR}${PREFIX}/share/services
-	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${STAGEDIR}${PREFIX}/share/applications
+	${INSTALL_PROGRAM} ${WRKDIR}/.build/mumble ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${WRKDIR}/.build/libmumbleoverlay.x86_64.so.${MINORVERSION}.0 \
+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION}
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} \
+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} \
+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${MAJORVERSION}
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} \
+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${MINORVERSION}
+	${INSTALL_LIB} ${WRKDIR}/.build/libmumbleoverlay.x86.so.${MINORVERSION}.0 \
+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION}
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} \
+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} \
+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${MAJORVERSION}
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} \
+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${MINORVERSION}
+	${INSTALL_DATA} ${WRKDIR}/.build/auxiliary_files/info.mumble.Mumble.desktop \
+			${STAGEDIR}${PREFIX}/share/applications/mumble.desktop
 	${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
-	${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.installer.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
-	${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
-	${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${STAGEDIR}${MANPREFIX}/man/man1/mumble.1
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
+	${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg \
+			${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
+	${INSTALL_DATA} ${WRKSRC}/icons/mumble_256x256.png \
+			${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/mumble.png
+	${INSTALL_MAN} ${WRKSRC}/auxiliary_files/man_files/mumble.1 \
+			${STAGEDIR}${MANPREFIX}/share/man/man1/mumble.1
 
 .include <bsd.port.post.mk>
diff --git a/audio/mumble/distinfo b/audio/mumble/distinfo
index 455e845edd1a..38986e9722ca 100644
--- a/audio/mumble/distinfo
+++ b/audio/mumble/distinfo
@@ -1,17 +1,15 @@
-TIMESTAMP = 1602265872
-SHA256 (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 53a555092a03af2e6025c641bb748f013e1cfa8f61899a686bed8690439f36c7
-SIZE (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 4895708
-SHA256 (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = fbfdbb0767d9d67ea29270eb3e5e999eec6f7f3720a870e74776be426b10b53a
-SIZE (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = 182631
-SHA256 (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = b522482222c40c1f05ce9b6c4d19a05e8419a7850398dbbdea5854b78eadfd4a
-SIZE (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = 212833
+TIMESTAMP = 1690555998
+SHA256 (mumble-voip-mumble-1.5.517-v1.5.517_GH0.tar.gz) = f7ea7c8f5267fa8f744a7622bb96ad373ee40c6458b9ce01d81d071898f6a6da
+SIZE (mumble-voip-mumble-1.5.517-v1.5.517_GH0.tar.gz) = 6120684
+SHA256 (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 8439bfe7daeb478d8e8aa09b3c111c3dc360064144d181fc5dcfef950e8eaa05
+SIZE (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 4817
+SHA256 (microsoft-GSL-0f6dbc9_GH0.tar.gz) = 63d53ed611862f90517048db57617d8264200810a1e9fbb7ff9a524747f8dab3
+SIZE (microsoft-GSL-0f6dbc9_GH0.tar.gz) = 78207
 SHA256 (mumble-voip-mach_override-919148f_GH0.tar.gz) = 81b2e705a7cce1e3a9eb440cb2bca2f14fd83db162123f44faf17f0bf45da1bd
 SIZE (mumble-voip-mach_override-919148f_GH0.tar.gz) = 66278
 SHA256 (mumble-voip-minhook-5e338f8_GH0.tar.gz) = bc675c5b9def1fcef4b58c62e6d69eaa6e76d2fed89ace681059a7648e808033
 SIZE (mumble-voip-minhook-5e338f8_GH0.tar.gz) = 27651
-SHA256 (mumble-voip-rnnoise-b30f2bb_GH0.tar.gz) = 68ce21e49a0af3d06d87d27665d9a2102c249e4e5e91f777e47139d8707aeb6d
-SIZE (mumble-voip-rnnoise-b30f2bb_GH0.tar.gz) = 171240
-SHA256 (mumble-voip-sbcelt-045493d_GH0.tar.gz) = dc9bdcc26a3642cb7ead98cb487c9a52225228fbbfa6f75906d9e479e11b862a
-SIZE (mumble-voip-sbcelt-045493d_GH0.tar.gz) = 20128
-SHA256 (mumble-voip-mumble-theme-9467fe8_GH0.tar.gz) = 4ac062686b75f8ea558a4d92df205e51c1d4c1b5676a28b656b8664fc56470db
-SIZE (mumble-voip-mumble-theme-9467fe8_GH0.tar.gz) = 378261
+SHA256 (mumble-voip-speexdsp-6e4634f_GH0.tar.gz) = f596d946feeffc66ad2f8a5886945019d79a1a45f3e9c1a1191b4faabb0e84ea
+SIZE (mumble-voip-speexdsp-6e4634f_GH0.tar.gz) = 895204
+SHA256 (wolfpld-tracy-1a4f369_GH0.tar.gz) = b1fbb7b8ec38c58addd97f9cd6d17e879ecab9bfc184751297ce2162a6b8d008
+SIZE (wolfpld-tracy-1a4f369_GH0.tar.gz) = 4633541
diff --git a/audio/mumble/files/patch-overlay_gl-overlay.c b/audio/mumble/files/patch-overlay_gl-overlay.c
deleted file mode 100644
index ecf013714ec0..000000000000
--- a/audio/mumble/files/patch-overlay_gl-overlay.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- overlay_gl/overlay.c.orig	2019-03-13 18:38:10 UTC
-+++ overlay_gl/overlay.c
-@@ -16,6 +16,7 @@
- #include <sys/ipc.h>
- #include <sys/time.h>
- #include <sys/socket.h>
-+#include <sys/stat.h>
- #include <sys/un.h>
- #include <sys/stat.h>
- #include <time.h>
diff --git a/audio/mumble/files/patch-qmake_builddir.pri b/audio/mumble/files/patch-qmake_builddir.pri
deleted file mode 100644
index 0dddeb677773..000000000000
--- a/audio/mumble/files/patch-qmake_builddir.pri
+++ /dev/null
@@ -1,24 +0,0 @@
---- qmake/builddir.pri.orig	2019-10-20 18:28:58 UTC
-+++ qmake/builddir.pri
-@@ -33,20 +33,7 @@ isEmpty(TOP_BUILDDIR) {
-   TOP_BUILDDIR = $$TOP_SRCDIR
- }
- 
--# If the build and source paths are equal,
--# it's not a shadow build.
--equals(TOP_BUILDDIR, $$TOP_SRCDIR) {
--  CONFIG(debug, debug|release) {
--    DESTDIR = $$TOP_BUILDDIR/debug
--  }
--
--  CONFIG(release, debug|release) {
--    DESTDIR = $$TOP_BUILDDIR/release
--  }
--} else {
--  DESTDIR = $$TOP_BUILDDIR
--}
--
-+DESTDIR = $$TOP_BUILDDIR/release
- OBJECTS_ROOT = $$DESTDIR/.obj
- MOC_ROOT = $$DESTDIR/.moc
- RCC_ROOT = $$DESTDIR/.qrc
diff --git a/audio/mumble/files/patch-src-mumble-CELTCodec.cpp b/audio/mumble/files/patch-src-mumble-CELTCodec.cpp
deleted file mode 100644
index e488d3dc8a3f..000000000000
--- a/audio/mumble/files/patch-src-mumble-CELTCodec.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mumble/CELTCodec.cpp.orig	2019-03-20 19:21:57 UTC
-+++ src/mumble/CELTCodec.cpp
-@@ -40,6 +40,7 @@ CELTCodec::CELTCodec(const QString &celt_version) {
- 	alternatives << QString::fromLatin1("libcelt0.so.%1").arg(celt_version);
- 	alternatives << QString::fromLatin1("libcelt.so.%1").arg(celt_version);
- 	alternatives << QString::fromLatin1("celt.so.%1").arg(celt_version);
-+	alternatives << QString::fromLatin1("libcelt-mumble.so.%1").arg(celt_version);
- #else
- 	int cpuinfo[4];
- 	__cpuid(cpuinfo, 1);
diff --git a/audio/mumble/files/patch-src_SelfSignedCertificate.cpp b/audio/mumble/files/patch-src_SelfSignedCertificate.cpp
deleted file mode 100644
index 354788be773f..000000000000
--- a/audio/mumble/files/patch-src_SelfSignedCertificate.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/SelfSignedCertificate.cpp.orig	2023-06-10 11:50:34 UTC
-+++ src/SelfSignedCertificate.cpp
-@@ -45,10 +45,12 @@ bool SelfSignedCertificate::generate(CertificateType c
- 	QString commonName;
- 	bool isServerCert = certificateType == CertificateTypeServerCertificate;
- 
-+#ifdef CRYPTO_MEM_CHECK_ON
- 	if (CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) == -1) {
- 		ok = false;
- 		goto out;
- 	}
-+#endif
- 
- 	x509 = X509_new();
- 	if (x509 == NULL) {
diff --git a/audio/mumble/pkg-descr b/audio/mumble/pkg-descr
index faece3676d5b..70822a4925d4 100644
--- a/audio/mumble/pkg-descr
+++ b/audio/mumble/pkg-descr
@@ -1,2 +1,2 @@
-Mumble is an open source, low-latency, high quality voice chat software
-primarily intended for use while gaming.
+Mumble is a free, open source, low latency, high quality voice chat
+application primarily intended for use while gaming.
diff --git a/audio/mumble/pkg-plist b/audio/mumble/pkg-plist
index 62bc02f06865..752646ef3d9a 100644
--- a/audio/mumble/pkg-plist
+++ b/audio/mumble/pkg-plist
@@ -1,13 +1,14 @@
 bin/mumble
-lib/libcelt-mumble.so.0.11.0
-lib/libcelt-mumble.so.0.7.0
-lib/libmumble.so
-lib/libmumble.so.%%MAJORVERSION%%
-lib/libmumble.so.%%MINORVERSION%%
-lib/libmumble.so.%%PATCHVERSION%%
-man/man1/mumble.1.gz
+lib/libmumbleoverlay.x86_64.so
+lib/libmumbleoverlay.x86_64.so.%%MAJORVERSION%%
+lib/libmumbleoverlay.x86_64.so.%%MINORVERSION%%
+lib/libmumbleoverlay.x86_64.so.%%PATCHVERSION%%
+lib/libmumbleoverlay.x86.so
+lib/libmumbleoverlay.x86.so.%%MAJORVERSION%%
+lib/libmumbleoverlay.x86.so.%%MINORVERSION%%
+lib/libmumbleoverlay.x86.so.%%PATCHVERSION%%
 share/applications/mumble.desktop
-share/icons/hicolor/128x128/apps/mumble.png
+share/icons/hicolor/256x256/apps/mumble.png
 share/icons/hicolor/scalable/apps/mumble.svg
+share/man/man1/mumble.1.gz
 share/pixmaps/mumble.xpm
-share/services/mumble.protocol



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308281906.37SJ6S99028891>