Attachment #244191 for bug #273203

View | Details | Raw Unified | Return to bug 273203 | Differences between
Collapse All | Expand All




PORTNAME=	mumble
DISTVERSION=	1.5.517
PORTREVISION=	3
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

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 \

		libexpat.so:textproc/expat2

USES=		cmake compiler:c++14-lang cpe desktop-file-utils gl \
		pkgconfig python:build qt:5 shebangfix ssl xorg

PATCHVERSION=	${DISTVERSION}
MINORVERSION=	${DISTVERSION:R}
MAJORVERSION=	${DISTVERSION:R:R}

PLIST_SUB+=	PATCHVERSION="${PATCHVERSION}"
PLIST_SUB+=	MINORVERSION="${MINORVERSION}"
PLIST_SUB+=	MAJORVERSION="${MAJORVERSION}"

USE_CXXSTD=	c++14
USE_GL=		gl
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 \
		mumble-voip:speexdsp:6e4634f:mumble_speexdsp/3rdparty/speexdsp \
		wolfpld:tracy:1a4f369:mumble_tracy/3rdparty/tracy

USE_QT=		buildtools:build concurrent core gui l10n linguist:build network \
		sql sql-sqlite3:run svg widgets xml
USE_LDCONFIG=	yes
USE_QT=		buildtools:build concurrent core gui l10n linguist:build network \
		qmake:build sql sql-sqlite3:run svg widgets xml
USE_XORG=	x11 xext xi
USE_GL=		gl

SHEBANG_FILES=	auxiliary_files/run_scripts/mumble-overlay.in
bash_CMD=	${SH}

CMAKE_ARGS=	-DBUILD_NUMBER=${DISTVERSION:E}
CMAKE_ON=	client oss overlay plugins \
		translations xinput2
CMAKE_OFF=	bundled-json bundled-gsl bundle-qt-translations bundled-speex \
		crash-report g15 server tracy update

CONFIGURE_ENV=	MUMBLE_PYTHON=${PYTHON_CMD}

PLIST_SUB=	MUMBLE_VERSION="${DISTVERSION}"

OPTIONS_DEFINE=		ALSA AVAHI DBUS JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RNNOISE
OPTIONS_DEFAULT=	DBUS

SPEECH_DESC=		Support text-to-speech
SPEECHD_DESC=		Support for Speech Dispatcher

ALSA_CMAKE_BOOL=	alsa
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
ALSA_CMAKE_BOOL=	alsa

AVAHI_CMAKE_BOOL=	zeroconf
AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
AVAHI_CMAKE_BOOL=	zeroconf

DBUS_USES=		qt:5
DBUS_USE=		QT=dbus
DBUS_CMAKE_BOOL=	dbus

JACK_CMAKE_BOOL=	jackaudio
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

PIPEWIRE_CMAKE_BOOL=	pipewire
PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
PIPEWIRE_CMAKE_BOOL=	pipewire

PORTAUDIO_CMAKE_BOOL=	portaudio
PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
PORTAUDIO_CMAKE_BOOL=	portaudio

PULSEAUDIO_CMAKE_BOOL=	pulseaudio
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
PULSEAUDIO_CMAKE_BOOL=	pulseaudio

QTSPEECH_USES=		qt:5
QTSPEECH_USE=		QT=speech
QTSPEECH_CMAKE_BOOL=	qtspeech

RNNOISE_LIB_DEPENDS=	librnnoise.so:audio/rnnoise
RNNOISE_CMAKE_BOOL=	rnnoise
RNNOISE_CMAKE_ON=	-Dbundled-rnnoise:BOOL=off
RNNOISE_LIB_DEPENDS=	librnnoise.so:audio/rnnoise

SPEECHD_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
SPEECHD_USES=		gettext-runtime gnome
SPEECHD_USE=		GNOME=glib20
SPEECHD_CMAKE_BOOL=	speechd
SPEECHD_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher

.include <bsd.port.options.mk>

.if ${ARCH} == "amd64"
CMAKE_ON+=	overlay-xcompile
PLIST_SUB+=	AMD64="" NO_AMD64="@comment "
.else
PLIST_SUB+=	AMD64="@comment " NO_AMD64=""
.endif

.include <bsd.port.mk>
	${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/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>




TIMESTAMP = 1692219880
SHA256 (mumble-1.5.517.tar.gz) = 8efd06a0f47ebfe27735f7575ba0becfb21d0f400a5082202dbbd998ab8351de
SIZE (mumble-1.5.517.tar.gz) = 12091432
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-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




Remove bashism that doesn't seem to serve a purpose.

${var/old_str/new_str} in bash replaces the first match of "old_str"
with "new_str" within ${var} [1]. There doesn't seem to be a point in
removing the first match of the escape character within ${var} only to
compare it with itself, unless it was a workaround for some ancient
bash bug, as this test was committed 15 years ago [2]. According to [3],
the escaping backslash is discarded in pattern matching. Works in bash
with and without this test, but sh(1) has no concept of this syntax.

[1] https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
[2] https://github.com/mumble-voip/mumble/commit/048343f81e4f6b8e0514380e88fef55a3781563f
[3] https://www.gnu.org/software/bash/manual/html_node/Pattern-Matching.html

--- auxiliary_files/run_scripts/mumble-overlay.in.orig	2023-08-15 16:48:56 UTC
+++ auxiliary_files/run_scripts/mumble-overlay.in
@@ -27,9 +27,7 @@ binary="$1"
 fi
 
 binary="$1"
-if [ "${binary/\/}" = "$binary" ]; then
-  binary=$(which "$binary")
-fi
+binary=$(which "$binary")
 if [ ! -x "$binary" ]; then
   echo "$1 not found" >&2
   exit 1




Install the 32-bit overlay library on FreeBSD-amd64.

--- overlay_gl/CMakeLists.txt.orig	2023-01-15 15:31:58 UTC
+++ overlay_gl/CMakeLists.txt
@@ -100,6 +100,13 @@ if(NOT APPLE)
 			install(TARGETS overlay_gl_x86 LIBRARY DESTINATION "${MUMBLE_INSTALL_LIBDIR}")
 		endif()
 	endif()
+
+	if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+		if(TARGET overlay_gl_x86)
+			# install 32bit overlay library
+			install(TARGETS overlay_gl_x86 LIBRARY DESTINATION "${MUMBLE_INSTALL_LIBDIR}")
+		endif()
+	endif()
 else()
 	add_subdirectory("${3RDPARTY_DIR}/mach-override-build" "${CMAKE_CURRENT_BINARY_DIR}/mach-override" EXCLUDE_FROM_ALL)
 




Use the correct imported target for Microsoft.GSL

--- src/CMakeLists.txt.orig	2023-08-16 20:03:05 UTC
+++ src/CMakeLists.txt
@@ -221,8 +221,8 @@ else()
 	# GSL since version 3)
 	find_pkg("Microsoft.GSL")
 
-	if (TARGET GSL)
-		target_link_libraries(shared PUBLIC GSL)
+	if (TARGET Microsoft.GSL::GSL)
+		target_link_libraries(shared PUBLIC Microsoft.GSL::GSL)
 	else()
 		# If the above failed, it could mean that there is an installation of GSL < v3.0 on this system, which does not yet
 		# provide cmake support for finding it. Thus, we have to use our custom Find-script.




bin/mumble
bin/mumble-overlay
%%NO_AMD64%%lib/mumble/libmumbleoverlay.so
%%NO_AMD64%%lib/mumble/libmumbleoverlay.so.%%MUMBLE_VERSION%%
%%AMD64%%lib/mumble/libmumbleoverlay.x86.so
%%AMD64%%lib/mumble/libmumbleoverlay.x86.so.%%MUMBLE_VERSION%%
%%AMD64%%lib/mumble/libmumbleoverlay.x86_64.so
%%AMD64%%lib/mumble/libmumbleoverlay.x86_64.so.%%MUMBLE_VERSION%%
lib/mumble/plugins/liblink.so
share/applications/info.mumble.Mumble.desktop
share/icons/hicolor/256x256/apps/mumble.png
share/icons/hicolor/scalable/apps/mumble.svg
share/man/man1/mumble-overlay.1.gz
share/man/man1/mumble.1.gz
share/metainfo/info.mumble.Mumble.appdata.xml
- 

Return to bug 273203

Lines 1-7 Link Here

(-)b/audio/mumble/Makefile (-71 / +36 lines)
1	PORTNAME= mumble	1	PORTNAME= mumble
2	DISTVERSION= 1.5.517	2	DISTVERSION= 1.5.517
3	PORTREVISION= 2	3	PORTREVISION= 3
4	CATEGORIES= audio	4	CATEGORIES= audio
		5	MASTER_SITES= https://github.com/${PORTNAME}-voip/${PORTNAME}/releases/download/v${DISTVERSION}/
5		6
6	MAINTAINER= vvd@FreeBSD.org	7	MAINTAINER= vvd@FreeBSD.org
7	COMMENT= Voice chat software primarily intended for use while gaming	8	COMMENT= Voice chat software primarily intended for use while gaming
Lines 11-16 LICENSE= BSD3CLAUSE Link Here
11	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
12		13
13	BUILD_DEPENDS= boost-libs>0:devel/boost-libs \	14	BUILD_DEPENDS= boost-libs>0:devel/boost-libs \
		15	microsoft-gsl>=3.0.0:devel/microsoft-gsl \
14	${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json	16	${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json
15	LIB_DEPENDS= libsndfile.so:audio/libsndfile \	17	LIB_DEPENDS= libsndfile.so:audio/libsndfile \
16	libopus.so:audio/opus \	18	libopus.so:audio/opus \
Lines 22-58 LIB_DEPENDS= libsndfile.so:audio/libsndfile \ Link Here
22	libexpat.so:textproc/expat2	24	libexpat.so:textproc/expat2
23		25
24	USES= cmake compiler:c++14-lang cpe desktop-file-utils gl \	26	USES= cmake compiler:c++14-lang cpe desktop-file-utils gl \
25	pkgconfig python:build qmake qt:5 ssl xorg	27	pkgconfig python:build qt:5 shebangfix ssl xorg
26
27	PATCHVERSION= ${DISTVERSION}
28	MINORVERSION= ${DISTVERSION:R}
29	MAJORVERSION= ${DISTVERSION:R:R}
30
31	PLIST_SUB+= PATCHVERSION="${PATCHVERSION}"
32	PLIST_SUB+= MINORVERSION="${MINORVERSION}"
33	PLIST_SUB+= MAJORVERSION="${MAJORVERSION}"
34		28
35	USE_CXXSTD= c++14	29	USE_CXXSTD= c++14
36	USE_GITHUB= yes	30	USE_GL= gl
37	GH_TUPLE= mumble-voip:mumble:v${DISTVERSION} \
38	Krzmbrzl:FindPythonInterpreter:bb4d3ea:mumble_FindPythonInterpreter/3rdparty/FindPythonInterpreter \
39	microsoft:GSL:0f6dbc9:mumble_gsl/3rdparty/gsl \
40	mumble-voip:mach_override:919148f:mumble_mach_override/3rdparty/mach-override-src \
41	mumble-voip:minhook:5e338f8:mumble_minhook/3rdparty/minhook \
42	mumble-voip:speexdsp:6e4634f:mumble_speexdsp/3rdparty/speexdsp \
43	wolfpld:tracy:1a4f369:mumble_tracy/3rdparty/tracy
44
45	USE_QT= buildtools:build concurrent core gui l10n linguist:build network \
46	sql sql-sqlite3:run svg widgets xml
47	USE_LDCONFIG= yes	31	USE_LDCONFIG= yes
48		32	USE_QT= buildtools:build concurrent core gui l10n linguist:build network \
		33	qmake:build sql sql-sqlite3:run svg widgets xml
49	USE_XORG= x11 xext xi	34	USE_XORG= x11 xext xi
50	USE_GL= gl
51		35
52	CMAKE_ON= bundled-gsl client oss overlay overlay-xcompile plugins \	36	SHEBANG_FILES= auxiliary_files/run_scripts/mumble-overlay.in
		37	bash_CMD= ${SH}
		38
		39	CMAKE_ARGS= -DBUILD_NUMBER=${DISTVERSION:E}
		40	CMAKE_ON= client oss overlay plugins \
53	translations xinput2	41	translations xinput2
54	CMAKE_OFF= bundled-json bundle-qt-translations bundled-speex crash-report \	42	CMAKE_OFF= bundled-json bundled-gsl bundle-qt-translations bundled-speex \
55	g15 server tracy update	43	crash-report g15 server tracy update
		44
		45	CONFIGURE_ENV= MUMBLE_PYTHON=${PYTHON_CMD}
		46
		47	PLIST_SUB= MUMBLE_VERSION="${DISTVERSION}"
56		48
57	OPTIONS_DEFINE= ALSA AVAHI DBUS JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RNNOISE	49	OPTIONS_DEFINE= ALSA AVAHI DBUS JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RNNOISE
58	OPTIONS_DEFAULT= DBUS	50	OPTIONS_DEFAULT= DBUS
Lines 64-140 RNNOISE_DESC= Use RNNoise for machine learning noise reduction Link Here
64	SPEECH_DESC= Support text-to-speech	56	SPEECH_DESC= Support text-to-speech
65	SPEECHD_DESC= Support for Speech Dispatcher	57	SPEECHD_DESC= Support for Speech Dispatcher
66		58
67	ALSA_CMAKE_BOOL= alsa
68	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib	59	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
		60	ALSA_CMAKE_BOOL= alsa
69		61
70	AVAHI_CMAKE_BOOL= zeroconf
71	AVAHI_LIB_DEPENDS= libdns_sd.so:net/avahi-libdns	62	AVAHI_LIB_DEPENDS= libdns_sd.so:net/avahi-libdns
		63	AVAHI_CMAKE_BOOL= zeroconf
72		64
73	DBUS_USES= qt:5
74	DBUS_USE= QT=dbus	65	DBUS_USE= QT=dbus
75	DBUS_CMAKE_BOOL= dbus	66	DBUS_CMAKE_BOOL= dbus
76		67
77	JACK_CMAKE_BOOL= jackaudio
78	JACK_LIB_DEPENDS= libjack.so:audio/jack	68	JACK_LIB_DEPENDS= libjack.so:audio/jack
		69	JACK_CMAKE_BOOL= jackaudio
79		70
80	LTO_BROKEN= "QWidget: Cannot create a QWidget without QApplication": \	71	LTO_BROKEN= "QWidget: Cannot create a QWidget without QApplication": \
81	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273078	72	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273078
82	LTO_CMAKE_BOOL= lto	73	LTO_CMAKE_BOOL= lto
83		74
84	PIPEWIRE_CMAKE_BOOL= pipewire
85	PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire	75	PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire
		76	PIPEWIRE_CMAKE_BOOL= pipewire
86		77
87	PORTAUDIO_CMAKE_BOOL= portaudio
88	PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio	78	PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio
		79	PORTAUDIO_CMAKE_BOOL= portaudio
89		80
90	PULSEAUDIO_CMAKE_BOOL= pulseaudio
91	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	81	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
		82	PULSEAUDIO_CMAKE_BOOL= pulseaudio
92		83
93	QTSPEECH_USES= qt:5
94	QTSPEECH_USE= QT=speech	84	QTSPEECH_USE= QT=speech
95	QTSPEECH_CMAKE_BOOL= qtspeech	85	QTSPEECH_CMAKE_BOOL= qtspeech
96		86
		87	RNNOISE_LIB_DEPENDS= librnnoise.so:audio/rnnoise
97	RNNOISE_CMAKE_BOOL= rnnoise	88	RNNOISE_CMAKE_BOOL= rnnoise
98	RNNOISE_CMAKE_ON= -Dbundled-rnnoise:BOOL=off	89	RNNOISE_CMAKE_ON= -Dbundled-rnnoise:BOOL=off
99	RNNOISE_LIB_DEPENDS= librnnoise.so:audio/rnnoise
100		90
		91	SPEECHD_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher
101	SPEECHD_USES= gettext-runtime gnome	92	SPEECHD_USES= gettext-runtime gnome
102	SPEECHD_USE= GNOME=glib20	93	SPEECHD_USE= GNOME=glib20
103	SPEECHD_CMAKE_BOOL= speechd	94	SPEECHD_CMAKE_BOOL= speechd
104	SPEECHD_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher
105		95
106	CONFIGURE_ENV+= MUMBLE_PYTHON=${PYTHON_CMD}	96	.include <bsd.port.options.mk>
107		97
108	.include <bsd.port.pre.mk>	98	.if ${ARCH} == "amd64"
109		99	CMAKE_ON+= overlay-xcompile
110	do-install:	100	PLIST_SUB+= AMD64="" NO_AMD64="@comment "
111	${INSTALL_PROGRAM} ${WRKDIR}/.build/mumble ${STAGEDIR}${PREFIX}/bin	101	.else
112	${INSTALL_LIB} ${WRKDIR}/.build/libmumbleoverlay.x86_64.so.${MINORVERSION}.0 \	102	PLIST_SUB+= AMD64="@comment " NO_AMD64=""
113	${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION}	103	.endif
114	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} \	104
115	${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so	105	.include <bsd.port.mk>
116	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} \
117	${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${MAJORVERSION}
118	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} \
119	${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${MINORVERSION}
120	${INSTALL_LIB} ${WRKDIR}/.build/libmumbleoverlay.x86.so.${MINORVERSION}.0 \
121	${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION}
122	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} \
123	${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so
124	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} \
125	${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${MAJORVERSION}
126	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} \
127	${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${MINORVERSION}
128	${INSTALL_DATA} ${WRKDIR}/.build/auxiliary_files/info.mumble.Mumble.desktop \
129	${STAGEDIR}${PREFIX}/share/applications/mumble.desktop
130	${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
131	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps \
132	${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
133	${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg \
134	${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
135	${INSTALL_DATA} ${WRKSRC}/icons/mumble_256x256.png \
136	${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/mumble.png
137	${INSTALL_MAN} ${WRKSRC}/auxiliary_files/man_files/mumble.1 \
138	${STAGEDIR}${MANPREFIX}/share/man/man1/mumble.1
139
140	.include <bsd.port.post.mk>

Lines 1-15 Link Here

(-)b/audio/mumble/distinfo (-15 / +3 lines)
1	TIMESTAMP = 1690555998	1	TIMESTAMP = 1692219880
2	SHA256 (mumble-voip-mumble-1.5.517-v1.5.517_GH0.tar.gz) = f7ea7c8f5267fa8f744a7622bb96ad373ee40c6458b9ce01d81d071898f6a6da	2	SHA256 (mumble-1.5.517.tar.gz) = 8efd06a0f47ebfe27735f7575ba0becfb21d0f400a5082202dbbd998ab8351de
3	SIZE (mumble-voip-mumble-1.5.517-v1.5.517_GH0.tar.gz) = 6120684	3	SIZE (mumble-1.5.517.tar.gz) = 12091432
4	SHA256 (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 8439bfe7daeb478d8e8aa09b3c111c3dc360064144d181fc5dcfef950e8eaa05
5	SIZE (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 4817
6	SHA256 (microsoft-GSL-0f6dbc9_GH0.tar.gz) = 63d53ed611862f90517048db57617d8264200810a1e9fbb7ff9a524747f8dab3
7	SIZE (microsoft-GSL-0f6dbc9_GH0.tar.gz) = 78207
8	SHA256 (mumble-voip-mach_override-919148f_GH0.tar.gz) = 81b2e705a7cce1e3a9eb440cb2bca2f14fd83db162123f44faf17f0bf45da1bd
9	SIZE (mumble-voip-mach_override-919148f_GH0.tar.gz) = 66278
10	SHA256 (mumble-voip-minhook-5e338f8_GH0.tar.gz) = bc675c5b9def1fcef4b58c62e6d69eaa6e76d2fed89ace681059a7648e808033
11	SIZE (mumble-voip-minhook-5e338f8_GH0.tar.gz) = 27651
12	SHA256 (mumble-voip-speexdsp-6e4634f_GH0.tar.gz) = f596d946feeffc66ad2f8a5886945019d79a1a45f3e9c1a1191b4faabb0e84ea
13	SIZE (mumble-voip-speexdsp-6e4634f_GH0.tar.gz) = 895204
14	SHA256 (wolfpld-tracy-1a4f369_GH0.tar.gz) = b1fbb7b8ec38c58addd97f9cd6d17e879ecab9bfc184751297ce2162a6b8d008
15	SIZE (wolfpld-tracy-1a4f369_GH0.tar.gz) = 4633541

Added Link Here

(-)b/audio/mumble/files/patch-auxiliary__files_run__scripts_mumble-overlay.in (+27 lines)
1	Remove bashism that doesn't seem to serve a purpose.
2
3	${var/old_str/new_str} in bash replaces the first match of "old_str"
4	with "new_str" within ${var} [1]. There doesn't seem to be a point in
5	removing the first match of the escape character within ${var} only to
6	compare it with itself, unless it was a workaround for some ancient
7	bash bug, as this test was committed 15 years ago [2]. According to [3],
8	the escaping backslash is discarded in pattern matching. Works in bash
9	with and without this test, but sh(1) has no concept of this syntax.
10
11	[1] https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
12	[2] https://github.com/mumble-voip/mumble/commit/048343f81e4f6b8e0514380e88fef55a3781563f
13	[3] https://www.gnu.org/software/bash/manual/html_node/Pattern-Matching.html
14
15	--- auxiliary_files/run_scripts/mumble-overlay.in.orig 2023-08-15 16:48:56 UTC
16	+++ auxiliary_files/run_scripts/mumble-overlay.in
17	@@ -27,9 +27,7 @@ binary="$1"
18	fi
19
20	binary="$1"
21	-if [ "${binary/\/}" = "$binary" ]; then
22	- binary=$(which "$binary")
23	-fi
24	+binary=$(which "$binary")
25	if [ ! -x "$binary" ]; then
26	echo "$1 not found" >&2
27	exit 1

Added Link Here

(-)b/audio/mumble/files/patch-overlay__gl_CMakeLists.txt (+18 lines)
1	Install the 32-bit overlay library on FreeBSD-amd64.
2
3	--- overlay_gl/CMakeLists.txt.orig 2023-01-15 15:31:58 UTC
4	+++ overlay_gl/CMakeLists.txt
5	@@ -100,6 +100,13 @@ if(NOT APPLE)
6	install(TARGETS overlay_gl_x86 LIBRARY DESTINATION "${MUMBLE_INSTALL_LIBDIR}")
7	endif()
8	endif()
9	+
10	+ if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
11	+ if(TARGET overlay_gl_x86)
12	+ # install 32bit overlay library
13	+ install(TARGETS overlay_gl_x86 LIBRARY DESTINATION "${MUMBLE_INSTALL_LIBDIR}")
14	+ endif()
15	+ endif()
16	else()
17	add_subdirectory("${3RDPARTY_DIR}/mach-override-build" "${CMAKE_CURRENT_BINARY_DIR}/mach-override" EXCLUDE_FROM_ALL)
18

Added Link Here

(-)b/audio/mumble/files/patch-src_CMakeLists.txt (+15 lines)
1	Use the correct imported target for Microsoft.GSL
2
3	--- src/CMakeLists.txt.orig 2023-08-16 20:03:05 UTC
4	+++ src/CMakeLists.txt
5	@@ -221,8 +221,8 @@ else()
6	# GSL since version 3)
7	find_pkg("Microsoft.GSL")
8
9	- if (TARGET GSL)
10	- target_link_libraries(shared PUBLIC GSL)
11	+ if (TARGET Microsoft.GSL::GSL)
12	+ target_link_libraries(shared PUBLIC Microsoft.GSL::GSL)
13	else()
14	# If the above failed, it could mean that there is an installation of GSL < v3.0 on this system, which does not yet
15	# provide cmake support for finding it. Thus, we have to use our custom Find-script.

Lines 1-14 Link Here

(-)b/audio/mumble/pkg-plist (-11 / +11 lines)
1	bin/mumble	1	bin/mumble
2	lib/libmumbleoverlay.x86_64.so	2	bin/mumble-overlay
3	lib/libmumbleoverlay.x86_64.so.%%MAJORVERSION%%	3	%%NO_AMD64%%lib/mumble/libmumbleoverlay.so
4	lib/libmumbleoverlay.x86_64.so.%%MINORVERSION%%	4	%%NO_AMD64%%lib/mumble/libmumbleoverlay.so.%%MUMBLE_VERSION%%
5	lib/libmumbleoverlay.x86_64.so.%%PATCHVERSION%%	5	%%AMD64%%lib/mumble/libmumbleoverlay.x86.so
6	lib/libmumbleoverlay.x86.so	6	%%AMD64%%lib/mumble/libmumbleoverlay.x86.so.%%MUMBLE_VERSION%%
7	lib/libmumbleoverlay.x86.so.%%MAJORVERSION%%	7	%%AMD64%%lib/mumble/libmumbleoverlay.x86_64.so
8	lib/libmumbleoverlay.x86.so.%%MINORVERSION%%	8	%%AMD64%%lib/mumble/libmumbleoverlay.x86_64.so.%%MUMBLE_VERSION%%
9	lib/libmumbleoverlay.x86.so.%%PATCHVERSION%%	9	lib/mumble/plugins/liblink.so
10	share/applications/mumble.desktop	10	share/applications/info.mumble.Mumble.desktop
11	share/icons/hicolor/256x256/apps/mumble.png	11	share/icons/hicolor/256x256/apps/mumble.png
12	share/icons/hicolor/scalable/apps/mumble.svg	12	share/icons/hicolor/scalable/apps/mumble.svg
		13	share/man/man1/mumble-overlay.1.gz
13	share/man/man1/mumble.1.gz	14	share/man/man1/mumble.1.gz
14	share/pixmaps/mumble.xpm	15	share/metainfo/info.mumble.Mumble.appdata.xml
15	-