25126083 Upgrade libfftw to 3.3.5
authorLukas Rovensky <Lukas.Rovensky@oracle.com>
Fri, 02 Dec 2016 06:30:07 -0800
changeset 7481 0bc6259c3cf8
parent 7480 aa7a775dd813
child 7482 191fe9eb5293
25126083 Upgrade libfftw to 3.3.5
components/fftw/Makefile
components/fftw/fftw.license
components/fftw/fftw.p5m
--- a/components/fftw/Makefile	Mon Dec 12 09:53:42 2016 -0800
+++ b/components/fftw/Makefile	Fri Dec 02 06:30:07 2016 -0800
@@ -27,15 +27,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		fftw
-COMPONENT_VERSION=	3.2.1
+COMPONENT_VERSION=	3.3.5
 COMPONENT_PROJECT_URL=	http://fftw.org
 COMPONENT_ARCHIVE_HASH= \
-	sha256:076a43a8000d331076181ea9e72a56a9cd050400535b7bb3fc2f53b707e712f5
-# 3.2.1 is no longer available on upstream website, so we use Fedora's archive
-# COMPONENT_ARCHIVE_URL=	ftp://ftp.fftw.org/pub/fftw/$(COMPONENT_ARCHIVE)
-COMPONENT_ARCHIVE_URL=	http://pkgs.fedoraproject.org/repo/pkgs/fftw/fftw-3.2.1.tar.gz/712d3f33625a0a76f5758648d4b925f7/fftw-3.2.1.tar.gz
+	sha256:8ecfe1b04732ec3f5b7d279fdb8efcad536d555f9d1e8fabd027037d45ea8bcf
+COMPONENT_ARCHIVE_URL=	http://fftw.org/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/libfftw
-TPNO=			8418	
+TPNO=			32881
 
 # Need to build regular, float, and long-double variants
 VARIANTS =		f l
--- a/components/fftw/fftw.license	Mon Dec 12 09:53:42 2016 -0800
+++ b/components/fftw/fftw.license	Fri Dec 02 06:30:07 2016 -0800
@@ -1,124 +1,110 @@
- Copyright (c) 2003, 2007-8 Matteo Frigo
- Copyright (c) 2003, 2007-8 Massachusetts Institute of Technology
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
+Copyright (c) 2003, 2007-11 Matteo Frigo
+Copyright (c) 2003, 2007-11 Massachusetts Institute of Technology
+Copyright (c) 2012-2013 Romain Dolbeau
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
---------------------------------------------------------------------
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
- Copyright (c) 2003, 2007-8 Matteo Frigo
- Copyright (c) 2003, 2007-8 Massachusetts Institute of Technology
-
- The following statement of license applies *only* to this header file,
- and *not* to the other files distributed with FFTW or derived therefrom:
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 
 --------------------------------------------------------------------
 
- Copyright (C) 1993-1995 Ian Jackson.
+Copyright (c) 2003, 2007-14 Matteo Frigo
+Copyright (c) 2003, 2007-14 Massachusetts Institute of Technology
 
- This file is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+The following statement of license applies *only* to this header file,
+and *not* to the other files distributed with FFTW or derived therefrom:
+ 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
- It is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 
- You should have received a copy of the GNU General Public License
- along with GNU Emacs; see the file COPYING.  If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-
- (Note: I do not consider works produced using these BFNN processing
- tools to be derivative works of the tools, so they are NOT covered
- by the GPL.  However, I would appreciate it if you credited me if
- appropriate in any documents you format using BFNN.)
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------
 
- Copyright (c) 2003, 2007-8 Matteo Frigo
- Copyright (c) 2003, 2007-8 Massachusetts Institute of Technology
-
- Copyright (c) 2007 Massachusetts Institute of Technology
+Copyright (C) 1993-1995 Ian Jackson.
 
- Copyright (c) 2001 Matteo Frigo
- Copyright (c) 2001 Massachusetts Institute of Technology
-
- Copyright (c) 2007 Codesourcery
-
- Copyright (c) 2000 Matteo Frigo
- Copyright (c) 2000 Massachusetts Institute of Technology
+This file is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
 
- Copyright (c) 2005 Matteo Frigo
- Copyright (c) 2005 Massachusetts Institute of Technology
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+It is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+(Note: I do not consider works produced using these BFNN processing
+tools to be derivative works of the tools, so they are NOT covered
+by the GPL.  However, I would appreciate it if you credited me if
+appropriate in any documents you format using BFNN.)
 
 --------------------------------------------------------------------
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+
+Copyright (c) 2003, 2007-14 Matteo Frigo
+Copyright (c) 2003, 2007-14 Massachusetts Institute of Technology
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+--------------------------------------------------------------------
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -127,7 +113,7 @@
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -167,8 +153,8 @@
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
+
+		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -222,7 +208,7 @@
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -280,7 +266,7 @@
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -337,7 +323,7 @@
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -367,7 +353,7 @@
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -389,9 +375,9 @@
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -415,16 +401,17 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision version 69, Copyright (C) year  name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -447,6 +434,7 @@
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 
+
--- a/components/fftw/fftw.p5m	Mon Dec 12 09:53:42 2016 -0800
+++ b/components/fftw/fftw.p5m	Fri Dec 02 06:30:07 2016 -0800
@@ -42,27 +42,27 @@
 file path=usr/bin/fftwl-wisdom
 file path=usr/include/fftw3.f
 file path=usr/include/fftw3.h
-link path=usr/lib/$(MACH64)/libfftw3.so target=libfftw3.so.3.2.3
-link path=usr/lib/$(MACH64)/libfftw3.so.3 target=libfftw3.so.3.2.3
-file path=usr/lib/$(MACH64)/libfftw3.so.3.2.3
-link path=usr/lib/$(MACH64)/libfftw3f.so target=libfftw3f.so.3.2.3
-link path=usr/lib/$(MACH64)/libfftw3f.so.3 target=libfftw3f.so.3.2.3
-file path=usr/lib/$(MACH64)/libfftw3f.so.3.2.3
-link path=usr/lib/$(MACH64)/libfftw3l.so target=libfftw3l.so.3.2.3
-link path=usr/lib/$(MACH64)/libfftw3l.so.3 target=libfftw3l.so.3.2.3
-file path=usr/lib/$(MACH64)/libfftw3l.so.3.2.3
+link path=usr/lib/$(MACH64)/libfftw3.so target=libfftw3.so.3.5.5
+link path=usr/lib/$(MACH64)/libfftw3.so.3 target=libfftw3.so.3.5.5
+file path=usr/lib/$(MACH64)/libfftw3.so.3.5.5
+link path=usr/lib/$(MACH64)/libfftw3f.so target=libfftw3f.so.3.5.5
+link path=usr/lib/$(MACH64)/libfftw3f.so.3 target=libfftw3f.so.3.5.5
+file path=usr/lib/$(MACH64)/libfftw3f.so.3.5.5
+link path=usr/lib/$(MACH64)/libfftw3l.so target=libfftw3l.so.3.5.5
+link path=usr/lib/$(MACH64)/libfftw3l.so.3 target=libfftw3l.so.3.5.5
+file path=usr/lib/$(MACH64)/libfftw3l.so.3.5.5
 file path=usr/lib/$(MACH64)/pkgconfig/fftw3.pc
 file path=usr/lib/$(MACH64)/pkgconfig/fftw3f.pc
 file path=usr/lib/$(MACH64)/pkgconfig/fftw3l.pc
-link path=usr/lib/libfftw3.so target=libfftw3.so.3.2.3
-link path=usr/lib/libfftw3.so.3 target=libfftw3.so.3.2.3
-file path=usr/lib/libfftw3.so.3.2.3
-link path=usr/lib/libfftw3f.so target=libfftw3f.so.3.2.3
-link path=usr/lib/libfftw3f.so.3 target=libfftw3f.so.3.2.3
-file path=usr/lib/libfftw3f.so.3.2.3
-link path=usr/lib/libfftw3l.so target=libfftw3l.so.3.2.3
-link path=usr/lib/libfftw3l.so.3 target=libfftw3l.so.3.2.3
-file path=usr/lib/libfftw3l.so.3.2.3
+link path=usr/lib/libfftw3.so target=libfftw3.so.3.5.5
+link path=usr/lib/libfftw3.so.3 target=libfftw3.so.3.5.5
+file path=usr/lib/libfftw3.so.3.5.5
+link path=usr/lib/libfftw3f.so target=libfftw3f.so.3.5.5
+link path=usr/lib/libfftw3f.so.3 target=libfftw3f.so.3.5.5
+file path=usr/lib/libfftw3f.so.3.5.5
+link path=usr/lib/libfftw3l.so target=libfftw3l.so.3.5.5
+link path=usr/lib/libfftw3l.so.3 target=libfftw3l.so.3.5.5
+file path=usr/lib/libfftw3l.so.3.5.5
 file path=usr/lib/pkgconfig/fftw3.pc
 file path=usr/lib/pkgconfig/fftw3f.pc
 file path=usr/lib/pkgconfig/fftw3l.pc