ports/144119: audio/mumble 1.2.x does not build client compatible to 1.1.x [patch]

[Sascha Schneider]

>Number:         144119
>Category:       ports
>Synopsis:       audio/mumble 1.2.x does not build client compatible to 1.1.x [patch]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 20 00:10:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sascha Schneider
>Release:        8.0-STABLE
>Organization:
>Environment:
FreeBSD uchi.home.suntsu.org 8.0-STABLE FreeBSD 8.0-STABLE #4: Sat Feb 13 11:08:17 CET 2010     root at uchi.home.suntsu.org:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
Mumble 1.2.x is not compatible to Murmur 1.1.x, therefore Mumble is able to build a client that is, which is called for that server versions, if the user requests it.

The current port does not allow that compatible client to be installed, therefore breaking connectivity to Murmur 1.1.x, which can lead to users after updating to current port not being able to use the servers they used to.

I built a patch which lets the user decide if he wants that extra client or not.
>How-To-Repeat:
use mumble 1.2.x and try to connect to a 1.1.x Murmur. Mumble will ask if you want it to start a compatible client, which it cannot, because it is not installed.
>Fix:
Apply the attached patch, do "make configure" and select "MUMBLE11X". Rebuild and reinstall and now it works even with older servers.

Patch attached with submission follows:

diff -c -r mumble.orig/Makefile mumble/Makefile
*** mumble.orig/Makefile	2010-01-24 11:59:33.000000000 +0100
--- mumble/Makefile	2010-02-19 23:28:11.000000000 +0100
***************
*** 32,41 ****
  MAKE_JOBS_SAFE=	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-11x
  
  OPTIONS=	DBUS "Enable D-Bus support" on \
  		BONJOUR "Enable Bonjour support" off \
  
  MAN1=		mumble.1
  
--- 32,42 ----
  MAKE_JOBS_SAFE=	yes
  
  CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-bundled-celt no-update \
! 		no-g15 no-portaudio no-pulseaudio no-xevie
  
  OPTIONS=	DBUS "Enable D-Bus support" on \
  		BONJOUR "Enable Bonjour support" off \
+ 		MUMBLE11X "Enable mumble 1.1 support" on \
  
  MAN1=		mumble.1
  
***************
*** 57,62 ****
--- 58,70 ----
  LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
  .endif
  
+ .if defined(WITHOUT_MUMBLE11X)
+ CONFIG+=	no-11x
+ PLIST_SUB+=	MUMBLE11X=""
+ .else
+ PLIST_SUB+=     MUMBLE11X="@comment "
+ .endif
+ 
  post-patch:
  	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
  
***************
*** 65,70 ****
--- 73,81 ----
  
  do-install:
  	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${PREFIX}/bin
+ .if !defined(WITHOUT_MUMBLE11X)
+ 	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble11x ${PREFIX}/bin
+ .endif
  	${MKDIR} ${PREFIX}/share/services
  	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${PREFIX}/share/services
  	${MKDIR} ${PREFIX}/share/applications
diff -c -r mumble.orig/pkg-plist mumble/pkg-plist
*** mumble.orig/pkg-plist	2010-01-16 18:28:09.000000000 +0100
--- mumble/pkg-plist	2010-02-19 23:24:17.000000000 +0100
***************
*** 1,5 ****
--- 1,6 ----
  @comment $FreeBSD: ports/audio/mumble/pkg-plist,v 1.2 2010/01/16 17:28:09 beat Exp $
  bin/mumble
+ %%MUMBLE11X%%bin/mumble11x
  share/applications/mumble.desktop
  share/services/mumble.protocol
  share/icons/hicolor/128x128/apps/mumble.png
Only in mumble: work


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