<p>Kevin Harwell <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9290">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
Matthew Fredrickson: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bridge_softmix_binaural: Enable FFTW3 in Solaris 11.<br><br>ASTERISK-27939<br><br>Change-Id: Ice5640e08385a64a0a6555deaccd91e86bca154f<br>---<br>M bridges/bridge_softmix/bridge_softmix_binaural.c<br>M configure<br>M configure.ac<br>3 files changed, 14 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bridges/bridge_softmix/bridge_softmix_binaural.c b/bridges/bridge_softmix/bridge_softmix_binaural.c</span><br><span>index 2a8efd7..3a036cd 100644</span><br><span>--- a/bridges/bridge_softmix/bridge_softmix_binaural.c</span><br><span>+++ b/bridges/bridge_softmix/bridge_softmix_binaural.c</span><br><span>@@ -193,12 +193,12 @@</span><br><span> float *hrir;</span><br><span> </span><br><span> /* Prepare FFTW. */</span><br><span style="color: hsl(0, 100%, 40%);">- channel->fftw_in = fftw_alloc_real(hrtf_len + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ channel->fftw_in = (double *) fftw_malloc(sizeof(double) * (hrtf_len + 1));</span><br><span> if (channel->fftw_in == NULL) {</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- channel->fftw_out = fftw_alloc_real(hrtf_len + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ channel->fftw_out = (double *) fftw_malloc(sizeof(double) * (hrtf_len + 1));</span><br><span> if (channel->fftw_out == NULL) {</span><br><span> fftw_free(channel->fftw_in);</span><br><span> return -1;</span><br><span>@@ -239,7 +239,7 @@</span><br><span> }</span><br><span> </span><br><span> fftw_execute(channel->fftw_plan);</span><br><span style="color: hsl(0, 100%, 40%);">- channel->hrtf = fftw_alloc_real(hrtf_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ channel->hrtf = (double *) fftw_malloc(sizeof(double) * hrtf_len);</span><br><span> if (channel->hrtf == NULL) {</span><br><span> fftw_free(channel->fftw_in);</span><br><span> fftw_free(channel->fftw_out);</span><br><span>diff --git a/configure b/configure</span><br><span>index 5d52867..d0aa138 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -28544,9 +28544,9 @@</span><br><span> </span><br><span> ast_ext_lib_check_save_CFLAGS="${CFLAGS}"</span><br><span> CFLAGS="${CFLAGS} "</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_alloc_real in -lfftw3" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for fftw_alloc_real in -lfftw3... " >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">-if ${ac_cv_lib_fftw3_fftw_alloc_real+:} false; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_malloc in -lfftw3" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for fftw_malloc in -lfftw3... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+if ${ac_cv_lib_fftw3_fftw_malloc+:} false; then :</span><br><span> $as_echo_n "(cached) " >&6</span><br><span> else</span><br><span> ac_check_lib_save_LIBS=$LIBS</span><br><span>@@ -28560,27 +28560,27 @@</span><br><span> #ifdef __cplusplus</span><br><span> extern "C"</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">-char fftw_alloc_real ();</span><br><span style="color: hsl(120, 100%, 40%);">+char fftw_malloc ();</span><br><span> int</span><br><span> main ()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-return fftw_alloc_real ();</span><br><span style="color: hsl(120, 100%, 40%);">+return fftw_malloc ();</span><br><span> ;</span><br><span> return 0;</span><br><span> }</span><br><span> _ACEOF</span><br><span> if ac_fn_c_try_link "$LINENO"; then :</span><br><span style="color: hsl(0, 100%, 40%);">- ac_cv_lib_fftw3_fftw_alloc_real=yes</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_cv_lib_fftw3_fftw_malloc=yes</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- ac_cv_lib_fftw3_fftw_alloc_real=no</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_cv_lib_fftw3_fftw_malloc=no</span><br><span> fi</span><br><span> rm -f core conftest.err conftest.$ac_objext \</span><br><span> conftest$ac_exeext conftest.$ac_ext</span><br><span> LIBS=$ac_check_lib_save_LIBS</span><br><span> fi</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_alloc_real" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo "$ac_cv_lib_fftw3_fftw_alloc_real" >&6; }</span><br><span style="color: hsl(0, 100%, 40%);">-if test "x$ac_cv_lib_fftw3_fftw_alloc_real" = xyes; then :</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_malloc" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo "$ac_cv_lib_fftw3_fftw_malloc" >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$ac_cv_lib_fftw3_fftw_malloc" = xyes; then :</span><br><span> AST_FFTW3_FOUND=yes</span><br><span> else</span><br><span> AST_FFTW3_FOUND=no</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 67f04e5..87f63db 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -2421,7 +2421,7 @@</span><br><span> # ------------------------------------^</span><br><span> </span><br><span> AST_EXT_LIB_CHECK([RESAMPLE], [resample], [resample_open], [libresample.h], [-lm])</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([FFTW3], [fftw3], [fftw_alloc_real], [fftw3.h])</span><br><span style="color: hsl(120, 100%, 40%);">+AST_EXT_LIB_CHECK([FFTW3], [fftw3], [fftw_malloc], [fftw3.h])</span><br><span> AST_EXT_LIB_CHECK([SNDFILE], [sndfile], [sf_open], [sndfile.h])</span><br><span> </span><br><span> AST_C_COMPILE_CHECK([SPANDSP], [</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9290">change 9290</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/9290"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ice5640e08385a64a0a6555deaccd91e86bca154f </div>
<div style="display:none"> Gerrit-Change-Number: 9290 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Matthew Fredrickson <creslin@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>