svn commit: r322243 - in head/audio/mumble: . files
Mark Felder
feld at FreeBSD.org
Wed Jul 3 18:39:07 UTC 2013
Author: feld
Date: Wed Jul 3 18:39:06 2013
New Revision: 322243
URL: http://svnweb.freebsd.org/changeset/ports/322243
Log:
- Update to 1.2.4
PR: ports/179309
Reviewed by: crees (mentor)
Deleted:
head/audio/mumble/files/patch-src-mumble-Audio.cpp
head/audio/mumble/files/patch-src-mumble11x-ServerHandler.cpp
head/audio/mumble/files/patch-src-mumble11x-mumble11x.pro
Modified:
head/audio/mumble/Makefile (contents, props changed)
head/audio/mumble/distinfo (contents, props changed)
head/audio/mumble/files/patch-plugins-plugins.pri (contents, props changed)
head/audio/mumble/files/patch-src-mumble-ServerHandler.cpp (contents, props changed)
head/audio/mumble/files/patch-src-mumble-mumble.pro (contents, props changed)
head/audio/mumble/pkg-plist (contents, props changed)
Modified: head/audio/mumble/Makefile
==============================================================================
--- head/audio/mumble/Makefile Wed Jul 3 18:22:27 2013 (r322242)
+++ head/audio/mumble/Makefile Wed Jul 3 18:39:06 2013 (r322243)
@@ -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 at 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
Modified: head/audio/mumble/distinfo
==============================================================================
--- head/audio/mumble/distinfo Wed Jul 3 18:22:27 2013 (r322242)
+++ head/audio/mumble/distinfo Wed Jul 3 18:39:06 2013 (r322243)
@@ -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
Modified: head/audio/mumble/files/patch-plugins-plugins.pri
==============================================================================
--- head/audio/mumble/files/patch-plugins-plugins.pri Wed Jul 3 18:22:27 2013 (r322242)
+++ head/audio/mumble/files/patch-plugins-plugins.pri Wed Jul 3 18:39:06 2013 (r322243)
@@ -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
CONFIG -= qt
DIST *= mumble_plugin.h
+@@ -10,12 +10,7 @@
+ CONFIG += qt_dynamic_lookup
+ }
+
-CONFIG(debug, debug|release) {
- CONFIG += console
- DESTDIR = ../../debug/plugins
Modified: head/audio/mumble/files/patch-src-mumble-ServerHandler.cpp
==============================================================================
--- head/audio/mumble/files/patch-src-mumble-ServerHandler.cpp Wed Jul 3 18:22:27 2013 (r322242)
+++ head/audio/mumble/files/patch-src-mumble-ServerHandler.cpp Wed Jul 3 18:39:06 2013 (r322243)
@@ -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>
Modified: head/audio/mumble/files/patch-src-mumble-mumble.pro
==============================================================================
--- head/audio/mumble/files/patch-src-mumble-mumble.pro Wed Jul 3 18:22:27 2013 (r322242)
+++ head/audio/mumble/files/patch-src-mumble-mumble.pro Wed Jul 3 18:39:06 2013 (r322243)
@@ -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
Modified: head/audio/mumble/pkg-plist
==============================================================================
--- head/audio/mumble/pkg-plist Wed Jul 3 18:22:27 2013 (r322242)
+++ head/audio/mumble/pkg-plist Wed Jul 3 18:39:06 2013 (r322243)
@@ -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
More information about the svn-ports-all
mailing list