diff options
| -rw-r--r-- | network/mumble/README | 35 | ||||
| -rw-r--r-- | network/mumble/bump_overlay_version.patch | 23 | ||||
| -rw-r--r-- | network/mumble/mumble.SlackBuild | 138 | ||||
| -rw-r--r-- | network/mumble/mumble.info | 8 |
4 files changed, 72 insertions, 132 deletions
diff --git a/network/mumble/README b/network/mumble/README index 581c24381027..ba5d6f914fe2 100644 --- a/network/mumble/README +++ b/network/mumble/README @@ -5,24 +5,29 @@ 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 you don't want the mumble overlay: + OVERLAY=no ./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. +If your system is x86_64 based, and you have the 32-bit multilib +libraries, mumble will can build the 32-bit overlay +library. -To build the overlay with 32-bit compatability: - OVERLAY=yes COMPAT32=yes ./mumble.SlackBuild + 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. 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 +The bundled Celt is used for optional backware compatibility. To use +your own try: -Note: This does not build the mumble server (murmur). + CELT=no ./mumble.SlackBuild + +Text-to-speech is the default (speechd and espeak). Disable with -***NOTE: text-to-speech is now an available option in mumble with -SPEECHD=yes and you will need one text-to-speech engine installed: -flite, festival, or espeak + SPEECHD=no ./mumble.SlackBuild + +Notes: +- This does not build the mumble server (murmur). +- For wget github download, you may need to use: + wget --content-disposition ... diff --git a/network/mumble/bump_overlay_version.patch b/network/mumble/bump_overlay_version.patch deleted file mode 100644 index 87bc372c420b..000000000000 --- a/network/mumble/bump_overlay_version.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d9a2a0d9b8005e2e01729195b95f20e434ffdfe6 Mon Sep 17 00:00:00 2001 -From: Robert Adam <dev@robert-adam.de> -Date: Mon, 15 Mar 2021 08:22:10 +0100 -Subject: [PATCH] BUILD: Bumped overlay version to 1.3.4 as well - -Fixes #4857 ---- - overlay_gl/overlay_gl.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro -index 05ca8df082..0ea691b162 100644 ---- a/overlay_gl/overlay_gl.pro -+++ b/overlay_gl/overlay_gl.pro -@@ -10,7 +10,7 @@ include(../qmake/compiler.pri) - TEMPLATE = lib - CONFIG -= qt gui - CONFIG *= debug_and_release --VERSION = 1.3.3 -+VERSION = 1.3.4 - SOURCES = overlay.c - - CONFIG(static) { diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild index 1b259f1d3410..ca4904bd75c8 100644 --- a/network/mumble/mumble.SlackBuild +++ b/network/mumble/mumble.SlackBuild @@ -27,17 +27,17 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mumble -VERSION=${VERSION:-1.3.4} +VERSION=${VERSION:-1.4.230} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} G15=${G15:-no} -OVERLAY=${OVERLAY:-no} +OVERLAY=${OVERLAY:-yes} COMPAT32=${COMPAT32:-no} NUMJOBS=${NUMJOBS:-1} -SPEECHD=${SPEECHD:-no} -CELT070=${CELT070:-no} +SPEECHD=${SPEECHD:-yes} +CELT=${CELT:-yes} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -74,30 +74,36 @@ else fi if [ "$G15" = "no" ]; then - BUILD_G15="CONFIG+=no-g15" + BUILD_G15="-Dg15=OFF" else - BUILD_G15="" + BUILD_G15="-Dg15=ON" fi if [ "$OVERLAY" = "no" ]; then - BUILD_OVERLAY="CONFIG+=no-overlay" + BUILD_OVERLAY="-Doverlay=OFF" else - BUILD_OVERLAY="" + BUILD_OVERLAY="-Doverlay=ON" +fi + +if [ "$COMPAT32" = "no" ]; then + BUILD_OVERLAY32="-Doverlay-xcompile=OFF" +else + BUILD_OVERLAY32="-Doverlay-xcompile=ON" fi if [ "$SPEECHD" = "no" ]; then - BUILD_SPEECHD="CONFIG+=no-speechd" + BUILD_SPEECHD="-Dspeechd=OFF" else - BUILD_SPEECHD="" + BUILD_SPEECHD="-Dspeechd=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" +# favor of opus. Celt is bundled for optional +# backware compatibility. +if [ "CELT" = "no" ]; then + BUILD_CELT="-Dbundled-celt=OFF" else - BUILD_CELT="CONFIG+=bundled-celt" + BUILD_CELT="-Dbundled-celt=ON" fi set -e @@ -107,6 +113,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +mv $PRGNAM-$VERSION.src $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -114,84 +121,32 @@ find -L . \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Bumped overlay version to 1.3.4 as well Fixes #4857 -patch -p1 < $CWD/bump_overlay_version.patch - -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 \ + +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-opus=OFF \ + -Dbundled-speex=OFF \ + -Dupdate=OFF \ + -Dbundle-qt-translations=OFF \ + -Dice=OFF \ + -Dzeroconf=OFF \ $BUILD_CELT \ $BUILD_SPEECHD \ $BUILD_G15 \ - $BUILD_OVERLAY - -make release - -mkdir -p \ - $PKG/usr/bin \ - $PKG/usr/lib${LIBDIRSUFFIX}/mumble \ - $PKG/usr/man/man1 \ - $PKG/usr/share/{applications,pixmaps} - -install -m 644 man/mumble-overlay.1 $PKG/usr/man/man1 -install -m 644 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 - -install -m 755 release/mumble $PKG/usr/bin -if [ "$CELT070" = "yes" ]; then - install -m 755 release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble -fi - -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 [ "$OVERLAY" = "yes" ]; then - install -m 755 release/libmumble.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX} - install -m 755 scripts/mumble-overlay $PKG/usr/bin + $BUILD_OVERLAY \ + $BUILD_OVERLAY32 .. - cd $PKG/usr/lib${LIBDIRSUFFIX} - ln -sf libmumble.so.$VERSION libmumble.so.1.3 - 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.3 - ln -sf libmumble.so.$VERSION libmumble.so.1 - ln -sf libmumble.so.$VERSION libmumble.so - cd - -fi +make -j${NUMJOBS} +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 @@ -200,7 +155,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 AUTHORS INSTALL CHANGES LICENSE README README.Linux $PKG/usr/doc/$PRGNAM-$VERSION +( +cd $TMP/$PRGNAM-$VERSION +cp -a AUTHORS CHANGES 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 diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info index 566b084a985a..21dab8f48186 100644 --- a/network/mumble/mumble.info +++ b/network/mumble/mumble.info @@ -1,10 +1,10 @@ PRGNAM="mumble" -VERSION="1.3.4" +VERSION="1.4.230" HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page" -DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.3.4/mumble-1.3.4.tar.gz" -MD5SUM="d41ece1a4cefadfc1d04a16863514f98" +DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.4.230/mumble-1.4.230.tar.gz" +MD5SUM="8069db67ecb4b601f0e324c62dbed90a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="protobuf3" +REQUIRES="protobuf3 poco" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@linuxgalaxy.org" |