diff options
author | Matteo Bernardini | 2024-03-29 19:31:08 +0100 |
---|---|---|
committer | Matteo Bernardini | 2024-04-20 17:28:07 +0200 |
commit | 23ad0ec925a5a70c5e03ce4d39c0c4b23667165c (patch) | |
tree | cf8dbf9b9613596053135ada17e1f275627a6aba | |
parent | 7348664936073e3ad54706addd43560c23807ed8 (diff) | |
download | slackbuilds-mumble.tar.gz |
network/mumble: Updated for version 1.5.613.mumble
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r-- | network/mumble/README | 6 | ||||
-rw-r--r-- | network/mumble/mumble.SlackBuild | 22 | ||||
-rw-r--r-- | network/mumble/mumble.info | 6 | ||||
-rw-r--r-- | network/mumble/positional-audio-plugin-gtav-32-bit-fix.patch | 30 |
4 files changed, 6 insertions, 58 deletions
diff --git a/network/mumble/README b/network/mumble/README index bb85a2cbe5..c064458c96 100644 --- a/network/mumble/README +++ b/network/mumble/README @@ -17,12 +17,6 @@ library. 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. -The bundled Celt is used for optional backware compatibility. To use -your own try: - - CELT=no ./mumble.SlackBuild - Text-to-speech is the default (speechd and espeak). Disable with SPEECHD=no ./mumble.SlackBuild diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild index f9d372c349..b00cd8abcc 100644 --- a/network/mumble/mumble.SlackBuild +++ b/network/mumble/mumble.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mumble -VERSION=${VERSION:-1.4.287} -BUILD=${BUILD:-3} +VERSION=${VERSION:-1.5.613} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -93,15 +93,6 @@ else BUILD_SPEECHD="-Dspeechd=ON" fi -# Celt is no longer maintained, and dropped in -# favor of opus. Celt is bundled for optional -# backware compatibility. -if [ "CELT" = "no" ]; then - BUILD_CELT="-Dbundled-celt=OFF" -else - BUILD_CELT="-Dbundled-celt=ON" -fi - set -e rm -rf $PKG @@ -109,7 +100,6 @@ 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 . \ @@ -118,10 +108,6 @@ 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 {} \; -# Apply missing GTAV plugin patch for 32-bit alignment -# https://github.com/mumble-voip/mumble/issues/5849 -patch -p1 < $CWD/positional-audio-plugin-gtav-32-bit-fix.patch - sed -e "s|CMAKE_CXX_STANDARD 14|CMAKE_CXX_STANDARD 17|" -i CMakeLists.txt mkdir -p build cd build @@ -134,13 +120,11 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -Dclient=ON \ -Dserver=OFF \ - -Dbundled-opus=OFF \ -Dbundled-speex=OFF \ -Dupdate=OFF \ -Dbundle-qt-translations=OFF \ -Dwarnings-as-errors=OFF \ -Dzeroconf=OFF \ - $BUILD_CELT \ $BUILD_SPEECHD \ $BUILD_G15 \ $BUILD_OVERLAY \ @@ -158,7 +142,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $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 +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 diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info index 553d27e33f..711ec36518 100644 --- a/network/mumble/mumble.info +++ b/network/mumble/mumble.info @@ -1,8 +1,8 @@ PRGNAM="mumble" -VERSION="1.4.287" +VERSION="1.5.613" HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page" -DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/v1.4.287/mumble-1.4.287.tar.gz" -MD5SUM="c9a2eb6413d165da606fb8d4657a1697" +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="protobuf3 poco" diff --git a/network/mumble/positional-audio-plugin-gtav-32-bit-fix.patch b/network/mumble/positional-audio-plugin-gtav-32-bit-fix.patch deleted file mode 100644 index 59cf2120b3..0000000000 --- a/network/mumble/positional-audio-plugin-gtav-32-bit-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 13c051b36b387356815cff5d685bc628b74ba136 Mon Sep 17 00:00:00 2001 -From: Davide Beatrici <git@davidebeatrici.dev> -Date: Thu, 1 Sep 2022 23:32:57 +0200 -Subject: [PATCH] FIX(positional-audio): Force 8 bytes alignment for - CCameraAngles in GTAV plugin - -https://en.cppreference.com/w/cpp/language/alignas - -This fixes compilation when the implicit alignment is not 8 bytes. - -It can be the case with 32 bit targets. ---- - plugins/gtav/structs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/gtav/structs.h b/plugins/gtav/structs.h -index 2829dc11e1..0e4f76edab 100644 ---- a/plugins/gtav/structs.h -+++ b/plugins/gtav/structs.h -@@ -118,7 +118,7 @@ struct CCameraManagerAngles { - ptr_t cameraAngles; // CCameraAngles * - }; - --struct CCameraAngles { -+struct alignas(8) CCameraAngles { - uint8_t pad1[960]; - ptr_t playerAngles; // CPlayerAngles * - uint8_t pad2[60]; - - |