View | Details | Raw Unified | Return to bug 273203 | Differences between
and this patch

Collapse All | Expand All

(-)b/audio/mumble/Makefile (-71 / +49 lines)
Lines 1-7 Link Here
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}/
6
7
PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
8
PATCHFILES+=	589bfbfd634925b47b3a812745bc5a423b7f4285.patch:-p1
9
PATCHFILES+=	19e01f7255e2c433b700237e4592fc5d6cf752e8.patch:-p1
5
10
6
MAINTAINER=	vvd@FreeBSD.org
11
MAINTAINER=	vvd@FreeBSD.org
7
COMMENT=	Voice chat software primarily intended for use while gaming
12
COMMENT=	Voice chat software primarily intended for use while gaming
Lines 11-16 LICENSE= BSD3CLAUSE Link Here
11
LICENSE_FILE=	${WRKSRC}/LICENSE
16
LICENSE_FILE=	${WRKSRC}/LICENSE
12
17
13
BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
18
BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
19
		microsoft-gsl>=3.0.0:devel/microsoft-gsl \
14
		${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json
20
		${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json
15
LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
21
LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
16
		libopus.so:audio/opus \
22
		libopus.so:audio/opus \
Lines 22-140 LIB_DEPENDS= libsndfile.so:audio/libsndfile \ Link Here
22
		libexpat.so:textproc/expat2
28
		libexpat.so:textproc/expat2
23
29
24
USES=		cmake compiler:c++14-lang cpe desktop-file-utils gl \
30
USES=		cmake compiler:c++14-lang cpe desktop-file-utils gl \
25
		pkgconfig python:build qmake qt:5 ssl xorg
31
		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
32
35
USE_CXXSTD=	c++14
33
USE_CXXSTD=	c++14
36
USE_GITHUB=	yes
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
34
45
USE_QT=		buildtools:build concurrent core gui l10n linguist:build network \
35
USE_GL=		gl
46
		sql sql-sqlite3:run svg widgets xml
47
USE_LDCONFIG=	yes
36
USE_LDCONFIG=	yes
48
37
USE_QT=		buildtools:build concurrent core gui l10n linguist:build network \
38
		qmake:build sql sql-sqlite3:run svg widgets xml
49
USE_XORG=	x11 xext xi
39
USE_XORG=	x11 xext xi
50
USE_GL=		gl
51
40
52
CMAKE_ON=	bundled-gsl client oss overlay overlay-xcompile plugins \
41
SHEBANG_FILES=	auxiliary_files/run_scripts/mumble-overlay.in
53
		translations xinput2
42
bash_CMD=	${SH}
54
CMAKE_OFF=	bundled-json bundle-qt-translations bundled-speex crash-report \
43
55
		g15 server tracy update
44
CMAKE_ON=	client oss overlay plugins translations xinput2
45
CMAKE_OFF=	bundled-gsl bundled-json bundle-qt-translations bundled-speex \
46
		crash-report g15 server tracy update
47
48
CONFIGURE_ENV=	MUMBLE_PYTHON=${PYTHON_CMD}
49
50
PLIST_SUB+=	MUMBLE_VERSION="${DISTVERSION:R}"
56
51
57
OPTIONS_DEFINE=		ALSA AVAHI DBUS JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RNNOISE
52
OPTIONS_DEFINE=		ALSA AVAHI DBUS JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RNNOISE
53
OPTIONS_DEFINE_amd64=	OVERLAY_32BIT
58
OPTIONS_DEFAULT=	DBUS
54
OPTIONS_DEFAULT=	DBUS
55
OPTIONS_DEFAULT_amd64=	OVERLAY_32BIT
59
OPTIONS_RADIO=		SPEECH
56
OPTIONS_RADIO=		SPEECH
60
OPTIONS_RADIO_SPEECH=	QTSPEECH SPEECHD
57
OPTIONS_RADIO_SPEECH=	QTSPEECH SPEECHD
61
58
59
OPTIONS_SUB=		yes
60
61
OVERLAY_32BIT_DESC=	Build and install 32bit overlay module
62
QTSPEECH_DESC=		Use Qt's text-to-speech system
62
QTSPEECH_DESC=		Use Qt's text-to-speech system
63
RNNOISE_DESC=		Use RNNoise for machine learning noise reduction
63
RNNOISE_DESC=		Use RNNoise for machine learning noise reduction
64
SPEECH_DESC=		Support text-to-speech
64
SPEECH_DESC=		Support text-to-speech
65
SPEECHD_DESC=		Support for Speech Dispatcher
65
SPEECHD_DESC=		Support for Speech Dispatcher
66
66
67
ALSA_CMAKE_BOOL=	alsa
68
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
67
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
68
ALSA_CMAKE_BOOL=	alsa
69
69
70
AVAHI_CMAKE_BOOL=	zeroconf
71
AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
70
AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
71
AVAHI_CMAKE_BOOL=	zeroconf
72
72
73
DBUS_USES=		qt:5
74
DBUS_USE=		QT=dbus
73
DBUS_USE=		QT=dbus
75
DBUS_CMAKE_BOOL=	dbus
74
DBUS_CMAKE_BOOL=	dbus
76
75
77
JACK_CMAKE_BOOL=	jackaudio
78
JACK_LIB_DEPENDS=	libjack.so:audio/jack
76
JACK_LIB_DEPENDS=	libjack.so:audio/jack
77
JACK_CMAKE_BOOL=	jackaudio
79
78
80
LTO_BROKEN=		"QWidget: Cannot create a QWidget without QApplication": \
79
LTO_BROKEN=		"QWidget: Cannot create a QWidget without QApplication": \
81
			https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273078
80
			https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273078
82
LTO_CMAKE_BOOL=		lto
81
LTO_CMAKE_BOOL=		lto
83
82
84
PIPEWIRE_CMAKE_BOOL=	pipewire
83
OVERLAY_32BIT_CMAKE_BOOL=	overlay-xcompile
84
85
PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
85
PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
86
PIPEWIRE_CMAKE_BOOL=	pipewire
86
87
87
PORTAUDIO_CMAKE_BOOL=	portaudio
88
PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
88
PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
89
PORTAUDIO_CMAKE_BOOL=	portaudio
89
90
90
PULSEAUDIO_CMAKE_BOOL=	pulseaudio
91
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
91
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
92
PULSEAUDIO_CMAKE_BOOL=	pulseaudio
92
93
93
QTSPEECH_USES=		qt:5
94
QTSPEECH_USE=		QT=speech
94
QTSPEECH_USE=		QT=speech
95
QTSPEECH_CMAKE_BOOL=	qtspeech
95
QTSPEECH_CMAKE_BOOL=	qtspeech
96
96
97
RNNOISE_LIB_DEPENDS=	librnnoise.so:audio/rnnoise
97
RNNOISE_CMAKE_BOOL=	rnnoise
98
RNNOISE_CMAKE_BOOL=	rnnoise
98
RNNOISE_CMAKE_ON=	-Dbundled-rnnoise:BOOL=off
99
RNNOISE_CMAKE_ON=	-Dbundled-rnnoise:BOOL=off
99
RNNOISE_LIB_DEPENDS=	librnnoise.so:audio/rnnoise
100
100
101
SPEECHD_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
101
SPEECHD_USES=		gettext-runtime gnome
102
SPEECHD_USES=		gettext-runtime gnome
102
SPEECHD_USE=		GNOME=glib20
103
SPEECHD_USE=		GNOME=glib20
103
SPEECHD_CMAKE_BOOL=	speechd
104
SPEECHD_CMAKE_BOOL=	speechd
104
SPEECHD_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
105
105
106
CONFIGURE_ENV+=		MUMBLE_PYTHON=${PYTHON_CMD}
106
.include <bsd.port.options.mk>
107
107
108
.include <bsd.port.pre.mk>
108
.if ${PORT_OPTIONS:MOVERLAY_32BIT}
109
109
. if ${ARCH} == amd64
110
do-install:
110
PLIST_SUB+=	OVERLAY_32BIT_SUFFIX=.x86
111
	${INSTALL_PROGRAM} ${WRKDIR}/.build/mumble ${STAGEDIR}${PREFIX}/bin
111
PLIST_SUB+=	OVERLAY_NATIVE_SUFFIX=.x86_64
112
	${INSTALL_LIB} ${WRKDIR}/.build/libmumbleoverlay.x86_64.so.${MINORVERSION}.0 \
112
. endif
113
		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION}
113
.else
114
	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} \
114
PLIST_SUB+=	OVERLAY_32BIT="@comment "
115
		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so
115
PLIST_SUB+=	OVERLAY_NATIVE_SUFFIX=
116
	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} \
116
.endif
117
		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${MAJORVERSION}
117
118
	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} \
118
.include <bsd.port.mk>
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>
(-)b/audio/mumble/distinfo (-15 / +7 lines)
Lines 1-15 Link Here
1
TIMESTAMP = 1690555998
1
TIMESTAMP = 1692746893
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
4
SHA256 (589bfbfd634925b47b3a812745bc5a423b7f4285.patch) = e45f3d4a4132ceb09530dcc2b32c26e479759452e93780ded57684f93abc9d39
5
SIZE (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 4817
5
SIZE (589bfbfd634925b47b3a812745bc5a423b7f4285.patch) = 921
6
SHA256 (microsoft-GSL-0f6dbc9_GH0.tar.gz) = 63d53ed611862f90517048db57617d8264200810a1e9fbb7ff9a524747f8dab3
6
SHA256 (19e01f7255e2c433b700237e4592fc5d6cf752e8.patch) = 3316fd3cab0d797d78fa34df358892699db0bde6c45c61a87f095e514c2e5575
7
SIZE (microsoft-GSL-0f6dbc9_GH0.tar.gz) = 78207
7
SIZE (19e01f7255e2c433b700237e4592fc5d6cf752e8.patch) = 1138
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
(-)b/audio/mumble/files/patch-auxiliary__files_run__scripts_mumble-overlay.in (+26 lines)
Added Link Here
1
Remove bashism that doesn't seem to serve a purpose.
2
${var/old_str/new_str} in bash replaces the first match of "old_str"
3
with "new_str" within ${var} [1]. There doesn't seem to be a point in
4
removing the first match of the escape character within ${var} only to
5
compare it with itself, unless it was a workaround for some ancient
6
bash bug, as this test was committed 15 years ago [2]. According to [3],
7
the escaping backslash is discarded in pattern matching. Works in bash
8
with and without this test, but sh(1) has no concept of this syntax.
9
10
[1] https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
11
[2] https://github.com/mumble-voip/mumble/commit/048343f81e4f6b8e0514380e88fef55a3781563f
12
[3] https://www.gnu.org/software/bash/manual/html_node/Pattern-Matching.html
13
14
--- auxiliary_files/run_scripts/mumble-overlay.in.orig	2023-08-15 16:48:56 UTC
15
+++ auxiliary_files/run_scripts/mumble-overlay.in
16
@@ -27,9 +27,7 @@ binary="$1"
17
 fi
18
 
19
 binary="$1"
20
-if [ "${binary/\/}" = "$binary" ]; then
21
-  binary=$(which "$binary")
22
-fi
23
+binary=$(which "$binary")
24
 if [ ! -x "$binary" ]; then
25
   echo "$1 not found" >&2
26
   exit 1
(-)b/audio/mumble/pkg-plist (-10 / +9 lines)
Lines 1-14 Link Here
1
bin/mumble
1
bin/mumble
2
lib/libmumbleoverlay.x86_64.so
2
bin/mumble-overlay
3
lib/libmumbleoverlay.x86_64.so.%%MAJORVERSION%%
3
%%OVERLAY_32BIT%%lib/mumble/libmumbleoverlay%%OVERLAY_32BIT_SUFFIX%%.so
4
lib/libmumbleoverlay.x86_64.so.%%MINORVERSION%%
4
%%OVERLAY_32BIT%%lib/mumble/libmumbleoverlay%%OVERLAY_32BIT_SUFFIX%%.so.%%MUMBLE_VERSION%%.0
5
lib/libmumbleoverlay.x86_64.so.%%PATCHVERSION%%
5
lib/mumble/libmumbleoverlay%%OVERLAY_NATIVE_SUFFIX%%.so
6
lib/libmumbleoverlay.x86.so
6
lib/mumble/libmumbleoverlay%%OVERLAY_NATIVE_SUFFIX%%.so.%%MUMBLE_VERSION%%.0
7
lib/libmumbleoverlay.x86.so.%%MAJORVERSION%%
7
lib/mumble/plugins/liblink.so
8
lib/libmumbleoverlay.x86.so.%%MINORVERSION%%
8
share/applications/info.mumble.Mumble.desktop
9
lib/libmumbleoverlay.x86.so.%%PATCHVERSION%%
10
share/applications/mumble.desktop
11
share/icons/hicolor/256x256/apps/mumble.png
9
share/icons/hicolor/256x256/apps/mumble.png
12
share/icons/hicolor/scalable/apps/mumble.svg
10
share/icons/hicolor/scalable/apps/mumble.svg
13
share/man/man1/mumble.1.gz
11
share/man/man1/mumble.1.gz
14
share/pixmaps/mumble.xpm
12
share/man/man1/mumble-overlay.1.gz
13
share/metainfo/info.mumble.Mumble.appdata.xml

Return to bug 273203