From 3731942724c99484171485406ed84ea296461eba Mon Sep 17 00:00:00 2001 From: "Edward W. Koenig" Date: Sun, 15 Dec 2019 04:55:28 +0700 Subject: network/mumble: Updated for version 1.3.0. Signed-off-by: Willy Sudiarto Raharjo --- network/mumble/README | 5 +++++ network/mumble/libspeechd_header.patch | 12 ------------ network/mumble/mumble.SlackBuild | 34 ++++++++++++++++++++-------------- network/mumble/mumble.info | 8 ++++---- 4 files changed, 29 insertions(+), 30 deletions(-) delete mode 100644 network/mumble/libspeechd_header.patch (limited to 'network') diff --git a/network/mumble/README b/network/mumble/README index 7fb924cb74b1..c653790f030d 100644 --- a/network/mumble/README +++ b/network/mumble/README @@ -16,6 +16,11 @@ mumble-overlay script to use for compatability. Please note, you 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 diff --git a/network/mumble/libspeechd_header.patch b/network/mumble/libspeechd_header.patch deleted file mode 100644 index d398777a646e..000000000000 --- a/network/mumble/libspeechd_header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur mumble-1.2.16/src/mumble/TextToSpeech_unix.cpp mumble-1.2.16-new/src/mumble/TextToSpeech_unix.cpp ---- mumble-1.2.16/src/mumble/TextToSpeech_unix.cpp 2016-05-05 07:56:03.000000000 -0700 -+++ mumble-1.2.16-new/src/mumble/TextToSpeech_unix.cpp 2016-05-15 21:58:16.605311547 -0700 -@@ -33,7 +33,7 @@ - #include "TextToSpeech.h" - - #ifdef USE_SPEECHD --#include -+#include - #endif - - #include "Global.h" diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild index 9de8dc946848..1d6c1e1b6bd7 100644 --- a/network/mumble/mumble.SlackBuild +++ b/network/mumble/mumble.SlackBuild @@ -26,7 +26,7 @@ # New maintainer: Edward W. Koenig 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" \ diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info index 3842253f5d5a..aa0256d62bc3 100644 --- a/network/mumble/mumble.info +++ b/network/mumble/mumble.info @@ -1,10 +1,10 @@ PRGNAM="mumble" -VERSION="1.2.19" +VERSION="1.3.0" HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page" -DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.2.19/mumble-1.2.19.tar.gz" -MD5SUM="d101068ed27ce119effdb3765a8cf8e4" +DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.3.0/mumble-1.3.0.tar.gz" +MD5SUM="65fd57177879f5d1830c13a63d9f50ab" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="protobuf opus speex" +REQUIRES="protobuf opus speex qt5" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@gmail.com" -- cgit v1.2.3