diff options
| -rw-r--r-- | network/mumble/mumble.SlackBuild | 45 | ||||
| -rw-r--r-- | network/mumble/mumble.info | 2 | ||||
| -rw-r--r-- | network/mumble/patches/AudioInput-fix-for-celt-0.11.0.patch | 31 | ||||
| -rw-r--r-- | network/mumble/patches/MainWindow-set-the-window-icon.patch | 27 |
4 files changed, 95 insertions, 10 deletions
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild index 9bb6d6774f..fe0961ee0a 100644 --- a/network/mumble/mumble.SlackBuild +++ b/network/mumble/mumble.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Mumble -# Copyright 2011 James Geboski <jgeboski@gmail.com> +# Copyright 2011-2012 James Geboski <jgeboski@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -84,9 +84,23 @@ find . \ -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, +# 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 +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 \ + -recursive \ + celt-0.7.0-build.pro + + make release +cd - qmake \ -recursive \ @@ -113,15 +127,28 @@ mkdir -p \ $PKG/usr/share/{applications,pixmaps} install -m 755 \ - release/mumble release/mumble11x \ + release/mumble \ + 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 - + install -m 644 \ - man/mumble-overlay.1 man/mumble.1 man/mumble11x.1 \ + man/mumble-overlay.1 \ + man/mumble.1 \ + man/mumble11x.1 \ $PKG/usr/man/man1 install -m 644 scripts/mumble.desktop $PKG/usr/share/applications -install -m 644 icons/mumble.xpm $PKG/usr/share/pixmaps +install -m 644 icons/mumble.svg $PKG/usr/share/pixmaps find release/plugins -type f -name *.so \ -exec install -m 755 {} $PKG/usr/lib${LIBDIRSUFFIX}/mumble \; @@ -129,11 +156,11 @@ find release/plugins -type f -name *.so \ # If the overlay was built, let's install the library for it if [ -e release/libmumble.so.$VERSION ]; then install -m 755 release/libmumble.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX} - + cd $PKG/usr/lib${LIBDIRSUFFIX} ln -sf libmumble.so.$VERSION libmumble.so.1.2 - ln -sf libmumble.so.1.2 libmumble.so.1 - ln -sf libmumble.so.1 libmumble.so + ln -sf libmumble.so.$VERSION libmumble.so.1 + ln -sf libmumble.so.$VERSION libmumble.so cd - fi diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info index 94b2fc61ed..7a86ecd5a5 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="michiel" +APPROVED="dsomero" 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 new file mode 100644 index 0000000000..211396f794 --- /dev/null +++ b/network/mumble/patches/AudioInput-fix-for-celt-0.11.0.patch @@ -0,0 +1,31 @@ +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 new file mode 100644 index 0000000000..5b3db86704 --- /dev/null +++ b/network/mumble/patches/MainWindow-set-the-window-icon.patch @@ -0,0 +1,27 @@ +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 + |