summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward W. Koenig <kingbeowulf@linuxgalaxy.org>2021-04-03 18:11:46 -0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2021-04-10 17:04:57 +0700
commitb50ec5875609d2b34a39f80ef17a8e0d58c9bf1c (patch)
tree38404b17281f2fea407306ea958d4b3889708946
parent4cca5d4ea426287f5e6414f9f84fe168a404d827 (diff)
downloadslackbuilds-b50ec5875609d2b34a39f80ef17a8e0d58c9bf1c.tar.gz
network/mumble: Updated for version 1.3.4
Signed-off-by: Edward W. Koenig <kingbeowulf@linuxgalaxy.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--network/mumble/bump_overlay_version.patch23
-rw-r--r--network/mumble/mumble.SlackBuild54
-rw-r--r--network/mumble/mumble.info8
3 files changed, 55 insertions, 30 deletions
diff --git a/network/mumble/bump_overlay_version.patch b/network/mumble/bump_overlay_version.patch
new file mode 100644
index 0000000000..87bc372c42
--- /dev/null
+++ b/network/mumble/bump_overlay_version.patch
@@ -0,0 +1,23 @@
+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 065babbc92..7b98f57838 100644
--- a/network/mumble/mumble.SlackBuild
+++ b/network/mumble/mumble.SlackBuild
@@ -3,7 +3,7 @@
# 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,16 +23,16 @@
# 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>
PRGNAM=mumble
-VERSION=${VERSION:-1.3.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.3.4}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
G15=${G15:-no}
OVERLAY=${OVERLAY:-no}
COMPAT32=${COMPAT32:-no}
+NUMJOBS=${NUMJOBS:-1}
SPEECHD=${SPEECHD:-no}
CELT070=${CELT070:-no}
@@ -63,20 +63,24 @@ else
LIBDIRSUFFIX=""
fi
-BUILD_G15=""
-BUILD_OVERLAY=""
-
if [ "$G15" = "no" ]; then
BUILD_G15="CONFIG+=no-g15"
+else
+ BUILD_G15=""
fi
if [ "$OVERLAY" = "no" ]; then
BUILD_OVERLAY="CONFIG+=no-overlay"
+else
+ BUILD_OVERLAY=""
fi
if [ "$SPEECHD" = "no" ]; then
BUILD_SPEECHD="CONFIG+=no-speechd"
+else
+ BUILD_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.
@@ -101,6 +105,9 @@ 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 {} \;
+# 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" \
@@ -114,9 +121,9 @@ qmake-qt5 -recursive main.pro \
CONFIG+=no-bonjour \
CONFIG+=no-qt4-legacy-compat \
$BUILD_CELT \
+ $BUILD_SPEECHD \
$BUILD_G15 \
- $BUILD_OVERLAY \
- $BUILD_SPEECHD
+ $BUILD_OVERLAY
make release
@@ -125,31 +132,27 @@ mkdir -p \
$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
- cp -a release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble
+ install -m 755 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 \
+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
+if [ "$OVERLAY" = "yes" ]; 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.3
ln -sf libmumble.so.$VERSION libmumble.so.1
ln -sf libmumble.so.$VERSION libmumble.so
cd -
@@ -165,8 +168,7 @@ if [ "$COMPAT32" = "yes" -a "$OVERLAY" = "yes" -a "$ARCH" = "x86_64" ]; then
qmake-qt5 \
QMAKE_CFLAGS="-m32 -O2 -march=i486 -mtune=i686" \
QMAKE_CXXFLAGS="-m32 -O2 -march=i486 -mtune=i686" \
- QMAKE_LFLAGS="-m32" \
- overlay_gl.pro
+ QMAKE_LFLAGS="-m32" overlay_gl.pro
make release DESTDIR_ADD=-32
cd -
@@ -175,7 +177,7 @@ if [ "$COMPAT32" = "yes" -a "$OVERLAY" = "yes" -a "$ARCH" = "x86_64" ]; then
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.3
ln -sf libmumble.so.$VERSION libmumble.so.1
ln -sf libmumble.so.$VERSION libmumble.so
cd -
@@ -188,7 +190,7 @@ 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
+cp -a AUTHORS INSTALL CHANGES LICENSE README README.Linux $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 7f38d1e60d..ce3a2cddea 100644
--- a/network/mumble/mumble.info
+++ b/network/mumble/mumble.info
@@ -1,10 +1,10 @@
PRGNAM="mumble"
-VERSION="1.3.3"
+VERSION="1.3.4"
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/1.3.4/mumble-1.3.4.tar.gz"
+MD5SUM="d41ece1a4cefadfc1d04a16863514f98"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="protobuf opus speex qt5"
+REQUIRES="opus speex protobuf3 qt5"
MAINTAINER="Edward W. Koenig"
EMAIL="kingbeowulf@gmail.com"