summaryrefslogtreecommitdiff
path: root/network/mumble
diff options
context:
space:
mode:
authorJames Geboski <jgeboski@gmail.com>2013-06-03 23:39:20 -0500
committerRobby Workman <rworkman@slackbuilds.org>2013-06-04 00:11:36 -0500
commit3d9c8a57647ceb693dc8c26d06a8035c81af7f13 (patch)
tree1882e86d9c1105fbc16f9aab1c7e1605e22e6a08 /network/mumble
parentf0f2f666724fcc5fbd3329eddd7e550ff8c21c15 (diff)
downloadslackbuilds-3d9c8a57647ceb693dc8c26d06a8035c81af7f13.tar.gz
network/mumble: Updated for version 1.2.4.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'network/mumble')
-rw-r--r--network/mumble/mumble.SlackBuild17
-rw-r--r--network/mumble/mumble.info8
-rw-r--r--network/mumble/patches/AudioInput-fix-for-celt-0.11.0.patch31
-rw-r--r--network/mumble/patches/MainWindow-set-the-window-icon.patch27
4 files changed, 9 insertions, 74 deletions
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index d6fc4efa82..b242d17441 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for Mumble
-# Copyright 2011-2012 James Geboski <jgeboski@gmail.com>
+# Copyright 2011-2013 James Geboski <jgeboski@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=mumble
-VERSION=${VERSION:-1.2.3}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.2.4}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
G15=${G15:-no}
@@ -84,10 +84,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# 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
-
qmake \
-recursive \
main.pro \
@@ -96,6 +92,7 @@ qmake \
DEFINES*="PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/mumble" \
CONFIG+=bundled-celt \
CONFIG+=no-server \
+ CONFIG+=no-bundled-opus \
CONFIG+=no-bundled-speex \
CONFIG+=no-pulseaudio \
CONFIG+=no-speechd \
@@ -114,10 +111,7 @@ mkdir -p \
$PKG/usr/man/man1 \
$PKG/usr/share/{applications,pixmaps}
-install -m 755 \
- release/mumble \
- release/mumble11x \
- $PKG/usr/bin
+install -m 755 release/mumble $PKG/usr/bin
# Mumble's bundled celt is needed:
# celt-0.7.0 is needed to keep compatibility with other clients
@@ -127,7 +121,6 @@ cp -a release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble
install -m 644 \
man/mumble-overlay.1 \
man/mumble.1 \
- man/mumble11x.1 \
$PKG/usr/man/man1
install -m 644 scripts/mumble.desktop $PKG/usr/share/applications
diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info
index 1c3349b319..eea3b18edc 100644
--- a/network/mumble/mumble.info
+++ b/network/mumble/mumble.info
@@ -1,10 +1,10 @@
PRGNAM="mumble"
-VERSION="1.2.3"
+VERSION="1.2.4"
HOMEPAGE="http://mumble.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/mumble/mumble-1.2.3.tar.gz"
-MD5SUM="55804e3dfe98b16eeb40abca6c254625"
+DOWNLOAD="http://downloads.sourceforge.net/mumble/mumble-1.2.4.tar.gz"
+MD5SUM="49bc6abea78f9c54298934c2c28a7c7c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="protobuf speex"
+REQUIRES="protobuf opus speex"
MAINTAINER="James Geboski"
EMAIL="jgeboski@gmail.com"
diff --git a/network/mumble/patches/AudioInput-fix-for-celt-0.11.0.patch b/network/mumble/patches/AudioInput-fix-for-celt-0.11.0.patch
deleted file mode 100644
index 211396f794..0000000000
--- a/network/mumble/patches/AudioInput-fix-for-celt-0.11.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 48b4c991164c1aff4699f30ec0df9df660be75b8 Mon Sep 17 00:00:00 2001
-From: jgeboski <jgeboski@gmail.com>
-Date: Thu, 22 Mar 2012 18:16:23 -0400
-Subject: [PATCH 1/2] AudioInput: compilation fix for builds using celt >=
- 0.11.0
-
----
- src/mumble/AudioInput.cpp | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp
-index 93b7b8e..b541aea 100644
---- a/src/mumble/AudioInput.cpp
-+++ b/src/mumble/AudioInput.cpp
-@@ -823,7 +823,12 @@ void AudioInput::encodeAudioFrame() {
-
- cCodec->celt_encoder_ctl(ceEncoder, CELT_SET_PREDICTION(0));
-
-- cCodec->celt_encoder_ctl(ceEncoder,CELT_SET_VBR_RATE(iAudioQuality));
-+#ifdef CELT_SET_VBR_RATE
-+ cCodec->celt_encoder_ctl(ceEncoder, CELT_SET_VBR_RATE(iAudioQuality));
-+#else
-+ cCodec->celt_encoder_ctl(ceEncoder, CELT_SET_BITRATE(iAudioQuality));
-+#endif
-+
- len = cCodec->encode(ceEncoder, psSource, buffer, qMin(iAudioQuality / 800, 127));
- iBitrate = len * 100 * 8;
- } else {
---
-1.7.4.4
-
diff --git a/network/mumble/patches/MainWindow-set-the-window-icon.patch b/network/mumble/patches/MainWindow-set-the-window-icon.patch
deleted file mode 100644
index 5b3db86704..0000000000
--- a/network/mumble/patches/MainWindow-set-the-window-icon.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 38bdb16b33436a11bd506a80af9191cfc6f98bb3 Mon Sep 17 00:00:00 2001
-From: jgeboski <jgeboski@gmail.com>
-Date: Thu, 22 Mar 2012 18:17:56 -0400
-Subject: [PATCH 2/2] MainWindow: directly set the window icon
-
----
- src/mumble/MainWindow.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
-index ee71d6e..ce88421 100644
---- a/src/mumble/MainWindow.cpp
-+++ b/src/mumble/MainWindow.cpp
-@@ -160,6 +160,10 @@ MainWindow::MainWindow(QWidget *p) : QMainWindow(p) {
- // current open document (i.e. you can copy the open document anywhere
- // simply by dragging this icon).
- qApp->setWindowIcon(qiIcon);
-+
-+ // Set the icon on the MainWindow directly. This fixes the icon not
-+ // being set on the MainWindow in certain environments (Ex: GTK+).
-+ setWindowIcon(qiIcon);
- #endif
-
- #ifdef Q_OS_WIN
---
-1.7.4.4
-