From 504fad18e611f9a979e52c95798a61196c0f3ad9 Mon Sep 17 00:00:00 2001
From: James Geboski <jgeboski@gmail.com>
Date: Fri, 11 Nov 2011 17:17:25 +0000
Subject: network/mumble: Updated for version 1.2.3.

Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>
---
 network/mumble/README            | 5 ++++-
 network/mumble/mumble.SlackBuild | 7 ++++++-
 network/mumble/mumble.info       | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'network/mumble')

diff --git a/network/mumble/README b/network/mumble/README
index 3505f5c8d2..7ffc9f7501 100644
--- a/network/mumble/README
+++ b/network/mumble/README
@@ -8,6 +8,9 @@ If you have g15tools installed and want mumble to use it:
 If you want the mumble overlay:
     OVERLAY=yes ./mumble.SlackBuild
 
-This requires: protobuf, speex, and celt.
+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.
+
+This requires: protobuf, speex, and 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 65782e9da1..9bb6d6774f 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:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -83,6 +83,11 @@ 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.
+sed -i 's/CELT_SET_VBR_RATE/CELT_SET_BITRATE/' src/mumble/AudioInput.cpp
+
 qmake \
   -recursive \
   main.pro \
diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info
index 0b2091dced..94b2fc61ed 100644
--- a/network/mumble/mumble.info
+++ b/network/mumble/mumble.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="James Geboski"
 EMAIL="jgeboski@gmail.com"
-APPROVED="Niels Horn"
+APPROVED="michiel"
-- 
cgit v1.2.3-65-gdbad