9 files changed, 37 insertions, 135 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
diff --git a/audio/mumble/distinfo b/audio/mumble/distinfo
index 1d52c12026b9..dc2af7cd1ac7 100644
--- a/audio/mumble/distinfo
+++ b/audio/mumble/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mumble-1.2.3.tar.gz) = 05895122ae4abec3fb62ef24ed9d167ffd768e7080ed179c8bf3afca96d18a5c
-SIZE (mumble-1.2.3.tar.gz) = 3448053
+SHA256 (mumble-1.2.4.tar.gz) = a1cf8383d99a02719b16c5440e3a5fb5375a8aa060f203bfa5d25bc69f919c9b
+SIZE (mumble-1.2.4.tar.gz) = 3200084
diff --git a/audio/mumble/files/patch-plugins-plugins.pri b/audio/mumble/files/patch-plugins-plugins.pri
index ec75619bd355..8c77456d7044 100644
--- a/audio/mumble/files/patch-plugins-plugins.pri
+++ b/audio/mumble/files/patch-plugins-plugins.pri
@@ -2,9 +2,9 @@ $FreeBSD$
 
 Disable debug; runs into cryptic errors on 9+/amd64
 
---- plugins/plugins.pri.orig	2011-02-19 21:35:16.000000000 +0000
-+++ plugins/plugins.pri	2011-11-28 20:27:31.374646598 +0000
-@@ -1,16 +1,11 @@
+--- plugins/plugins.pri.orig	2013-06-04 10:06:48.955586932 -0500
++++ plugins/plugins.pri	2013-06-04 10:07:37.450613576 -0500
+@@ -1,7 +1,7 @@
  include(../compiler.pri)
  
  TEMPLATE	= lib
@@ -13,6 +13,10 @@ Disable debug; runs into cryptic errors on 9+/amd64
  CONFIG		-= qt
  DIST		*= mumble_plugin.h
  
+@@ -10,12 +10,7 @@
+ 	CONFIG += qt_dynamic_lookup
+ }
+ 
 -CONFIG(debug, debug|release) {
 -  CONFIG += console
 -  DESTDIR       = ../../debug/plugins
diff --git a/audio/mumble/files/patch-src-mumble-Audio.cpp b/audio/mumble/files/patch-src-mumble-Audio.cpp
deleted file mode 100644
index 95fa137de402..000000000000
--- a/audio/mumble/files/patch-src-mumble-Audio.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../mumble-1.2.3/src/mumble/Audio.cpp	2011-02-19 16:35:16.000000000 -0500
-+++ src/mumble/Audio.cpp	2011-03-01 16:46:50.000000000 -0500
-@@ -65,6 +65,7 @@
- 		}
- 	}
- 
-+#if defined(__FreeBSD__) && !defined(FREEBSD_SYSTEM_CELT)
- 	codec = new CELTCodec080(QLatin1String("0.9.0"));
- 	if (codec->isValid()) {
- 		codec->report();
-@@ -102,6 +103,7 @@
- 			delete codec;
- 		}
- 	}
-+#endif
- }
- 
- void CodecInit::destroy() {
-@@ -132,6 +134,10 @@
- 	alternatives << QString::fromLatin1("celt0.%1.dylib").arg(version);
- 	alternatives << QString::fromLatin1("libcelt.%1.dylib").arg(version);
- 	alternatives << QString::fromLatin1("celt.%1.dylib").arg(version);
-+#elif defined(__FreeBSD__) && defined(FREEBSD_SYSTEM_CELT)
-+	alternatives << QString::fromLatin1("libcelt.so.0");
-+#elif defined(__FreeBSD__)
-+	alternatives << QString::fromLatin1("libcelt-mumble.so.%1").arg(version);
- #elif defined(Q_OS_UNIX)
- 	alternatives << QString::fromLatin1("libcelt0.so.%1").arg(version);
- 	alternatives << QString::fromLatin1("libcelt.so.%1").arg(version);
diff --git a/audio/mumble/files/patch-src-mumble-ServerHandler.cpp b/audio/mumble/files/patch-src-mumble-ServerHandler.cpp
index c2e6594cccf9..6f00c7a48327 100644
--- a/audio/mumble/files/patch-src-mumble-ServerHandler.cpp
+++ b/audio/mumble/files/patch-src-mumble-ServerHandler.cpp
@@ -1,9 +1,9 @@
---- src/mumble/ServerHandler.cpp.orig	2010-01-08 00:37:46.000000000 +0200
-+++ src/mumble/ServerHandler.cpp	2010-01-10 23:57:24.000000000 +0200
-@@ -42,6 +42,12 @@
- #include "NetworkConfig.h"
- #include "OSInfo.h"
+--- src/mumble/ServerHandler.cpp.orig	2013-06-04 11:44:15.381594007 -0500
++++ src/mumble/ServerHandler.cpp	2013-06-04 11:44:36.772583833 -0500
+@@ -45,6 +45,12 @@
+ #include "PacketDataStream.h"
  #include "SSL.h"
+ #include "User.h"
 +#ifdef __FreeBSD__
 +#include <sys/socket.h>
 +#include <sys/types.h>
diff --git a/audio/mumble/files/patch-src-mumble-mumble.pro b/audio/mumble/files/patch-src-mumble-mumble.pro
index e3bc2e0bef5e..12517ae6f1a2 100644
--- a/audio/mumble/files/patch-src-mumble-mumble.pro
+++ b/audio/mumble/files/patch-src-mumble-mumble.pro
@@ -1,19 +1,6 @@
---- src/mumble/mumble.pro.orig	2010-01-08 00:37:46.000000000 +0200
-+++ src/mumble/mumble.pro	2010-01-10 23:59:44.000000000 +0200
-@@ -44,7 +44,11 @@
- }
- 
- CONFIG(no-bundled-celt) {
--  INCLUDEPATH	*= /usr/include/celt
-+  contains(UNAME, FreeBSD) {
-+    INCLUDEPATH	*= /usr/local/include/celt
-+  } else {
-+    INCLUDEPATH	*= /usr/include/celt
-+  }
- }
- 
- !CONFIG(no-bundled-celt) {
-@@ -110,7 +114,16 @@
+--- src/mumble/mumble.pro.orig	2013-06-04 11:46:38.900573055 -0500
++++ src/mumble/mumble.pro	2013-06-04 11:47:41.836576507 -0500
+@@ -161,7 +161,16 @@
  
    CONFIG *= link_pkgconfig
  
@@ -29,5 +16,5 @@
 +    PKGCONFIG *= openssl
 +  }
  
-   contains(UNAME, Linux) {
-     !CONFIG(no-oss) {
+   macx {
+     TARGET = Mumble
diff --git a/audio/mumble/files/patch-src-mumble11x-ServerHandler.cpp b/audio/mumble/files/patch-src-mumble11x-ServerHandler.cpp
deleted file mode 100644
index 21ddc094b658..000000000000
--- a/audio/mumble/files/patch-src-mumble11x-ServerHandler.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/mumble11x/ServerHandler.cpp.orig	2010-01-08 00:37:46.000000000 +0200
-+++ src/mumble11x/ServerHandler.cpp	2010-01-11 00:01:42.000000000 +0200
-@@ -39,6 +39,12 @@
- #include "Database.h"
- #include "PacketDataStream.h"
- #include "NetworkConfig.h"
-+#ifdef __FreeBSD__
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <netinet/tcp.h>
-+#endif
- 
- ServerHandlerMessageEvent::ServerHandlerMessageEvent(QByteArray &msg, bool flush) : QEvent(static_cast<QEvent::Type>(SERVERSEND_EVENT)) {
- 	qbaMsg = msg;
diff --git a/audio/mumble/files/patch-src-mumble11x-mumble11x.pro b/audio/mumble/files/patch-src-mumble11x-mumble11x.pro
deleted file mode 100644
index d87bf5152d72..000000000000
--- a/audio/mumble/files/patch-src-mumble11x-mumble11x.pro
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../mumble-1.2.3/src/mumble11x/mumble11x.pro	2011-02-19 16:35:18.000000000 -0500
-+++ src/mumble11x/mumble11x.pro	2011-02-27 21:36:36.000000000 -0500
-@@ -113,7 +113,17 @@
- 
-   CONFIG *= link_pkgconfig
- 
--  PKGCONFIG *= openssl ogg
-+  PKGCONFIG *= ogg
-+
-+  contains(UNAME, FreeBSD) {
-+    CONFIG *= oss
-+    HEADERS *= GlobalShortcut_unix.h
-+    SOURCES *= GlobalShortcut_unix.cpp
-+    LIBS *= -lssl
-+  } else {
-+    PKGCONFIG *= openssl
-+  }
-+
-   macx {
-     TARGET = Mumble11x
-     ICON = ../../icons/mumble.icns
diff --git a/audio/mumble/pkg-plist b/audio/mumble/pkg-plist
index 4e1f1d430017..5b52111fad29 100644
--- a/audio/mumble/pkg-plist
+++ b/audio/mumble/pkg-plist
@@ -1,7 +1,10 @@
 bin/mumble
-%%BUNDLECELT%%lib/libcelt-mumble.so.0.7.0
-%%BUNDLECELT%%lib/libcelt-mumble.so.0.11.0
-%%MUMBLE11X%%bin/mumble11x
+lib/libcelt-mumble.so.0.11.0
+lib/libcelt-mumble.so.0.7.0
+lib/libmumble.so
+lib/libmumble.so.1
+lib/libmumble.so.1.2
+lib/libmumble.so.1.2.4
 share/applications/mumble.desktop
 share/services/mumble.protocol
 share/icons/hicolor/128x128/apps/mumble.png