network/mumble: Use the bundled celt versions.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

3 files changed, 12 insertions, 37 deletions

diff --git a/network/mumble/README b/network/mumble/README
index 3df6db6a0fce..0dc1d56c4845 100644
--- a/network/mumble/README
+++ b/network/mumble/README
@@ -16,7 +16,4 @@ mumble-overlay script to use for compatability. Please note, you
 To build the overlay with 32-bit compatability:
     OVERLAY=yes COMPAT32=yes ./mumble.SlackBuild
 
-Please note, if you have celt-0.7.1, the previous version of celt on
-SBo, you will need to upgrade to celt >= 0.11.0.
-
 Note: This does not build the mumble server (murmur).
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index 1bf452845738..d6fc4efa82ba 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=mumble
 VERSION=${VERSION:-1.2.3}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 G15=${G15:-no}
@@ -84,35 +84,18 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# As of celt-0.11.0, the macro CELT_SET_VBR_RATE has been renamed to
-# CELT_SET_BITRATE. Please make sure you have at least celt-0.11.0,
-# if not comment the line below out.
-patch -p1 < $CWD/patches/AudioInput-fix-for-celt-0.11.0.patch
-
 # On GTK+ based envrionments (Ex: XFCE) the MainWindow's icon needed
 # to be directly set.
 patch -p1 < $CWD/patches/MainWindow-set-the-window-icon.patch
 
-# The system's celt-0.11.0 is used, however, celt-0.7.0 is needed
-# to keep compatibility with other Mumble clients.
-cd celt-0.7.0-build
-  qmake \
-    QMAKE_CFLAGS+="$SLKCFLAGS" \
-    QMAKE_CXXFLAGS+="$SLKCFLAGS" \
-    -recursive \
-    celt-0.7.0-build.pro
-  
-  make release
-cd -
-
 qmake \
   -recursive \
   main.pro \
   QMAKE_CFLAGS+="$SLKCFLAGS" \
   QMAKE_CXXFLAGS+="$SLKCFLAGS" \
   DEFINES*="PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/mumble" \
+  CONFIG+=bundled-celt \
   CONFIG+=no-server \
-  CONFIG+=no-bundled-celt \
   CONFIG+=no-bundled-speex \
   CONFIG+=no-pulseaudio \
   CONFIG+=no-speechd \
@@ -136,15 +119,10 @@ install -m 755 \
   release/mumble11x \
  $PKG/usr/bin
 
-install -m 775 \
-  release/libcelt0.so.0.7.0 \
- $PKG/usr/lib${LIBDIRSUFFIX}/mumble
-
-cd $PKG/usr/lib${LIBDIRSUFFIX}/mumble
-  ln -sf libcelt0.so.0.7.0 libcelt0.so.0.7
-  ln -sf libcelt0.so.0.7.0 libcelt0.so.0
-  ln -sf libcelt0.so.0.7.0 libcelt0.so
-cd -
+# Mumble's bundled celt is needed:
+# celt-0.7.0 is needed to keep compatibility with other clients
+# celt-0,11.0 is needed as SBo's 0.11.3 is incompatible
+cp -a release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble
 
 install -m 644 \
   man/mumble-overlay.1 \
@@ -162,7 +140,7 @@ find release/plugins -type f -name *.so \
 if [ -e release/libmumble.so.$VERSION ]; then
   install -m 755 release/libmumble.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX}
   install -m 755 scripts/mumble-overlay        $PKG/usr/bin
-  
+
   cd $PKG/usr/lib${LIBDIRSUFFIX}
     ln -sf libmumble.so.$VERSION libmumble.so.1.2
     ln -sf libmumble.so.$VERSION libmumble.so.1
@@ -176,19 +154,19 @@ fi
 if [ "$COMPAT32" = "yes" -a "$OVERLAY" = "yes" -a "$ARCH" = "x86_64" ]; then
   cd overlay_gl
     make clean
-    
+
     qmake \
       QMAKE_CFLAGS="-m32 -O2 -march=i486 -mtune=i686" \
       QMAKE_CXXFLAGS="-m32 -O2 -march=i486 -mtune=i686" \
       QMAKE_LFLAGS="-m32" \
       overlay_gl.pro
-    
+
     make release DESTDIR_ADD=-32
   cd -
-  
+
   mkdir -p $PKG/usr/lib
   install -m 755 release-32/libmumble.so.$VERSION $PKG/usr/lib
-  
+
   cd $PKG/usr/lib
     ln -sf libmumble.so.$VERSION libmumble.so.1.2
     ln -sf libmumble.so.$VERSION libmumble.so.1
diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info
index 9e39bdfac753..1c3349b31976 100644
--- a/network/mumble/mumble.info
+++ b/network/mumble/mumble.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/mumble/mumble-1.2.3.tar.gz"
 MD5SUM="55804e3dfe98b16eeb40abca6c254625"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="celt protobuf speex"
+REQUIRES="protobuf speex"
 MAINTAINER="James Geboski"
 EMAIL="jgeboski@gmail.com"