Date: Fri, 6 May 2016 19:25:49 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414721 - head/audio/calf/files Message-ID: <201605061925.u46JPnx2079297@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Fri May 6 19:25:49 2016 New Revision: 414721 URL: https://svnweb.freebsd.org/changeset/ports/414721 Log: audio/calf: Fix build with libc++ 3.8.0 - change some patches to conform to makepatch rules PR: 209333 Submitted by: dim Added: head/audio/calf/files/patch-src_analyzer.cpp (contents, props changed) head/audio/calf/files/patch-src_modules__dist.cpp (contents, props changed) head/audio/calf/files/patch-src_modules__limit.cpp (contents, props changed) Modified: head/audio/calf/files/patch-src__calf__audio_fx.h head/audio/calf/files/patch-src__calf__osctl.h Modified: head/audio/calf/files/patch-src__calf__audio_fx.h ============================================================================== --- head/audio/calf/files/patch-src__calf__audio_fx.h Fri May 6 19:18:41 2016 (r414720) +++ head/audio/calf/files/patch-src__calf__audio_fx.h Fri May 6 19:25:49 2016 (r414721) @@ -1,4 +1,4 @@ ---- src/calf/audio_fx.h.orig +--- src/calf/audio_fx.h.orig 2015-03-13 23:00:12 UTC +++ src/calf/audio_fx.h @@ -27,6 +27,7 @@ #include "inertia.h" Modified: head/audio/calf/files/patch-src__calf__osctl.h ============================================================================== --- head/audio/calf/files/patch-src__calf__osctl.h Fri May 6 19:18:41 2016 (r414720) +++ head/audio/calf/files/patch-src__calf__osctl.h Fri May 6 19:25:49 2016 (r414721) @@ -1,4 +1,4 @@ ---- src/calf/osctl.h.orig +--- src/calf/osctl.h.orig 2014-01-26 21:24:40 UTC +++ src/calf/osctl.h @@ -26,7 +26,10 @@ #include <vector> Added: head/audio/calf/files/patch-src_analyzer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/calf/files/patch-src_analyzer.cpp Fri May 6 19:25:49 2016 (r414721) @@ -0,0 +1,17 @@ +--- src/analyzer.cpp.orig 2014-10-14 18:53:15 UTC ++++ src/analyzer.cpp +@@ -471,12 +471,12 @@ void analyzer::draw(int subindex, float + //pumping up actual signal an erase surrounding + // sounds + fft_outL[_iter] = 0.25f * std::max(n * 0.6f * \ +- fabs(fft_outL[_iter]) - var1L , 1e-20); ++ fabsf(fft_outL[_iter]) - var1L , 1e-20f); + if(_mode == 3 or _mode == 4) { + // do the same with R channel if needed + lastoutR = fft_outR[_iter]; + fft_outR[_iter] = 0.25f * std::max(n * \ +- 0.6f * fabs(fft_outR[_iter]) - var1R , 1e-20); ++ 0.6f * fabsf(fft_outR[_iter]) - var1R , 1e-20f); + } + break; + } Added: head/audio/calf/files/patch-src_modules__dist.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/calf/files/patch-src_modules__dist.cpp Fri May 6 19:25:49 2016 (r414721) @@ -0,0 +1,13 @@ +--- src/modules_dist.cpp.orig 2015-03-13 23:00:12 UTC ++++ src/modules_dist.cpp +@@ -794,8 +794,8 @@ uint32_t tapesimulator_audio_module::pro + lfo2.advance(1); + + // dot +- rms = std::max((double)rms, (fabs(Lo) + fabs(Ro)) / 2); +- input = std::max((double)input, (fabs(Lc) + fabs(Rc)) / 2); ++ rms = std::max(rms, (fabsf(Lo) + fabsf(Ro)) / 2); ++ input = std::max(input, (fabsf(Lc) + fabsf(Rc)) / 2); + + float values[] = {inL, inR, outs[0][i], outs[1][i]}; + meters.process(values); Added: head/audio/calf/files/patch-src_modules__limit.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/calf/files/patch-src_modules__limit.cpp Fri May 6 19:25:49 2016 (r414721) @@ -0,0 +1,20 @@ +--- src/modules_limit.cpp.orig 2014-10-14 18:56:24 UTC ++++ src/modules_limit.cpp +@@ -429,7 +429,7 @@ uint32_t multibandlimiter_audio_module:: + } + + // write multiband coefficient to buffer +- buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0); ++ buffer[pos] = std::min(*params[param_limit] / std::max(fabsf(tmpL), fabsf(tmpR)), 1.0f); + + // step forward in multiband buffer + pos = (pos + channels) % buffer_size; +@@ -811,7 +811,7 @@ uint32_t sidechainlimiter_audio_module:: + } + + // write multiband coefficient to buffer +- buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0); ++ buffer[pos] = std::min(*params[param_limit] / std::max(fabsf(tmpL), fabsf(tmpR)), 1.0f); + + // step forward in multiband buffer + pos = (pos + channels) % buffer_size;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605061925.u46JPnx2079297>