ports/179309: [patch] audio/mumble update to 1.2.4

Mark Felder feld at feld.me
Tue Jun 4 18:00:05 UTC 2013 

>Number:         179309
>Category:       ports
>Synopsis:       [patch] audio/mumble update to 1.2.4
>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:   Tue Jun 04 18:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Mark Felder
>Release:        
>Organization:
>Environment:
>Description:
-portlint is happy now
-mumble11x, the backwards compatible client, no longer exists
-removed option for building against system celt (audio/celt). This has been dodgy for a while.
  If you choose to not use the supplied celt codec versions (very much unsupported!!) you MUST 
  provide a system celt version 0.7.X or you break compatibility with the servers and other non-updated 
  clients. Our audio/celt is version 0.11.3 which is too new; we need another celt port at 0.7.X
  if we want to restore this option to end users, which again the Mumble devs STRONGLY suggest you do
  not attempt to do.
-removed pkg-message; freebsd <8 no longer exists
-plugin libraries not getting installed. were they ever built before? can freebsd even use any plugins?
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 319854)
+++ Makefile	(working copy)
@@ -2,16 +2,15 @@
 # $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
@@ -28,11 +27,9 @@
 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_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 +41,27 @@
 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/libopus.a ${PREFIX}/lib/libopus.a
+	${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
Index: distinfo
===================================================================
--- distinfo	(revision 319854)
+++ distinfo	(working copy)
@@ -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
Index: files/patch-plugins-plugins.pri
===================================================================
--- files/patch-plugins-plugins.pri	(revision 319854)
+++ files/patch-plugins-plugins.pri	(working copy)
@@ -2,9 +2,9 @@
 
 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 @@
  CONFIG		-= qt
  DIST		*= mumble_plugin.h
  
+@@ -10,12 +10,7 @@
+ 	CONFIG += qt_dynamic_lookup
+ }
+ 
 -CONFIG(debug, debug|release) {
 -  CONFIG += console
 -  DESTDIR       = ../../debug/plugins
Index: files/patch-src-mumble-ServerHandler.cpp
===================================================================
--- files/patch-src-mumble-ServerHandler.cpp	(revision 319854)
+++ files/patch-src-mumble-ServerHandler.cpp	(working copy)
@@ -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>
Index: files/patch-src-mumble-mumble.pro
===================================================================
--- files/patch-src-mumble-mumble.pro	(revision 319854)
+++ files/patch-src-mumble-mumble.pro	(working copy)
@@ -1,20 +1,7 @@
---- 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 @@
- }
+--- 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(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 @@
- 
    CONFIG *= link_pkgconfig
  
 -  PKGCONFIG *= openssl sndfile
@@ -29,5 +16,5 @@
 +    PKGCONFIG *= openssl
 +  }
  
-   contains(UNAME, Linux) {
-     !CONFIG(no-oss) {
+   macx {
+     TARGET = Mumble
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 319854)
+++ pkg-plist	(working copy)
@@ -1,7 +1,11 @@
 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
+lib/libopus.a
 share/applications/mumble.desktop
 share/services/mumble.protocol
 share/icons/hicolor/128x128/apps/mumble.png


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list