network/mumble: Updated for version 1.2.16.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 40 insertions, 17 deletions

diff --git a/network/mumble/README b/network/mumble/README
index 0dc1d56c48..f4a487f6e1 100644
--- a/network/mumble/README
+++ b/network/mumble/README
@@ -17,3 +17,10 @@ To build the overlay with 32-bit compatability:
     OVERLAY=yes COMPAT32=yes ./mumble.SlackBuild
 
 Note: This does not build the mumble server (murmur).
+
+***NOTE: text-to-speech is now an available option in mumble with
+SPEECHD=yes and requires additional optional dependencies:
+You will need one text-to-speech engine installed. For example:
+flite
+festival
+espeak
diff --git a/network/mumble/libspeechd_header.patch b/network/mumble/libspeechd_header.patch
new file mode 100644
index 0000000000..d398777a64
--- /dev/null
+++ b/network/mumble/libspeechd_header.patch
@@ -0,0 +1,12 @@
+diff -Naur mumble-1.2.16/src/mumble/TextToSpeech_unix.cpp mumble-1.2.16-new/src/mumble/TextToSpeech_unix.cpp
+--- mumble-1.2.16/src/mumble/TextToSpeech_unix.cpp	2016-05-05 07:56:03.000000000 -0700
++++ mumble-1.2.16-new/src/mumble/TextToSpeech_unix.cpp	2016-05-15 21:58:16.605311547 -0700
+@@ -33,7 +33,7 @@
+ #include "TextToSpeech.h"
+ 
+ #ifdef USE_SPEECHD
+-#include <libspeechd.h>
++#include </usr/include/speech-dispatcher/libspeechd.h>
+ #endif
+ 
+ #include "Global.h"
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index 5b5206dc21..2015eba2b6 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -26,13 +26,14 @@
 # New maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
 
 PRGNAM=mumble
-VERSION=${VERSION:-1.2.11}
+VERSION=${VERSION:-1.2.16}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 G15=${G15:-no}
 OVERLAY=${OVERLAY:-no}
 COMPAT32=${COMPAT32:-no}
+SPEECHD=${SPEECHD:-no}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -72,6 +73,10 @@ if [ "$OVERLAY" = "no" ]; then
   BUILD_OVERLAY="CONFIG+=no-overlay"
 fi
 
+if [ "$SPEECHD" = "no" ]; then
+  BUILD_SPEECHD="CONFIG+=no-speechd"
+fi
+
 set -e
 
 rm -rf $PKG
@@ -82,14 +87,15 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-qmake \
-  -recursive \
-  main.pro \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Mumble won't find the speechd header without this
+patch -p1 < $CWD/libspeechd_header.patch
+
+qmake -recursive main.pro \
   QMAKE_CFLAGS+="$SLKCFLAGS" \
   QMAKE_CXXFLAGS+="$SLKCFLAGS" \
   DEFINES*="PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/mumble" \
@@ -97,13 +103,13 @@ qmake \
   CONFIG+=no-server \
   CONFIG+=no-bundled-opus \
   CONFIG+=no-bundled-speex \
-  CONFIG+=no-speechd \
   CONFIG+=no-update \
   CONFIG+=no-embed-qt-translations \
   CONFIG+=no-ice \
   CONFIG+=no-bonjour \
   $BUILD_G15 \
-  $BUILD_OVERLAY
+  $BUILD_OVERLAY \
+  $BUILD_SPEECHD
 
 make release
 
@@ -176,9 +182,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CHANGES LICENSE README README.Linux \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES LICENSE README README.Linux $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info
index 7749c769e8..f6b9d0fb5b 100644
--- a/network/mumble/mumble.info
+++ b/network/mumble/mumble.info
@@ -1,8 +1,8 @@
 PRGNAM="mumble"
-VERSION="1.2.11"
+VERSION="1.2.16"
 HOMEPAGE="http://wiki.mumble.info/wiki/Main_Page"
-DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.2.11/mumble-1.2.11.tar.gz"
-MD5SUM="bd1f15c6c8c8950e1d02452689759d38"
+DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.2.16/mumble-1.2.16.tar.gz"
+MD5SUM="58e7574af80e36e0b943df0e6a44d6ce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="protobuf opus speex"