diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2018-06-10 15:49:10 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2018-06-10 16:03:35 +0200 |
| commit | fc51c11b9d2534050ee32ea4598dc1ccef911913 (patch) | |
| tree | 5d556599d9da210163925a9b71aed4d2d166de66 /gnu | |
| parent | e6c8199b66e8309a329c8693dbb5ddbfa44ec20e (diff) | |
| download | patches-fc51c11b9d2534050ee32ea4598dc1ccef911913.tar patches-fc51c11b9d2534050ee32ea4598dc1ccef911913.tar.gz | |
gnu: mumble: Fix build with Boost 1.66.
Fixes <https://bugs.gnu.org/31775>.
* gnu/packages/patches/mumble-1.2.19-abs.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/telephony.scm (mumble)[source]: Add it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/mumble-1.2.19-abs.patch | 31 | ||||
| -rw-r--r-- | gnu/packages/telephony.scm | 1 |
3 files changed, 33 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index e014d59405..6aba6433fb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -938,6 +938,7 @@ dist_patch_DATA = \ %D%/packages/patches/mozjs38-shell-version.patch \ %D%/packages/patches/mozjs38-tracelogger.patch \ %D%/packages/patches/mozjs38-version-detection.patch \ + %D%/packages/patches/mumble-1.2.19-abs.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \ %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \ diff --git a/gnu/packages/patches/mumble-1.2.19-abs.patch b/gnu/packages/patches/mumble-1.2.19-abs.patch new file mode 100644 index 0000000000..683325f4bc --- /dev/null +++ b/gnu/packages/patches/mumble-1.2.19-abs.patch @@ -0,0 +1,31 @@ +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 (for newer Boost 1.66). + +Fixes mumble-voip/mumble#3281 + +--- + 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/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 6b625b5d3f..201cd8099a 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -387,6 +387,7 @@ address of one of the participants.") (sha256 (base32 "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh")) + (patches (search-patches "mumble-1.2.19-abs.patch")) (modules '((guix build utils))) (snippet `(begin |