Mercurial > mxe-octave

changeset 3241:537ca0c3354d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update fftw to 3.3.3 * index.html: update fftw-version to 3.3.3. * src/fftw.mk: update checksum for 3.3.3. * src/msvc-fftw-1.patch: update patch for 3.3.3 sources.
author John Donoghue <john.donoghue@ieee.org>
date Fri, 30 Aug 2013 20:54:00 -0400
parents d99f6d03618c
children 50a4de42ba1e
files index.html src/fftw.mk src/msvc-fftw-1.patch
diffstat 3 files changed, 25 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Sat Aug 31 16:21:06 2013 -0400
+++ b/index.html	Fri Aug 30 20:54:00 2013 -0400
@@ -1140,7 +1140,7 @@
     </tr>
     <tr>
         <td id="fftw-package">fftw</td>
-        <td id="fftw-version">3.3.2</td>
+        <td id="fftw-version">3.3.3</td>
         <td id="fftw-website"><a href="http://www.fftw.org/">fftw</a></td>
     </tr>
     <tr>
--- a/src/fftw.mk	Sat Aug 31 16:21:06 2013 -0400
+++ b/src/fftw.mk	Fri Aug 30 20:54:00 2013 -0400
@@ -3,7 +3,7 @@
 
 PKG             := fftw
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 11a8c31186ff5a7d686a79a3f21b2530888e0dc2
+$(PKG)_CHECKSUM := 11487180928d05746d431ebe7a176b52fe205cf9
 $(PKG)_SUBDIR   := fftw-$($(PKG)_VERSION)
 $(PKG)_FILE     := fftw-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.fftw.org/$($(PKG)_FILE)
--- a/src/msvc-fftw-1.patch	Sat Aug 31 16:21:06 2013 -0400
+++ b/src/msvc-fftw-1.patch	Fri Aug 30 20:54:00 2013 -0400
@@ -1,6 +1,6 @@
-diff -ur fftw-3.3.2-orig/api/fftw3.h fftw-3.3.2/api/fftw3.h
---- fftw-3.3.2-orig/api/fftw3.h	2012-04-28 10:58:06 -0400
-+++ fftw-3.3.2/api/fftw3.h	2013-06-24 17:32:40 -0400
+diff -ur fftw-3.3.3.orig/api/fftw3.h fftw-3.3.3/api/fftw3.h
+--- fftw-3.3.3.orig/api/fftw3.h	2013-08-30 20:48:15 -0400
++++ fftw-3.3.3/api/fftw3.h	2013-08-30 20:48:31 -0400
 @@ -82,8 +82,14 @@
  #  else /* user is calling FFTW; import symbol */
  #    define FFTW_EXTERN extern __declspec(dllimport) 
@@ -29,9 +29,9 @@
  									   \
  FFTW_EXTERN int X(export_wisdom_to_filename)(const char *filename);	   \
  FFTW_EXTERN void X(export_wisdom_to_file)(FILE *output_file);		   \
-diff -ur fftw-3.3.2-orig/dft/ct.h fftw-3.3.2/dft/ct.h
---- fftw-3.3.2-orig/dft/ct.h	2012-04-28 10:58:06 -0400
-+++ fftw-3.3.2/dft/ct.h	2013-06-24 15:28:17 -0400
+diff -ur fftw-3.3.3.orig/dft/ct.h fftw-3.3.3/dft/ct.h
+--- fftw-3.3.3.orig/dft/ct.h	2013-08-30 20:48:15 -0400
++++ fftw-3.3.3/dft/ct.h	2013-08-30 20:48:31 -0400
 @@ -56,7 +56,7 @@
  ct_solver *X(mksolver_ct)(size_t size, INT r, int dec, 
  			  ct_mkinferior mkcldw, 
@@ -41,9 +41,9 @@
  					 ct_mkinferior, ct_force_vrecursion);
  
  void X(regsolver_ct_directw)(planner *plnr,
-diff -ur fftw-3.3.2-orig/rdft/hc2hc.h fftw-3.3.2/rdft/hc2hc.h
---- fftw-3.3.2-orig/rdft/hc2hc.h	2012-04-28 10:58:06 -0400
-+++ fftw-3.3.2/rdft/hc2hc.h	2013-06-24 15:28:36 -0400
+diff -ur fftw-3.3.3.orig/rdft/hc2hc.h fftw-3.3.3/rdft/hc2hc.h
+--- fftw-3.3.3.orig/rdft/hc2hc.h	2013-08-30 20:48:17 -0400
++++ fftw-3.3.3/rdft/hc2hc.h	2013-08-30 20:48:31 -0400
 @@ -46,7 +46,7 @@
  };
  
@@ -53,10 +53,10 @@
  
  void X(regsolver_hc2hc_direct)(planner *plnr, khc2hc codelet, 
  			       const hc2hc_desc *desc);
-diff -ur fftw-3.3.2-orig/tests/Makefile.in fftw-3.3.2/tests/Makefile.in
---- fftw-3.3.2-orig/tests/Makefile.in	2012-04-28 10:58:44 -0400
-+++ fftw-3.3.2/tests/Makefile.in	2013-06-24 19:57:50 -0400
-@@ -65,7 +65,7 @@
+diff -ur fftw-3.3.3.orig/tests/Makefile.in fftw-3.3.3/tests/Makefile.in
+--- fftw-3.3.3.orig/tests/Makefile.in	2013-08-30 20:48:17 -0400
++++ fftw-3.3.3/tests/Makefile.in	2013-08-30 20:48:31 -0400
+@@ -82,7 +82,7 @@
  	$(top_builddir)/libbench2/libbench2.a $(am__DEPENDENCIES_1)
  bench_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  	--mode=link $(CCLD) $(bench_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -65,7 +65,7 @@
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -229,7 +229,7 @@
+@@ -251,7 +251,7 @@
  top_srcdir = @top_srcdir@
  AM_CPPFLAGS = -I$(top_srcdir)/kernel -I$(top_srcdir)/libbench2	\
  -I$(top_srcdir)/dft -I$(top_srcdir)/rdft -I$(top_srcdir)/reodft	\
@@ -74,10 +74,10 @@
  
  EXTRA_DIST = check.pl README
  @OPENMP_TRUE@@THREADS_FALSE@bench_CFLAGS = $(OPENMP_CFLAGS)
-diff -ur fftw-3.3.2-orig/threads/Makefile.in fftw-3.3.2/threads/Makefile.in
---- fftw-3.3.2-orig/threads/Makefile.in	2012-04-28 10:58:44 -0400
-+++ fftw-3.3.2/threads/Makefile.in	2013-06-24 17:28:37 -0400
-@@ -291,7 +291,8 @@
+diff -ur fftw-3.3.3.orig/threads/Makefile.in fftw-3.3.3/threads/Makefile.in
+--- fftw-3.3.3.orig/threads/Makefile.in	2013-08-30 20:48:17 -0400
++++ fftw-3.3.3/threads/Makefile.in	2013-08-30 20:48:31 -0400
+@@ -313,7 +313,8 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AM_CPPFLAGS = -I$(top_srcdir)/kernel -I$(top_srcdir)/dft	\
@@ -87,7 +87,7 @@
  
  AM_CFLAGS = $(STACK_ALIGN_CFLAGS)
  @OPENMP_FALSE@FFTWOMPLIB = 
-@@ -307,7 +308,7 @@
+@@ -329,7 +330,7 @@
  vrank-geq1-rdft2.c f77api.c f77funcs.h
  
  libfftw3@PREC_SUFFIX@_threads_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
@@ -96,10 +96,10 @@
  @COMBINED_THREADS_FALSE@libfftw3@PREC_SUFFIX@_threads_la_LIBADD = ../libfftw3@PREC_SUFFIX@.la
  libfftw3@PREC_SUFFIX@_omp_la_SOURCES = api.c conf.c openmp.c	\
  threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c	\
-diff -ur fftw-3.3.2-orig/tools/Makefile.in fftw-3.3.2/tools/Makefile.in
---- fftw-3.3.2-orig/tools/Makefile.in	2012-04-28 10:58:44 -0400
-+++ fftw-3.3.2/tools/Makefile.in	2013-06-24 20:01:18 -0400
-@@ -74,7 +74,7 @@
+diff -ur fftw-3.3.3.orig/tools/Makefile.in fftw-3.3.3/tools/Makefile.in
+--- fftw-3.3.3.orig/tools/Makefile.in	2013-08-30 20:48:17 -0400
++++ fftw-3.3.3/tools/Makefile.in	2013-08-30 20:48:31 -0400
+@@ -91,7 +91,7 @@
  fftw@PREC_SUFFIX@_wisdom_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
  	$(fftw@PREC_SUFFIX@_wisdom_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \