Accepting request 108377 from multimedia:libs

update to fftw 3.3.1 (forwarded request 108376 from cowsandmilk)

OBS-URL: https://build.opensuse.org/request/show/108377
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fftw3?expand=0&rev=23
This commit is contained in:
Stephan Kulow 2012-03-09 20:22:22 +00:00 committed by Git OBS Bridge
commit 44c9d7e4f3
5 changed files with 93 additions and 26 deletions

22
1_man_macro.patch Normal file
View File

@ -0,0 +1,22 @@
--- tools/fftw_wisdom.1.in.orig 2012-03-06 05:13:17.206776451 -0500
+++ tools/fftw_wisdom.1.in 2012-03-06 05:13:36.249716254 -0500
@@ -24,7 +24,7 @@
[\fIOPTION\fR]... [\fISIZE\fR]...
.SH DESCRIPTION
.PP
-." Add any additional description here
+.\" Add any additional description here
.I fftw@PREC_SUFFIX@-wisdom
is a utility to generate FFTW
.B wisdom
--- tools/fftw-wisdom-to-conf.1.orig 2012-03-06 05:15:51.265301506 -0500
+++ tools/fftw-wisdom-to-conf.1 2012-03-06 05:16:03.991269669 -0500
@@ -23,7 +23,7 @@
\fBfftw-wisdom-to-conf\fR [< \fIINPUT\fR] [> \fIOUTPUT\fR]
.SH DESCRIPTION
.PP
-." Add any additional description here
+.\" Add any additional description here
.I fftw-wisdom-to-conf
is a utility to generate C
.B configuration

3
fftw-3.3.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c77fc5cda6ce868857aa565cb9b0df0d7a4fcf388ce5c6d482acd80e2452b739
size 4039988

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d25a98521a13933e678ce19319d03ddc915826764e1e59abd12d172c239b6aea
size 3965713

View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Tue Mar 6 14:16:22 UTC 2012 - dhall@wustl.edu
- delete INSTALL file
-------------------------------------------------------------------
Tue Mar 6 10:35:15 UTC 2012 - dhall@wustl.edu
- patch macros in man files
-------------------------------------------------------------------
Tue Mar 6 00:32:24 UTC 2012 - dhall@wustl.edu
- add use of neon extensions on ARM
-------------------------------------------------------------------
Tue Mar 6 00:12:32 UTC 2012 - dhall@wustl.edu
- updated to version 3.3.1
* Reduced planning time in estimate mode for sizes with large prime factors.
* Added AVX autodetection under Visual Studio. Thanks Carsten Steger for submitting
the necessary code.
* Modern Fortran interface now uses a separate fftw3l.f03 interface file for the
long double interface, which is not supported by some Fortran compilers. Provided
new fftw3q.f03 interface file to access the quadruple-precision FFTW routines
with recent versions of gcc/gfortran.
* Added support for the NEON extensions to the ARM ISA.
* MPI code now compiles even if mpicc is a C++ compiler; thanks to Kyle Spyksma for
the bug report.
-------------------------------------------------------------------
Mon Nov 28 13:33:44 UTC 2011 - idoenmez@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package fftw3
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,17 +21,18 @@ Name: fftw3
BuildRequires: fdupes
BuildRequires: gcc-fortran
BuildRequires: pkgconfig
%ifnarch s390 s390x
%ifnarch s390 s390x %arm
BuildRequires: openmpi-devel
%endif
Version: 3.3
Version: 3.3.1
Release: 0
License: GPLv2+
License: GPL-2.0+
Summary: Discrete Fourier Transform (DFT) C Subroutine Library
Url: http://www.fftw.org
Group: Productivity/Scientific/Math
Source: http://www.fftw.org/fftw-3.3.tar.gz
Source: http://www.fftw.org/fftw-%{version}.tar.gz
Source1: %{name}-rpmlintrc
Patch0: 1_man_macro.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(pre): %install_info_prereq
@ -43,7 +44,7 @@ data, and of arbitrary input size.
%package devel
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++
Requires: fftw3 = %{version}
Requires: libfftw3-3 = %{version}-%{release}
Requires: glibc-devel
Provides: fftw-devel
@ -56,7 +57,7 @@ Summary: Discrete Fourier Transform (DFT) C Subroutine Library
Group: System/Libraries
# Remove Prov/Obs when appropriate; were added 2011-Nov-21 (post-openSUSE-12.1)
Provides: fftw3 = %{version}-%{release}
Obsoletes: fftw3 < %{version}-%{release}
Obsoletes: fftw3 < 3.3
%description -n libfftw3-3
FFTW is a C subroutine library for computing the Discrete Fourier
@ -66,9 +67,11 @@ data, and of arbitrary input size.
%package -n libfftw3_threads3
Summary: Discrete Fourier Transform (DFT) C subroutine library
Group: Productivity/Scientific/Math
Provides: fftw3-threads = %{version}-%{release}
Obsoletes: fftw3-threads < 3.3
# libfftw3_threads.so does not have a DT_NEEDED entry for fftw symbols, since it
# may be used with either libfftw3.so or libfftw3f.so. Hence, manual Requires.
Requires: libfftw3-3 = %{version}
#Requires: libfftw3-3 = %%{version}
%description -n libfftw3_threads3
FFTW is a C subroutine library for computing the Discrete Fourier
@ -78,9 +81,9 @@ data, and of arbitrary input size.
%package threads-devel
Summary: Discrete Fourier Transform (DFT) C subroutine library
Group: Development/Libraries/C and C++
Requires: fftw3-devel = %{version}
Requires: fftw3-devel = %{version}-%{release}
Requires: glibc-devel
Requires: libfftw3_threads3 = %{version}
Requires: libfftw3_threads3 = %{version}-%{release}
%description threads-devel
FFTW is a C subroutine library for computing the Discrete Fourier
@ -90,8 +93,10 @@ data, and of arbitrary input size.
%package -n libfftw3_omp3
Summary: Discrete Fourier Transform (DFT) C subroutine library
Group: Productivity/Scientific/Math
Provides: fftw3-openmp = %{version}-%{release}
Obsoletes: fftw3-openmp < 3.3
# Same as libfftw3_threads.so: manual Requires for fftw3 main lib
Requires: libfftw3-3 = %{version}
#Requires: libfftw3-3 = %%{version}
%description -n libfftw3_omp3
FFTW is a C subroutine library for computing the Discrete Fourier
@ -101,23 +106,25 @@ data, and of arbitrary input size.
%package openmp-devel
Summary: Discrete Fourier Transform (DFT) C subroutine library
Group: Development/Libraries/C and C++
Requires: fftw3-devel = %{version}
Requires: fftw3-devel = %{version}-%{release}
Requires: glibc-devel
Requires: libfftw3_omp3 = %{version}
Requires: libfftw3_omp3 = %{version}-%{release}
%description openmp-devel
FFTW is a C subroutine library for computing the Discrete Fourier
Transform (DFT) in one or more dimensions, of both real and complex
data, and of arbitrary input size.
%ifnarch s390 s390x
%ifnarch s390 s390x %arm
%package -n libfftw3_mpi3
Summary: Discrete Fourier Transform (DFT) C subroutine library
Group: Productivity/Scientific/Math
Provides: fftw3-mpi = %{version}-%{release}
Obsoletes: fftw3-mpi < 3.3
# Same as libfftw3_threads.so: manual Requires for fftw3 main lib
Requires: libfftw3-3 = %{version}
Requires: openmpi
#Requires: libfftw3-3 = %%{version}
#Requires: openmpi
%description -n libfftw3_mpi3
FFTW is a C subroutine library for computing the Discrete Fourier
@ -129,7 +136,7 @@ Summary: Discrete Fourier Transform (DFT) C subroutine library
Group: Development/Libraries/C and C++
Requires: fftw3-devel = %{version}
Requires: glibc-devel
Requires: libfftw3_mpi3 = %{version}
Requires: libfftw3_mpi3 = %{version}-%{release}
Requires: openmpi-devel
%description mpi-devel
@ -140,16 +147,18 @@ data, and of arbitrary input size.
%prep
%setup -q -n fftw-%{version}
# %patch
# autoreconf --force --install
%patch0
%build
%configure --enable-shared --enable-threads --enable-openmp \
%ifnarch s390 s390x
%ifnarch s390 s390x %arm
--enable-mpi \
%endif
%ifarch %ix86 x86_64
--enable-sse2 \
%endif
%ifarch %arm
--enable-neon \
%endif
--disable-static
make %{?_smp_mflags}
@ -163,11 +172,14 @@ rm -f %{buildroot}%{_libdir}/lib*.*a
# hack to also compile/install single-precision version:
make distclean
%configure --enable-shared --enable-threads --enable-float --enable-openmp \
%ifnarch s390 s390x
%ifnarch s390 s390x %arm
--enable-mpi \
%endif
%ifarch %ix86 x86_64
--enable-sse \
%endif
%ifarch %arm
--enable-neon \
%endif
--disable-static
@ -177,7 +189,7 @@ make %{?_smp_mflags}
# remove unneeded files
rm -f %{buildroot}%{_libdir}/lib*.*a
# gzip -9nf %{buildroot}%{_infodir}/*.info*
# gzip -9nf %%{buildroot}%%{_infodir}/*.info*
rm -f %{buildroot}%{_infodir}/dir
# remove Makefiles in doc directory at last
@ -217,11 +229,13 @@ find doc -name 'Makefile*' | xargs rm
%files devel
%defattr(-,root,root)
%doc AUTHORS CONVENTIONS COPYING COPYRIGHT ChangeLog INSTALL NEWS README TODO
%doc AUTHORS CONVENTIONS COPYING COPYRIGHT ChangeLog NEWS README TODO
%doc doc/*
%doc %{_mandir}/man?/*
%{_infodir}/*.info*
%{_includedir}/fftw3.*
%{_includedir}/fftw3q.f03
%{_includedir}/fftw3l.f03
%{_libdir}/libfftw3.so
%{_libdir}/libfftw3f.so
%{_libdir}/pkgconfig/*.pc
@ -259,6 +273,7 @@ find doc -name 'Makefile*' | xargs rm
%{_libdir}/libfftw3_mpi.so
%{_libdir}/libfftw3f_mpi.so
%{_includedir}/fftw3-mpi.*
%{_includedir}/fftw3l-mpi.f03
%endif
%changelog