summaryrefslogtreecommitdiffstats
path: root/network/mumble
diff options
context:
space:
mode:
Diffstat (limited to 'network/mumble')
-rw-r--r--network/mumble/README44
-rw-r--r--network/mumble/mumble.SlackBuild155
-rw-r--r--network/mumble/mumble.info10
3 files changed, 79 insertions, 130 deletions
diff --git a/network/mumble/README b/network/mumble/README
index c653790f03..c064458c96 100644
--- a/network/mumble/README
+++ b/network/mumble/README
@@ -5,28 +5,22 @@ can be compared to programs like Ventrilo or TeamSpeak.
If you have g15tools installed and want mumble to use it:
G15=yes ./mumble.SlackBuild
-If you want the mumble overlay:
- OVERLAY=yes ./mumble.SlackBuild
-
-If your system is x86_64 based, you can have this script build a
-32-bit libmumble. This will add in a 32-bit library for the
-mumble-overlay script to use for compatability. Please note, you
-*must* have a multilibbed system for this to work.
-
-To build the overlay with 32-bit compatability:
- OVERLAY=yes COMPAT32=yes ./mumble.SlackBuild
-
-Celt is no longer maintained, and dropped in is favor of opus.
-Celt-0.7.0 bundled for optional backware compatibility. SBo's celt
-is incompatible. If needed use:
- CELT070=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:
-speech-dispatcher
-and you will need one text-to-speech engine installed:
-flite
-festival
-espeak
+If you don't want the mumble overlay:
+ OVERLAY=no ./mumble.SlackBuild
+
+If your system is x86_64 based, and you have the 32-bit multilib
+libraries, mumble will can build the 32-bit overlay
+library.
+
+ COMPAT32=yes ./mumble.SlackBuild
+
+Please note, you *must* have a multilibbed system for this to work.
+See the mumble documentation on how to use the mumble overlay.
+
+Text-to-speech is the default (speechd and espeak). Disable with
+
+ SPEECHD=no ./mumble.SlackBuild
+
+Notes:
+- This does not build the mumble server (murmur).
+
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild
index 065babbc92..b00cd8abcc 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for Mumble
# Copyright 2011-2013 James Geboski <jgeboski@gmail.com>
-# Copyright 2014-2015 Edward W. Koenig <kingbeowulf@gmail.com>
+# Copyright 2014-2021 Edward W. Koenig <kingbeowulf@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,18 +23,20 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# New maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
+
+cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=mumble
-VERSION=${VERSION:-1.3.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.5.613}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
G15=${G15:-no}
-OVERLAY=${OVERLAY:-no}
+OVERLAY=${OVERLAY:-yes}
COMPAT32=${COMPAT32:-no}
-SPEECHD=${SPEECHD:-no}
-CELT070=${CELT070:-no}
+SPEECHD=${SPEECHD:-yes}
+CELT=${CELT:-yes}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -44,7 +46,11 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -63,27 +69,28 @@ else
LIBDIRSUFFIX=""
fi
-BUILD_G15=""
-BUILD_OVERLAY=""
-
if [ "$G15" = "no" ]; then
- BUILD_G15="CONFIG+=no-g15"
+ BUILD_G15="-Dg15=OFF"
+else
+ BUILD_G15="-Dg15=ON"
fi
if [ "$OVERLAY" = "no" ]; then
- BUILD_OVERLAY="CONFIG+=no-overlay"
+ BUILD_OVERLAY="-Doverlay=OFF"
+else
+ BUILD_OVERLAY="-Doverlay=ON"
fi
-if [ "$SPEECHD" = "no" ]; then
- BUILD_SPEECHD="CONFIG+=no-speechd"
+if [ "$COMPAT32" = "no" ]; then
+ BUILD_OVERLAY32="-Doverlay-xcompile=OFF"
+else
+ BUILD_OVERLAY32="-Doverlay-xcompile=ON"
fi
-# Celt is no longer maintained, and dropped in
-# favor of opus. Celt-0.7.0 is bundled for optional
-# backware compatibility. SBo's celt is incompatible.
-if [ "CELT070" = "no" ]; then
- BUILD_CELT="CONFIG+=no-bundled-celt"
+
+if [ "$SPEECHD" = "no" ]; then
+ BUILD_SPEECHD="-Dspeechd=OFF"
else
- BUILD_CELT="CONFIG+=bundled-celt"
+ BUILD_SPEECHD="-Dspeechd=ON"
fi
set -e
@@ -101,85 +108,30 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-qmake-qt5 -recursive main.pro \
- QMAKE_CFLAGS+="$SLKCFLAGS" \
- QMAKE_CXXFLAGS+="$SLKCFLAGS" \
- DEFINES*="PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/mumble" \
- CONFIG+=no-server \
- CONFIG+=no-bundled-opus \
- CONFIG+=no-bundled-speex \
- CONFIG+=no-update \
- CONFIG+=no-embed-qt-translations \
- CONFIG+=no-ice \
- CONFIG+=no-bonjour \
- CONFIG+=no-qt4-legacy-compat \
- $BUILD_CELT \
+sed -e "s|CMAKE_CXX_STANDARD 14|CMAKE_CXX_STANDARD 17|" -i CMakeLists.txt
+mkdir -p build
+cd build
+
+cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_MANDIR=/usr/man \
+ -DCMAKE_BUILD_TYPE=Release \
+ -Dclient=ON \
+ -Dserver=OFF \
+ -Dbundled-speex=OFF \
+ -Dupdate=OFF \
+ -Dbundle-qt-translations=OFF \
+ -Dwarnings-as-errors=OFF \
+ -Dzeroconf=OFF \
+ $BUILD_SPEECHD \
$BUILD_G15 \
$BUILD_OVERLAY \
- $BUILD_SPEECHD
-
-make release
+ $BUILD_OVERLAY32 ..
-mkdir -p \
- $PKG/usr/bin \
- $PKG/usr/lib${LIBDIRSUFFIX}/mumble \
- $PKG/usr/man/man1 \
- $PKG/usr/share/{applications,pixmaps}
-
-install -m 755 release/mumble $PKG/usr/bin
-
-if [ "$CELT070" = "yes" ]; then
- cp -a release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble
-fi
-
-install -m 644 \
- man/mumble-overlay.1 \
- man/mumble.1 \
- $PKG/usr/man/man1
-
-install -m 644 scripts/mumble.desktop $PKG/usr/share/applications
-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 \;
-
-# 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}
- 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
- ln -sf libmumble.so.$VERSION libmumble.so
- cd -
-fi
-
-# The mumble-overly script will look for a 32-bit libmumble on non-pure x86_64
-# systems. If the x86_64 based system has a multilib setup, the COMPAT32
-# variable can be set to 'yes' to build a 32-bit version of libmumble.
-if [ "$COMPAT32" = "yes" -a "$OVERLAY" = "yes" -a "$ARCH" = "x86_64" ]; then
- cd overlay_gl
- make clean
-
- qmake-qt5 \
- 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
- ln -sf libmumble.so.$VERSION libmumble.so
- cd -
-fi
+make
+make install DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -188,7 +140,10 @@ 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
+(
+cd $TMP/$PRGNAM-$VERSION
+cp -a CODE_OF_CONDUCT.md COMMIT_GUIDELINES.md LICENSE README.md SECURITY.md $PKG/usr/doc/$PRGNAM-$VERSION
+)
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
@@ -196,4 +151,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info
index 7f38d1e60d..711ec36518 100644
--- a/network/mumble/mumble.info
+++ b/network/mumble/mumble.info
@@ -1,10 +1,10 @@
PRGNAM="mumble"
-VERSION="1.3.3"
+VERSION="1.5.613"
HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page"
-DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.3.3/mumble-1.3.3.tar.gz"
-MD5SUM="6f28a9627e5928f011a84be03be8f3da"
+DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.5.613/mumble-1.5.613.tar.gz"
+MD5SUM="f700a8a388ebc5522ec791a6bbdf0ef1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="protobuf opus speex qt5"
+REQUIRES="protobuf3 poco"
MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+EMAIL="kingbeowulf@linuxgalaxy.org"
generated by cgit v1.2.3 (git 2.32.0) at 2024-04-28 18:43:57 +0200