diff options
| author |   Edward W. Koenig | 2019-12-14 22:55:28 +0100 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2019-12-14 22:55:28 +0100 |
| commit | 3731942724c99484171485406ed84ea296461eba (patch) | |
| tree | 265fe38b9419dc4e5fe452f0e81d44e70ccaed00 /network/mumble/mumble.SlackBuild | |
| parent | 9fc0099f695885b47ec56a12eb546f501e813d9f (diff) | |
| download | slackbuilds-3731942724c99484171485406ed84ea296461eba.tar.gz | |
network/mumble: Updated for version 1.3.0.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network/mumble/mumble.SlackBuild')
| -rw-r--r-- | network/mumble/mumble.SlackBuild | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild index 9de8dc9468..1d6c1e1b6b 100644 --- a/network/mumble/mumble.SlackBuild +++ b/network/mumble/mumble.SlackBuild @@ -26,7 +26,7 @@ # New maintainer: Edward W. Koenig <kingbeowulf@gmail.com> PRGNAM=mumble -VERSION=${VERSION:-1.2.19} +VERSION=${VERSION:-1.3.0} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} @@ -34,10 +34,11 @@ G15=${G15:-no} OVERLAY=${OVERLAY:-no} COMPAT32=${COMPAT32:-no} SPEECHD=${SPEECHD:-no} +CELT070=${CELT070:-no} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -48,8 +49,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -76,6 +77,14 @@ fi if [ "$SPEECHD" = "no" ]; then BUILD_SPEECHD="CONFIG+=no-speechd" 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" +else + BUILD_CELT="CONFIG+=bundled-celt" +fi set -e @@ -92,14 +101,10 @@ 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 {} \; -# Mumble won't find the speechd header without this -patch -p1 < $CWD/libspeechd_header.patch - -qmake -recursive main.pro \ +qmake-qt5 -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-opus \ CONFIG+=no-bundled-speex \ @@ -107,6 +112,8 @@ qmake -recursive main.pro \ CONFIG+=no-embed-qt-translations \ CONFIG+=no-ice \ CONFIG+=no-bonjour \ + CONFIG+=no-qt4-legacy-compat \ + $BUILD_CELT \ $BUILD_G15 \ $BUILD_OVERLAY \ $BUILD_SPEECHD @@ -121,10 +128,9 @@ mkdir -p \ 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 -# celt-0.11.0 is needed as SBo's 0.11.3 is incompatible -cp -a release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble +if [ "$CELT070" = "yes" ]; then + cp -a release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble +fi install -m 644 \ man/mumble-overlay.1 \ @@ -156,7 +162,7 @@ if [ "$COMPAT32" = "yes" -a "$OVERLAY" = "yes" -a "$ARCH" = "x86_64" ]; then cd overlay_gl make clean - qmake \ + qmake-qt5 \ QMAKE_CFLAGS="-m32 -O2 -march=i486 -mtune=i686" \ QMAKE_CXXFLAGS="-m32 -O2 -march=i486 -mtune=i686" \ QMAKE_LFLAGS="-m32" \ |