From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 21 Jun 2009 11:33:35 +0000 (+0000)
Subject: [package] update fftw3 to 3.2.1 (#5391)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=c27b1836830e3cca75b9f7442d0aed89e2f74fbd

[package] update fftw3 to 3.2.1 (#5391)

SVN-Revision: 16530
---

diff --git a/libs/fftw3/Makefile b/libs/fftw3/Makefile
index 181c804269..1dc01ef3b1 100644
--- a/libs/fftw3/Makefile
+++ b/libs/fftw3/Makefile
@@ -1,18 +1,19 @@
-# 
+#
 # Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fftw3
-PKG_VERSION:=3.1.2
-
+PKG_VERSION:=3.2.1
+PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=http://www.fftw.org/
-PKG_SOURCE:=fftw-3.1.2.tar.gz
-PKG_MD5SUM:=08f2e21c9fd02f4be2bd53a62592afa4
+PKG_SOURCE:=fftw-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.fftw.org
+PKG_MD5SUM:=712d3f33625a0a76f5758648d4b925f7
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fftw-$(PKG_VERSION)
 
@@ -31,7 +32,6 @@ define Package/fftw3/description
 	Discrete Fourier Transform in one or more dimensions. It
 	includes complex, real, and parallel transforms, and can
 	handle arbitrary array sizes efficiently.
-	http://www.fftw.org/
 endef
 
 TARGET_CFLAGS += $(FPIC)
diff --git a/libs/fftw3/patches/001-makefile.patch b/libs/fftw3/patches/001-makefile.patch
index 5e507f7c6e..d09bc2d8c1 100644
--- a/libs/fftw3/patches/001-makefile.patch
+++ b/libs/fftw3/patches/001-makefile.patch
@@ -1,21 +1,20 @@
-diff -Naur fftw-3.1.2/Makefile.in fftw-3.1.2-p/Makefile.in
---- fftw-3.1.2/Makefile.in	2006-01-28 01:19:57.000000000 +0100
-+++ fftw-3.1.2-p/Makefile.in	2006-03-13 20:50:29.829075989 +0100
-@@ -112,7 +112,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -110,7 +110,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
  ETAGS = etags
  CTAGS = ctags
- DIST_SUBDIRS = support genfft genfft-k7 kernel simd dft rdft reodft \
--	threads api libbench2 . tests doc tools
-+	threads api libbench2 . doc tools
+ DIST_SUBDIRS = support genfft kernel simd dft rdft reodft api threads \
+-	cell libbench2 . tests doc tools m4
++	cell libbench2 . doc tools m4
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
-@@ -277,7 +277,7 @@
- @MAINTAINER_MODE_TRUE@GENFFT = genfft genfft-k7
- ACLOCAL_AMFLAGS = -I ./m4
- SUBDIRS = support $(GENFFT) kernel simd dft rdft reodft threads api	\
--libbench2 . tests doc tools
-+libbench2 .
+@@ -278,7 +278,7 @@ lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@.
+ @MAINTAINER_MODE_TRUE@GENFFT = genfft
+ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = support $(GENFFT) kernel simd dft rdft reodft api threads \
+-cell libbench2 . tests doc tools m4
++cell libbench2 . m4
  
- EXTRA_DIST = COPYRIGHT bootstrap.sh CONVENTIONS fftw.pc.in m4
- @HAVE_SIMD_FALSE@SIMD_LIBS = 
+ EXTRA_DIST = COPYRIGHT bootstrap.sh CONVENTIONS fftw.pc.in README.Cell
+ @HAVE_SIMD_TRUE@SIMD_LIBS = \