- Update to 1.2.4

PR: ports/179309
Reviewed by: crees (mentor)

1 files changed, 12 insertions, 39 deletions

diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index be816c49e34d..205aec8cc67a 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -2,19 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	mumble
-PORTVERSION=	1.2.3
-PORTREVISION=	3
+PORTVERSION=	1.2.4
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/Mumble/${PORTVERSION}
 
 MAINTAINER=	marius@nuenneri.ch
 COMMENT=	A voice chat software primarily intended for use while gaming
 
-LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex \
-		sndfile.1:${PORTSDIR}/audio/libsndfile \
+LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex \
+		sndfile:${PORTSDIR}/audio/libsndfile \
 		boost_iostreams:${PORTSDIR}/devel/boost-libs \
 		boost_python:${PORTSDIR}/devel/boost-python-libs \
-		protoc:${PORTSDIR}/devel/protobuf
+		protoc:${PORTSDIR}/devel/protobuf \
+		opus:${PORTSDIR}/audio/opus
 
 USE_GMAKE=	yes
 USE_QT4=	gui svg iconengines_run xml sql network l10n \
@@ -25,14 +25,12 @@ USE_XORG=	ice
 HAS_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
-CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-update \
-		no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations
+CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-bundled-opus no-update \
+		bundled-celt no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations
 
-OPTIONS_DEFINE=	DBUS BONJOUR MUMBLE11X SYSCELT
+OPTIONS_DEFINE=	DBUS BONJOUR
 OPTIONS_DEFAULT=	DBUS
 BONJOUR_DESC=		Bonjour support
-MUMBLE11X_DESC=		mumble 1.1 support
-SYSCELT_DESC=		Use system CELT libraries
 
 MAN1=		mumble.1
 
@@ -44,51 +42,26 @@ CONFIG+=	no-dbus
 USE_QT4+=	dbus
 .endif
 
-.if ! ${PORT_OPTIONS:MSYSCELT}
-CONFIG+=	bundled-celt
-PLIST_SUB+=	BUNDLECELT=""
-.else
-CONFIG+=	no-bundled-celt
-PLIST_SUB+=	BUNDLECELT="@comment "
-LIB_DEPENDS+=	celt0.2:${PORTSDIR}/audio/celt
-.endif
-
 .if ! ${PORT_OPTIONS:MBONJOUR}
 CONFIG+=	no-bonjour
 .else
 LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
 .endif
 
-.if ! ${PORT_OPTIONS:MMUMBLE11X}
-CONFIG+=	no-11x
-PLIST_SUB+=	MUMBLE11X="@comment "
-.else
-PLIST_SUB+=	MUMBLE11X=""
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
-	# Fix with celt 0.11
-.if ${PORT_OPTIONS:MSYSCELT}
-	@${REINPLACE_CMD} -e 's/CELT_SET_VBR_RATE/CELT_SET_BITRATE/g' ${WRKSRC}/src/mumble/AudioInput.cpp
-.endif
 
 do-configure:
-.if ! ${PORT_OPTIONS:MSYSCELT}
 	cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}"
-.else
-	cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}" "DEFINES+=FREEBSD_SYSTEM_CELT=1"
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${PREFIX}/bin
-.if ! ${PORT_OPTIONS:MSYSCELT}
 	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${PREFIX}/lib/libcelt-mumble.so.0.11.0
 	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.7.0 ${PREFIX}/lib/libcelt-mumble.so.0.7.0
-.endif
-.if ${PORT_OPTIONS:MMUMBLE11X}
-	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble11x ${PREFIX}/bin
-.endif
+	${INSTALL_LIB} ${WRKSRC}/release/libmumble.so.1.2.4 ${PREFIX}/lib/libmumble.so.1.2.4
+	${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${PREFIX}/lib/libmumble.so
+	${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${PREFIX}/lib/libmumble.so.1
+	${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${PREFIX}/lib/libmumble.so.1.2
 	${MKDIR} ${PREFIX}/share/services
 	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${PREFIX}/share/services
 	${MKDIR} ${PREFIX}/share/applications