diff options
author | Matteo Bernardini | 2018-07-28 07:58:42 +0200 |
---|---|---|
committer | Matteo Bernardini | 2018-07-28 07:58:42 +0200 |
commit | eb9f09f3aa50f7ba72b87af629558f74d5be6d10 (patch) | |
tree | c1c2c71c4a37f5fca8c5f677d996b2113f71c3bb /network/mumble | |
parent | dfc1e15955c74e1614673fed21a3b14a27b6bbcc (diff) | |
download | slackbuilds-a6baba4882bac756b94c1d18e39cbbebc9bfe031.tar.gz |
20180728.1 global branch merge.current-20180728.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'network/mumble')
-rw-r--r-- | network/mumble/boost-1.66.patch | 32 | ||||
-rw-r--r-- | network/mumble/mumble.SlackBuild | 3 |
2 files changed, 35 insertions, 0 deletions
diff --git a/network/mumble/boost-1.66.patch b/network/mumble/boost-1.66.patch new file mode 100644 index 0000000000..cf61106ce6 --- /dev/null +++ b/network/mumble/boost-1.66.patch @@ -0,0 +1,32 @@ +From ea861fe86743c8402bbad77d8d1dd9de8dce447e Mon Sep 17 00:00:00 2001 +From: Mikkel Krautz <mikkel@krautz.dk> +Date: Fri, 29 Dec 2017 14:47:25 +0100 +Subject: [PATCH] AudioOutput: do not use non-existant template version of + std::abs. + +This change fixes AudioOutput to use the float overload of std::abs: + + float std::abs(float); + +instead of a non-existant template version. + +Fixes mumble-voip/mumble#3281 + +Needs-Backport: 1.2.x +--- + src/mumble/AudioOutput.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp +index cbe0c0e2b..7a0a5e2ab 100644 +--- a/src/mumble/AudioOutput.cpp ++++ b/src/mumble/AudioOutput.cpp +@@ -437,7 +437,7 @@ bool AudioOutput::mix(void *outbuff, unsigned int nsamp) { + top[2] = 0.0f; + } + +- if (std::abs<float>(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) { ++ if (std::abs(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) { + // Not perpendicular. Assume Y up and rotate 90 degrees. + + float azimuth = 0.0f; diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild index 9de8dc9468..08a665cc71 100644 --- a/network/mumble/mumble.SlackBuild +++ b/network/mumble/mumble.SlackBuild @@ -92,6 +92,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 {} \; +# From upstream, needed for the newer boost +patch -p1 < $CWD/boost-1.66.patch + # Mumble won't find the speechd header without this patch -p1 < $CWD/libspeechd_header.patch |