Date: Sun, 6 Mar 2011 15:36:47 -0600 (CST) From: Mark Felder <feld@feld.me> To: FreeBSD-gnats-submit@FreeBSD.org Cc: marius@nuenneri.ch Subject: ports/155324: [PATCH] audio/mumble: update to 1.2.3 Message-ID: <201103062136.p26LalvF042382@skeletor.feld.me> Resent-Message-ID: <201103062140.p26LeCrS095373@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155324
>Category: ports
>Synopsis: [PATCH] audio/mumble: update to 1.2.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 06 21:40:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Mark Felder
>Release: FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD skeletor.feld.me 8.2-RELEASE FreeBSD 8.2-RELEASE #1: Thu Feb 17 13:03:46 CST 2011
>Description:
- Update to 1.2.3
Also adds knob that needs to be enabled if you want to build against a system-wide CELT
instead of using the built-in one.
Thanks fwaggle!
Added file(s):
- files/patch-overlay_gl-overlay.c
Removed file(s):
- files/patch-main.pro
Port maintainer (marius@nuenneri.ch) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- mumble-1.2.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/mumble/Makefile /tmp/audio/mumble/Makefile
--- /usr/ports/audio/mumble/Makefile 2010-12-02 14:00:37.000000000 -0600
+++ /tmp/audio/mumble/Makefile 2011-03-06 15:26:35.000000000 -0600
@@ -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,11 +14,11 @@
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 \
protoc:${PORTSDIR}/devel/protobuf
+# celt.0:${PORTSDIR}/audio/celt \
USE_GMAKE= yes
USE_QT_VER= 4
@@ -31,12 +30,13 @@
HAS_CONFIGURE= yes
INSTALLS_ICONS= yes
-CONFIG= no-server no-alsa no-speechd no-bundled-speex no-bundled-celt 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-update \
+ no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations no-overlay
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 +52,15 @@
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 +78,18 @@
@${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 -ruN --exclude=CVS /usr/ports/audio/mumble/distinfo /tmp/audio/mumble/distinfo
--- /usr/ports/audio/mumble/distinfo 2010-01-16 11:28:09.000000000 -0600
+++ /tmp/audio/mumble/distinfo 2011-03-06 15:28:06.000000000 -0600
@@ -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 -ruN --exclude=CVS /usr/ports/audio/mumble/files/patch-compiler.pri /tmp/audio/mumble/files/patch-compiler.pri
--- /usr/ports/audio/mumble/files/patch-compiler.pri 2010-01-16 11:28:09.000000000 -0600
+++ /tmp/audio/mumble/files/patch-compiler.pri 2011-03-06 15:26:28.000000000 -0600
@@ -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 -ruN --exclude=CVS /usr/ports/audio/mumble/files/patch-main.pro /tmp/audio/mumble/files/patch-main.pro
--- /usr/ports/audio/mumble/files/patch-main.pro 2010-01-16 11:28:09.000000000 -0600
+++ /tmp/audio/mumble/files/patch-main.pro 1969-12-31 18:00:00.000000000 -0600
@@ -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 -ruN --exclude=CVS /usr/ports/audio/mumble/files/patch-overlay_gl-overlay.c /tmp/audio/mumble/files/patch-overlay_gl-overlay.c
--- /usr/ports/audio/mumble/files/patch-overlay_gl-overlay.c 1969-12-31 18:00:00.000000000 -0600
+++ /tmp/audio/mumble/files/patch-overlay_gl-overlay.c 2011-03-06 15:26:28.000000000 -0600
@@ -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 -ruN --exclude=CVS /usr/ports/audio/mumble/files/patch-src-mumble-Audio.cpp /tmp/audio/mumble/files/patch-src-mumble-Audio.cpp
--- /usr/ports/audio/mumble/files/patch-src-mumble-Audio.cpp 2010-01-16 11:28:09.000000000 -0600
+++ /tmp/audio/mumble/files/patch-src-mumble-Audio.cpp 2011-03-06 15:26:28.000000000 -0600
@@ -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 -ruN --exclude=CVS /usr/ports/audio/mumble/files/patch-src-mumble11x-mumble11x.pro /tmp/audio/mumble/files/patch-src-mumble11x-mumble11x.pro
--- /usr/ports/audio/mumble/files/patch-src-mumble11x-mumble11x.pro 2010-01-16 11:28:09.000000000 -0600
+++ /tmp/audio/mumble/files/patch-src-mumble11x-mumble11x.pro 2011-03-06 15:26:28.000000000 -0600
@@ -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 -ruN --exclude=CVS /usr/ports/audio/mumble/pkg-plist /tmp/audio/mumble/pkg-plist
--- /usr/ports/audio/mumble/pkg-plist 2010-12-02 14:00:37.000000000 -0600
+++ /tmp/audio/mumble/pkg-plist 2011-03-06 15:26:35.000000000 -0600
@@ -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
--- mumble-1.2.3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103062136.p26LalvF042382>