- Update to 1.2.3

- Add option to build against a system-wide CELT instead of using
  the built-in one.

PR:		ports/155324
Submitted by:	Mark Felder <feld at feld.me>
Approved by:	maintainer

8 files changed, 64 insertions, 47 deletions

diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index bd619b8cd126..898d51d6484d 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mumble
-PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTVERSION=	1.2.3
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/Mumble/${PORTVERSION}
 
@@ -15,7 +14,6 @@ MAINTAINER=	marius@nuenneri.ch
 COMMENT=	A voice chat software primarily intended for use while gaming
 
 LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex \
-		celt.0:${PORTSDIR}/audio/celt \
 		sndfile.1:${PORTSDIR}/audio/libsndfile \
 		boost_iostreams:${PORTSDIR}/devel/boost-libs \
 		boost_python:${PORTSDIR}/devel/boost-python-libs \
@@ -31,12 +29,13 @@ USE_XORG=	ice
 HAS_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
-CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-bundled-celt no-update \
+CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-update \
 		no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations
 
 OPTIONS=	DBUS "Enable D-Bus support" on \
 		BONJOUR "Enable Bonjour support" off \
 		MUMBLE11X "Enable mumble 1.1 support" off \
+		SYSCELT "Use system CELT libraries" off \
 
 MAN1=		mumble.1
 
@@ -52,6 +51,15 @@ CONFIG+=	no-dbus
 QT_COMPONENTS+=	dbus
 .endif
 
+.if defined(WITHOUT_SYSCELT)
+CONFIG+=	bundled-celt
+PLIST_SUB+=	BUNDLECELT=""
+.else
+CONFIG+=	no-bundled-celt
+PLIST_SUB+=	BUNDLECELT="@comment "
+LIB_DEPENDS+=	celt.0:${PORTSDIR}/audio/celt
+.endif
+
 .if defined(WITHOUT_BONJOUR)
 CONFIG+=	no-bonjour
 .else
@@ -69,10 +77,18 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
 
 do-configure:
+.if defined(WITHOUT_SYSCELT)
 	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 defined(WITHOUT_SYSCELT)
+	${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 !defined(WITHOUT_MUMBLE11X)
 	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble11x ${PREFIX}/bin
 .endif
diff --git a/audio/mumble/distinfo b/audio/mumble/distinfo
index fc92374bd4dc..1d52c12026b9 100644
--- a/audio/mumble/distinfo
+++ b/audio/mumble/distinfo
@@ -1,3 +1,2 @@
-MD5 (mumble-1.2.1.tar.gz) = 94b59aef3233b91705fa8cfcdd04d3e1
-SHA256 (mumble-1.2.1.tar.gz) = 91267a8511783fea5115137ef6ab4aacc76e363e504ac0f562af5e630d9e68c1
-SIZE (mumble-1.2.1.tar.gz) = 2913120
+SHA256 (mumble-1.2.3.tar.gz) = 05895122ae4abec3fb62ef24ed9d167ffd768e7080ed179c8bf3afca96d18a5c
+SIZE (mumble-1.2.3.tar.gz) = 3448053
diff --git a/audio/mumble/files/patch-compiler.pri b/audio/mumble/files/patch-compiler.pri
index 2c5da0f6dd00..c6fc59df69af 100644
--- a/audio/mumble/files/patch-compiler.pri
+++ b/audio/mumble/files/patch-compiler.pri
@@ -1,6 +1,6 @@
---- compiler.pri.orig	2010-01-07 23:37:46.000000000 +0100
-+++ compiler.pri	2010-01-16 14:38:57.000000000 +0100
-@@ -97,9 +97,9 @@
+--- compiler.pri.orig	2011-02-24 16:24:49.000000000 -0500
++++ compiler.pri	2011-02-24 16:26:09.000000000 -0500
+@@ -103,9 +103,9 @@
  
  unix:!macx {
  	CONFIG(debug, debug|release) {
diff --git a/audio/mumble/files/patch-main.pro b/audio/mumble/files/patch-main.pro
deleted file mode 100644
index 324ad8519ecb..000000000000
--- a/audio/mumble/files/patch-main.pro
+++ /dev/null
@@ -1,13 +0,0 @@
---- main.pro.orig	2010-01-11 05:30:10.000000000 +0200
-+++ main.pro	2010-01-11 05:30:24.000000000 +0200
-@@ -26,10 +26,6 @@
-     }
-   }
- 
--  unix:!macx {
--    SUBDIRS *= overlay_gl
--  }
--
-   macx {
-     SUBDIRS *= overlay_macx
-     !CONFIG(no-g15) {
diff --git a/audio/mumble/files/patch-overlay_gl-overlay.c b/audio/mumble/files/patch-overlay_gl-overlay.c
new file mode 100644
index 000000000000..3323640e6630
--- /dev/null
+++ b/audio/mumble/files/patch-overlay_gl-overlay.c
@@ -0,0 +1,10 @@
+--- overlay_gl/overlay.c~	2011-02-19 16:35:15.000000000 -0500
++++ overlay_gl/overlay.c	2011-02-27 16:04:32.000000000 -0500
+@@ -45,6 +45,7 @@
+ #include <sys/ipc.h>
+ #include <sys/time.h>
+ #include <sys/socket.h>
++#include <sys/stat.h>
+ #include <sys/un.h>
+ #include <time.h>
+ #include <semaphore.h>
diff --git a/audio/mumble/files/patch-src-mumble-Audio.cpp b/audio/mumble/files/patch-src-mumble-Audio.cpp
index c591e26e5c2e..95fa137de402 100644
--- a/audio/mumble/files/patch-src-mumble-Audio.cpp
+++ b/audio/mumble/files/patch-src-mumble-Audio.cpp
@@ -1,27 +1,29 @@
---- src/mumble/Audio.cpp.orig	2010-01-08 00:37:46.000000000 +0200
-+++ src/mumble/Audio.cpp	2010-01-11 01:24:46.000000000 +0200
-@@ -49,6 +49,7 @@ CodecInit ciInit;
- void CodecInit::initialize() {
- 	CELTCodec *codec = NULL;
+--- ../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 @@
+ 		}
+ 	}
  
-+#ifndef __FreeBSD__
- 	codec = new CELTCodec061(QLatin1String("0.6.1"));
++#if defined(__FreeBSD__) && !defined(FREEBSD_SYSTEM_CELT)
+ 	codec = new CELTCodec080(QLatin1String("0.9.0"));
  	if (codec->isValid()) {
  		codec->report();
-@@ -64,6 +65,7 @@ void CodecInit::initialize() {
- 	} else {
- 		delete codec;
+@@ -102,6 +103,7 @@
+ 			delete codec;
+ 		}
  	}
 +#endif
+ }
  
- 	codec = new CELTCodec070(QLatin1String("0.7.0"));
- 	if (codec->isValid()) {
-@@ -105,6 +107,8 @@ CELTCodec::CELTCodec(const QString &vers
- #if defined(Q_OS_MAC)
- 	alternatives << QString::fromLatin1("celt.%1.dylib").arg(version);
+ void CodecInit::destroy() {
+@@ -132,6 +134,10 @@
+ 	alternatives << QString::fromLatin1("celt0.%1.dylib").arg(version);
  	alternatives << QString::fromLatin1("libcelt.%1.dylib").arg(version);
-+#elif defined(__FreeBSD__)
+ 	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("celt.so.%1").arg(version);
+ 	alternatives << QString::fromLatin1("libcelt0.so.%1").arg(version);
  	alternatives << QString::fromLatin1("libcelt.so.%1").arg(version);
diff --git a/audio/mumble/files/patch-src-mumble11x-mumble11x.pro b/audio/mumble/files/patch-src-mumble11x-mumble11x.pro
index 345c4ac1cb21..d87bf5152d72 100644
--- a/audio/mumble/files/patch-src-mumble11x-mumble11x.pro
+++ b/audio/mumble/files/patch-src-mumble11x-mumble11x.pro
@@ -1,6 +1,6 @@
---- src/mumble11x/mumble11x.pro.orig	2010-01-08 00:37:46.000000000 +0200
-+++ src/mumble11x/mumble11x.pro	2010-01-09 21:00:31.000000000 +0200
-@@ -113,7 +113,16 @@
+--- ../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
  
@@ -10,11 +10,12 @@
 +  contains(UNAME, FreeBSD) {
 +    CONFIG *= oss
 +    HEADERS *= GlobalShortcut_unix.h
-+    SOURCES *= GlobalShortcut_unix.cpp TextToSpeech_unix.cpp Overlay_unix.cpp
++    SOURCES *= GlobalShortcut_unix.cpp
 +    LIBS *= -lssl
 +  } else {
 +    PKGCONFIG *= openssl
 +  }
- 
-   contains(UNAME, Linux) {
-     !CONFIG(no-oss) {
++
+   macx {
+     TARGET = Mumble11x
+     ICON = ../../icons/mumble.icns
diff --git a/audio/mumble/pkg-plist b/audio/mumble/pkg-plist
index 10e4123d71a4..4e1f1d430017 100644
--- a/audio/mumble/pkg-plist
+++ b/audio/mumble/pkg-plist
@@ -1,4 +1,6 @@
 bin/mumble
+%%BUNDLECELT%%lib/libcelt-mumble.so.0.7.0
+%%BUNDLECELT%%lib/libcelt-mumble.so.0.11.0
 %%MUMBLE11X%%bin/mumble11x
 share/applications/mumble.desktop
 share/services/mumble.protocol