diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-05 08:45:18 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-06 05:19:27 +0000 |
| commit | 4eaafa7558ec41a11a970c6239cafe7754422274 (patch) | |
| tree | 858d0a55a220deca9c3e28befee16361e0d97f7d /community/mumble | |
| parent | 333ed3118d9cabf21b1390ce2efa58cdcf3a845a (diff) | |
| download | aports-4eaafa7558ec41a11a970c6239cafe7754422274.tar.bz2 aports-4eaafa7558ec41a11a970c6239cafe7754422274.tar.xz | |
community/mumble: fix build with boost 1.66
Diffstat (limited to 'community/mumble')
| -rw-r--r-- | community/mumble/APKBUILD | 4 | ||||
| -rw-r--r-- | community/mumble/boost-1.66.patch | 32 |
2 files changed, 35 insertions, 1 deletions
diff --git a/community/mumble/APKBUILD b/community/mumble/APKBUILD index 554de58d65..7933dcd3ef 100644 --- a/community/mumble/APKBUILD +++ b/community/mumble/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr> pkgname=mumble pkgver=1.2.19 -pkgrel=5 +pkgrel=6 pkgdesc="A low-latency, high quality voice chat software" url="http://wiki.mumble.info" arch="all" @@ -18,6 +18,7 @@ pkgusers="murmur" pkggroups="murmur" subpackages="$pkgname-doc murmur murmur-doc:murmur_doc:noarch" source="https://github.com/mumble-voip/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz + boost-1.66.patch murmur.initd" builddir="$srcdir"/$pkgname-$pkgver @@ -102,4 +103,5 @@ murmur_doc() { } sha512sums="f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4 mumble-1.2.19.tar.gz +fcdaf2a3575e3871fe4003b93364a70a7c7029beb64ba5e24931abbe3898b72791848b5cf78ccf48eee5942a37f696a5134d061c2b8d60b66913abd701758330 boost-1.66.patch c74ade232146a180448cb0027503f59642000bee50613a1fb99162cdc4bc81089ab4e84e51b0bbdac5c176eb52b76e6bd2b3ec790a9148135a1fc050569921c3 murmur.initd" diff --git a/community/mumble/boost-1.66.patch b/community/mumble/boost-1.66.patch new file mode 100644 index 0000000000..cf61106ce6 --- /dev/null +++ b/community/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; |