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

Collapse All | Expand All

(-)audio/mumble/Makefile (-43 / +43 lines)
Lines 1-8 Link Here
1
# Created by: marius nuennerich
1
# Created by: marius nuennerich
2
2
3
PORTNAME=	mumble
3
PORTNAME=	mumble
4
PORTVERSION=	1.3.3
4
DISTVERSION=	1.4.230
5
PORTREVISION=	4
6
CATEGORIES=	audio
5
CATEGORIES=	audio
7
6
8
MAINTAINER=	feld@FreeBSD.org
7
MAINTAINER=	feld@FreeBSD.org
Lines 16-28 Link Here
16
		libsndfile.so:audio/libsndfile \
15
		libsndfile.so:audio/libsndfile \
17
		libboost_iostreams.so:devel/boost-libs \
16
		libboost_iostreams.so:devel/boost-libs \
18
		libprotoc.so:devel/protobuf \
17
		libprotoc.so:devel/protobuf \
19
		libopus.so:audio/opus
18
		libopus.so:audio/opus \
19
		libPocoFoundation.so:devel/poco \
20
		libPocoUtil.so:devel/poco \
21
		libPocoXML.so:devel/poco \
22
		libPocoZip.so:devel/poco
20
23
21
USES=		compiler:c++11-lang cpe desktop-file-utils gl gmake gnome pkgconfig python:build qmake qt:5 ssl xorg
24
USES=		cmake compiler:c++11-lang cpe desktop-file-utils gl gnome pkgconfig python:build qt:5 ssl xorg
22
25
23
PATCHVERSION=	${PORTVERSION}
26
PATCHVERSION=	${DISTVERSION}
24
MINORVERSION=	${PORTVERSION:R}
27
MINORVERSION=	${DISTVERSION:R}
25
MAJORVERSION=	${PORTVERSION:R:R}
28
MAJORVERSION=	${DISTVERSION:R:R}
26
29
27
PLIST_SUB+=	PATCHVERSION="${PATCHVERSION}"
30
PLIST_SUB+=	PATCHVERSION="${PATCHVERSION}"
28
PLIST_SUB+=	MINORVERSION="${MINORVERSION}"
31
PLIST_SUB+=	MINORVERSION="${MINORVERSION}"
Lines 30-43 Link Here
30
33
31
USE_CXXSTD=	c++11
34
USE_CXXSTD=	c++11
32
USE_GITHUB=	yes
35
USE_GITHUB=	yes
33
GH_TUPLE=	mumble-voip:mumble:${DISTVERSION} \
36
GH_TUPLE=	mumble-voip:mumble:v${DISTVERSION} \
34
		mumble-voip:celt-0.7.0:5a16cda:mumble_celt_0_7/3rdparty/celt-0.7.0-src \
37
		mumble-voip:celt-0.7.0:5a16cda:mumble_celt_0_7/3rdparty/celt-0.7.0-src \
35
		mumble-voip:celt-0.11.0:e18de77:mumble_celt_0_11/3rdparty/celt-0.11.0-src \
36
		mumble-voip:mach_override:919148f:mumble_mach_override/3rdparty/mach-override-src \
38
		mumble-voip:mach_override:919148f:mumble_mach_override/3rdparty/mach-override-src \
37
		mumble-voip:minhook:5e338f8:mumble_minhook/3rdparty/minhook-src \
39
		mumble-voip:minhook:5e338f8:mumble_minhook/3rdparty/minhook-src \
38
		mumble-voip:rnnoise:b30f2bb:mumble_rnnoise/3rdparty/rnnoise-src \
40
		mumble-voip:rnnoise:a9afccc:mumble_rnnoise/3rdparty/rnnoise-src \
39
		mumble-voip:sbcelt:045493d:mumble_sbcelt/3rdparty/sbcelt-src \
41
		mumble-voip:mumble-theme:f9868bd:mumble_Mumble/themes/Mumble \
40
		mumble-voip:mumble-theme:9467fe8:mumble_theme/themes/Mumble
42
		Krzmbrzl:FindPythonInterpreter:bb4d3ea:mumble_FindPythonInterpreter/3rdparty/FindPythonInterpreter
41
43
42
USE_QT=		buildtools_build core gui l10n linguist_build network opengl sql sql-sqlite3_run svg widgets xml
44
USE_QT=		buildtools_build core gui l10n linguist_build network opengl sql sql-sqlite3_run svg widgets xml
43
USE_LDCONFIG=	yes
45
USE_LDCONFIG=	yes
Lines 45-107 Link Here
45
USE_XORG=	ice xi x11
47
USE_XORG=	ice xi x11
46
USE_GL=		gl
48
USE_GL=		gl
47
49
48
CONFIG=		bundled-celt bundled-rnnoise no-bundled-opus no-bundled-speex no-bundled-speexdsp \
50
CMAKE_ON=	bundled-celt rnnoise client oss overlay overlay-xcompile plugins translations xinput2
49
		no-embed-qt-translations no-g15 no-server no-update
51
CMAKE_OFF=	bundled-opus bundle-qt-translations bundled-speex crash-report g15 server update
50
52
51
QMAKE_ARGS=	"CONFIG+=${CONFIG}"
53
OPTIONS_DEFINE=	ALSA DBUS BONJOUR JACK PIPEWIRE PORTAUDIO PULSEAUDIO QTSPEECH SPEECHD
52
53
OPTIONS_DEFINE=	ALSA DBUS BONJOUR JACK PORTAUDIO PULSEAUDIO SPEECHD
54
OPTIONS_DEFAULT=	DBUS
54
OPTIONS_DEFAULT=	DBUS
55
55
56
ALSA_VARS_OFF=		CONFIG+=no-alsa
56
ALSA_CMAKE_BOOL=	alsa
57
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
57
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
58
58
59
DBUS_VARS_OFF=		CONFIG+=no-dbus
59
DBUS_CMAKE_BOOL=	dbus
60
DBUS_USE=		QT=dbus
60
DBUS_USE=		QT=dbus
61
61
62
BONJOUR_DESC=		Bonjour support
62
BONJOUR_DESC=		Bonjour support
63
BONJOUR_VARS_OFF=	CONFIG+=no-bonjour
63
BONJOUR_CMAKE_BOOL=	zeroconf
64
BONJOUR_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
64
BONJOUR_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
65
65
66
JACK_VARS_OFF=		CONFIG+=no-jackaudio
66
JACK_CMAKE_BOOL=	jackaudio
67
JACK_LIB_DEPENDS=	libjack.so:audio/jack
67
JACK_LIB_DEPENDS=	libjack.so:audio/jack
68
68
69
PORTAUDIO_VARS_OFF=	CONFIG+=no-portaudio
69
PIPEWIRE_DESC=		Pipewire sound server support
70
PIPEWIRE_CMAKE_BOOL=	pipewire
71
PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
72
73
PORTAUDIO_CMAKE_BOOL=	portaudio
70
PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
74
PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
71
75
72
PULSEAUDIO_VARS_OFF=	CONFIG+=no-pulseaudio
76
PULSEAUDIO_CMAKE_BOOL=	pulseaudio
73
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
77
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
74
78
79
QTSPEECH_DESC=		Use Qt's text-to-speech system
80
QTSPEECH_CMAKE_BOOL=	qtspeech
81
QTSPEECH_USE=		QT=speech
82
75
SPEECHD_DESC=		Support for Speech Dispatcher
83
SPEECHD_DESC=		Support for Speech Dispatcher
76
SPEECHD_VARS_OFF=	CONFIG+=no-speechd
84
SPEECHD_CMAKE_BOOL=	speechd
77
SPEECHD_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
85
SPEECHD_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
78
86
79
CONFIGURE_ENV+=	MUMBLE_PYTHON=${PYTHON_CMD}
87
CONFIGURE_ENV+=	MUMBLE_PYTHON=${PYTHON_CMD}
80
88
81
.include <bsd.port.pre.mk>
89
.include <bsd.port.pre.mk>
82
90
83
# PCH is broken on GCC
84
.if ${CHOSEN_COMPILER_TYPE} == gcc
85
CONFIG+=	no-pch
86
.endif
87
88
MAKE_JOBS_UNSAFE=yes
89
90
post-patch:
91
	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
92
	@${RM} ${WRKSRC}/plugins/manual/.qmake.cache
93
94
do-install:
91
do-install:
95
	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${STAGEDIR}${PREFIX}/bin
92
	${INSTALL_PROGRAM} ${WRKSRC}/../.build/mumble ${STAGEDIR}${PREFIX}/bin
96
	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.7.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0
93
	${INSTALL_LIB} ${WRKSRC}/../.build/libcelt0.so.0.7.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0
97
	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.11.0
94
	${INSTALL_LIB} ${WRKSRC}/../.build/libmumbleoverlay.x86_64.so.${MINORVERSION}.0 ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION}
98
	${INSTALL_LIB} ${WRKSRC}/release/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION}
95
	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so
99
	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so
96
	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${MAJORVERSION}
100
	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${MAJORVERSION}
97
	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${MINORVERSION}
101
	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${MINORVERSION}
98
	${INSTALL_LIB} ${WRKSRC}/../.build/libmumbleoverlay.x86.so.${MINORVERSION}.0 ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION}
99
	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so
100
	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${MAJORVERSION}
101
	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${MINORVERSION}
102
	${MKDIR} ${STAGEDIR}${PREFIX}/share/services
102
	${MKDIR} ${STAGEDIR}${PREFIX}/share/services
103
	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${STAGEDIR}${PREFIX}/share/services
103
	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${STAGEDIR}${PREFIX}/share/services
104
	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${STAGEDIR}${PREFIX}/share/applications
104
	${INSTALL_DATA} ${WRKSRC}/scripts/org.mumble_voip.mumble.desktop ${STAGEDIR}${PREFIX}/share/applications
105
	${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
105
	${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
106
	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
106
	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
107
	${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.installer.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
107
	${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.installer.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
(-)audio/mumble/distinfo (-11 / +9 lines)
Lines 1-17 Link Here
1
TIMESTAMP = 1602265872
1
TIMESTAMP = 1642727082
2
SHA256 (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 53a555092a03af2e6025c641bb748f013e1cfa8f61899a686bed8690439f36c7
2
SHA256 (mumble-voip-mumble-1.4.230-v1.4.230_GH0.tar.gz) = 0a6591568a2d63b7a6bb29a3b10e4289a34dfd75e33cb2143ae6c738b1e92983
3
SIZE (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 4895708
3
SIZE (mumble-voip-mumble-1.4.230-v1.4.230_GH0.tar.gz) = 5804439
4
SHA256 (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = fbfdbb0767d9d67ea29270eb3e5e999eec6f7f3720a870e74776be426b10b53a
4
SHA256 (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = fbfdbb0767d9d67ea29270eb3e5e999eec6f7f3720a870e74776be426b10b53a
5
SIZE (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = 182631
5
SIZE (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = 182631
6
SHA256 (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = b522482222c40c1f05ce9b6c4d19a05e8419a7850398dbbdea5854b78eadfd4a
7
SIZE (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = 212833
8
SHA256 (mumble-voip-mach_override-919148f_GH0.tar.gz) = 81b2e705a7cce1e3a9eb440cb2bca2f14fd83db162123f44faf17f0bf45da1bd
6
SHA256 (mumble-voip-mach_override-919148f_GH0.tar.gz) = 81b2e705a7cce1e3a9eb440cb2bca2f14fd83db162123f44faf17f0bf45da1bd
9
SIZE (mumble-voip-mach_override-919148f_GH0.tar.gz) = 66278
7
SIZE (mumble-voip-mach_override-919148f_GH0.tar.gz) = 66278
10
SHA256 (mumble-voip-minhook-5e338f8_GH0.tar.gz) = bc675c5b9def1fcef4b58c62e6d69eaa6e76d2fed89ace681059a7648e808033
8
SHA256 (mumble-voip-minhook-5e338f8_GH0.tar.gz) = bc675c5b9def1fcef4b58c62e6d69eaa6e76d2fed89ace681059a7648e808033
11
SIZE (mumble-voip-minhook-5e338f8_GH0.tar.gz) = 27651
9
SIZE (mumble-voip-minhook-5e338f8_GH0.tar.gz) = 27651
12
SHA256 (mumble-voip-rnnoise-b30f2bb_GH0.tar.gz) = 68ce21e49a0af3d06d87d27665d9a2102c249e4e5e91f777e47139d8707aeb6d
10
SHA256 (mumble-voip-rnnoise-a9afccc_GH0.tar.gz) = f46c7608aff0d75c2a218b7f857fa3ff3d4ff932b9e252717a05eb6a8108e3fd
13
SIZE (mumble-voip-rnnoise-b30f2bb_GH0.tar.gz) = 171240
11
SIZE (mumble-voip-rnnoise-a9afccc_GH0.tar.gz) = 173954
14
SHA256 (mumble-voip-sbcelt-045493d_GH0.tar.gz) = dc9bdcc26a3642cb7ead98cb487c9a52225228fbbfa6f75906d9e479e11b862a
12
SHA256 (mumble-voip-mumble-theme-f9868bd_GH0.tar.gz) = b923c13294fac9c41e00cd0fcfe095c6d1af7970b18be9da088e4bc0f129423d
15
SIZE (mumble-voip-sbcelt-045493d_GH0.tar.gz) = 20128
13
SIZE (mumble-voip-mumble-theme-f9868bd_GH0.tar.gz) = 402733
16
SHA256 (mumble-voip-mumble-theme-9467fe8_GH0.tar.gz) = 4ac062686b75f8ea558a4d92df205e51c1d4c1b5676a28b656b8664fc56470db
14
SHA256 (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 8439bfe7daeb478d8e8aa09b3c111c3dc360064144d181fc5dcfef950e8eaa05
17
SIZE (mumble-voip-mumble-theme-9467fe8_GH0.tar.gz) = 378261
15
SIZE (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 4817
(-)audio/mumble/files/patch-overlay_gl-overlay.c (-10 lines)
Lines 1-10 Link Here
1
--- overlay_gl/overlay.c.orig	2019-03-13 18:38:10 UTC
2
+++ overlay_gl/overlay.c
3
@@ -16,6 +16,7 @@
4
 #include <sys/ipc.h>
5
 #include <sys/time.h>
6
 #include <sys/socket.h>
7
+#include <sys/stat.h>
8
 #include <sys/un.h>
9
 #include <sys/stat.h>
10
 #include <time.h>
(-)audio/mumble/files/patch-qmake_builddir.pri (-24 lines)
Lines 1-24 Link Here
1
--- qmake/builddir.pri.orig	2019-10-20 18:28:58 UTC
2
+++ qmake/builddir.pri
3
@@ -33,20 +33,7 @@ isEmpty(TOP_BUILDDIR) {
4
   TOP_BUILDDIR = $$TOP_SRCDIR
5
 }
6
 
7
-# If the build and source paths are equal,
8
-# it's not a shadow build.
9
-equals(TOP_BUILDDIR, $$TOP_SRCDIR) {
10
-  CONFIG(debug, debug|release) {
11
-    DESTDIR = $$TOP_BUILDDIR/debug
12
-  }
13
-
14
-  CONFIG(release, debug|release) {
15
-    DESTDIR = $$TOP_BUILDDIR/release
16
-  }
17
-} else {
18
-  DESTDIR = $$TOP_BUILDDIR
19
-}
20
-
21
+DESTDIR = $$TOP_BUILDDIR/release
22
 OBJECTS_ROOT = $$DESTDIR/.obj
23
 MOC_ROOT = $$DESTDIR/.moc
24
 RCC_ROOT = $$DESTDIR/.qrc
(-)audio/mumble/pkg-plist (-6 / +9 lines)
Lines 1-12 Link Here
1
bin/mumble
1
bin/mumble
2
lib/libcelt-mumble.so.0.11.0
3
lib/libcelt-mumble.so.0.7.0
2
lib/libcelt-mumble.so.0.7.0
4
lib/libmumble.so
5
lib/libmumble.so.%%MAJORVERSION%%
6
lib/libmumble.so.%%MINORVERSION%%
7
lib/libmumble.so.%%PATCHVERSION%%
8
man/man1/mumble.1.gz
3
man/man1/mumble.1.gz
9
share/applications/mumble.desktop
4
lib/libmumbleoverlay.x86_64.so
5
lib/libmumbleoverlay.x86_64.so.%%MAJORVERSION%%
6
lib/libmumbleoverlay.x86_64.so.%%MINORVERSION%%
7
lib/libmumbleoverlay.x86_64.so.%%PATCHVERSION%%
8
lib/libmumbleoverlay.x86.so
9
lib/libmumbleoverlay.x86.so.%%MAJORVERSION%%
10
lib/libmumbleoverlay.x86.so.%%MINORVERSION%%
11
lib/libmumbleoverlay.x86.so.%%PATCHVERSION%%
12
share/applications/org.mumble_voip.mumble.desktop
10
share/icons/hicolor/128x128/apps/mumble.png
13
share/icons/hicolor/128x128/apps/mumble.png
11
share/icons/hicolor/scalable/apps/mumble.svg
14
share/icons/hicolor/scalable/apps/mumble.svg
12
share/pixmaps/mumble.xpm
15
share/pixmaps/mumble.xpm

Return to bug 261395