From 5b9e2bacbba98d29e840b18893dd5b5f07e4e256 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 11 Aug 2018 08:22:49 +0200 Subject: 20180811.1 global branch merge. Signed-off-by: Matteo Bernardini --- network/mumble/boost-1.66.patch | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 network/mumble/boost-1.66.patch (limited to 'network/mumble/boost-1.66.patch') 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 +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(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; -- cgit v1.2.3