[152196] trunk/dports/math/fftw-3

[sean at macports.org]

Revision: 152196
          https://trac.macports.org/changeset/152196
Author:   sean at macports.org
Date:     2016-08-31 13:59:21 -0700 (Wed, 31 Aug 2016)
Log Message:
-----------
fftw-3: update to 3.3.5; closes 51953

Modified Paths:
--------------
    trunk/dports/math/fftw-3/Portfile
    trunk/dports/math/fftw-3/files/patch-pfft.diff

Removed Paths:
-------------
    trunk/dports/math/fftw-3/files/leopard-no-memalign.patch

Modified: trunk/dports/math/fftw-3/Portfile
===================================================================
--- trunk/dports/math/fftw-3/Portfile	2016-08-31 20:59:17 UTC (rev 152195)
+++ trunk/dports/math/fftw-3/Portfile	2016-08-31 20:59:21 UTC (rev 152196)
@@ -7,8 +7,7 @@
 PortGroup       mpi 1.0
 
 name            fftw-3
-version         3.3.4
-revision        1
+version         3.3.5
 categories      math
 license         GPL-2+
 platforms       darwin
@@ -40,15 +39,13 @@
     improvements relative to 2.x, but is not backwardly \
     compatible.
 
-checksums \
-    rmd160  463b5120d42ec2a3bc1385689176c5e0296d0d4a \
-    sha256  8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982
+checksums           rmd160  d5800f3d56b7b499265633b52a0b9850b17c148e \
+                    sha256  8ecfe1b04732ec3f5b7d279fdb8efcad536d555f9d1e8fabd027037d45ea8bcf
 
 # Don't link with "-flat_namespace -undefined suppress" on Yosemite and
 # later (#45707).
 patchfiles \
-    yosemite-libtool.patch \
-    leopard-no-memalign.patch
+    yosemite-libtool.patch
 
 variant pfft_patches description {Apply patches recommended for use as dependency of pfft port} {
     if {![mpi_variant_isset]} {
@@ -56,6 +53,7 @@
     }
 
     # Cut from scripts at https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software.php.en#fftwinstall,
+    # except that the last hunk of mpi/transpose-pairwise.c has been incorporated into 3.3.5 already.
     #Important: Within these scripts we apply the following patches that have been submitted to FFTW but are not yet included in FFTW-3.3.4:
     #  We add two more global transposition algorithms to the planner.
     #  We patch file mpi/transpose-pairwise.c in order to fix a double free bug.
@@ -232,6 +230,14 @@
 }
 
 if {${name} == ${subport}} {
+    platform i386 {
+        if {![variant_isset universal]} {
+            configure.args-append       --enable-sse2
+            if { [avx_compiler_isset] == 1 } {
+                configure.args-append   --enable-avx --enable-avx2
+            }
+        }
+    }
     livecheck.type  regex
     livecheck.url   ${homepage}
     livecheck.regex {FFTW (\d+(?:\.\d+)*) is the latest}

Deleted: trunk/dports/math/fftw-3/files/leopard-no-memalign.patch
===================================================================
--- trunk/dports/math/fftw-3/files/leopard-no-memalign.patch	2016-08-31 20:59:17 UTC (rev 152195)
+++ trunk/dports/math/fftw-3/files/leopard-no-memalign.patch	2016-08-31 20:59:21 UTC (rev 152196)
@@ -1,11 +0,0 @@
---- kernel/ifftw.h.orig	2015-01-08 16:12:31.000000000 -0800
-+++ kernel/ifftw.h	2015-01-08 16:14:18.000000000 -0800
-@@ -120,7 +120,7 @@ typedef struct scanner_s scanner;
- /*-----------------------------------------------------------------------*/
- /* alloca: */
- #if HAVE_SIMD
--#  ifdef HAVE_AVX
-+#  if defined(HAVE_AVX) && defined(HAVE_POSIX_MEMALIGN)
- #    define MIN_ALIGNMENT 32  /* best alignment for AVX, conservative for
- 			       * everything else */
- #  else

Modified: trunk/dports/math/fftw-3/files/patch-pfft.diff
===================================================================
--- trunk/dports/math/fftw-3/files/patch-pfft.diff	2016-08-31 20:59:17 UTC (rev 152195)
+++ trunk/dports/math/fftw-3/files/patch-pfft.diff	2016-08-31 20:59:21 UTC (rev 152196)
@@ -342,13 +342,6 @@
  	       }
  	  }
       }
-@@ -350,6 +349,7 @@ nada:
-      X(plan_destroy_internal)(*cld3);
-      X(plan_destroy_internal)(*cld2rest);
-      X(plan_destroy_internal)(*cld2);
-+     *cld2 = *cld2rest = *cld3 = NULL;
-      return 0;
- }
  
 --- mpi/transpose-pairwise-transposed.c	1970-01-01 01:00:00.000000000 +0100
 +++ mpi/transpose-pairwise-transposed.c	2015-09-05 06:00:07.280481042 +0200
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160831/196bc25e/attachment-0001.html>