diff --git a/0001-AudioOutput-do-not-use-non-existant-template-version.patch b/0001-AudioOutput-do-not-use-non-existant-template-version.patch new file mode 100644 index 0000000..7facb2c --- /dev/null +++ b/0001-AudioOutput-do-not-use-non-existant-template-version.patch @@ -0,0 +1,35 @@ +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 cbe0c0e2..7a0a5e2a 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; +-- +2.15.1 + diff --git a/mumble.changes b/mumble.changes index 6e622f6..9723160 100644 --- a/mumble.changes +++ b/mumble.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 3 19:22:57 UTC 2018 - kwalter@suse.com + +- Add 0001-AudioOutput-do-not-use-non-existant-template-version.patch + to fix tumbleweed compilation + ------------------------------------------------------------------- Thu Jun 8 06:30:23 UTC 2017 - alarrosa@suse.com diff --git a/mumble.spec b/mumble.spec index 349392c..de13585 100644 --- a/mumble.spec +++ b/mumble.spec @@ -1,7 +1,7 @@ # # spec file for package mumble # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -69,6 +69,7 @@ Patch1: mumble-1.2.11-desktop_fix.diff Patch2: appdata.patch # PATCH-FIX-UPSTREAM initialize-soundfile-format.patch -- Initialize a variable so it's not used uninitialized Patch3: initialize-soundfile-format.patch +Patch4: 0001-AudioOutput-do-not-use-non-existant-template-version.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else @@ -192,6 +193,7 @@ won't be audible to other players. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %if !%{with system_celt} %if 0%{?snapshot:1} tar -xzf %{SOURCE50}