From 3a7ec44d842fbc37d9ab0f64ddb1bce24e70547372167161140582f82873d246 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 29 Apr 2014 15:40:41 +0000 Subject: [PATCH 1/2] Accepting request 230861 from home:mnhauke * update to version 3.3.4 * add support for long-double precision OBS-URL: https://build.opensuse.org/request/show/230861 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=40 --- 1_man_macro.patch | 22 ---------------------- fftw-3.3.3.tar.gz | 3 --- fftw-3.3.4.tar.gz | 3 +++ fftw3.changes | 24 ++++++++++++++++++++++++ fftw3.spec | 32 +++++++++++++++++++++++++++----- 5 files changed, 54 insertions(+), 30 deletions(-) delete mode 100644 1_man_macro.patch delete mode 100644 fftw-3.3.3.tar.gz create mode 100644 fftw-3.3.4.tar.gz diff --git a/1_man_macro.patch b/1_man_macro.patch deleted file mode 100644 index aec85f1..0000000 --- a/1_man_macro.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 diff --git a/fftw-3.3.3.tar.gz b/fftw-3.3.3.tar.gz deleted file mode 100644 index 21aad19..0000000 --- a/fftw-3.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3 -size 3920661 diff --git a/fftw-3.3.4.tar.gz b/fftw-3.3.4.tar.gz new file mode 100644 index 0000000..f00b61b --- /dev/null +++ b/fftw-3.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 +size 3940427 diff --git a/fftw3.changes b/fftw3.changes index ba7dd0c..136c8a7 100644 --- a/fftw3.changes +++ b/fftw3.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sat Apr 19 19:16:23 UTC 2014 - mardnh@gmx.de + +- add support for long-double precision + +------------------------------------------------------------------- +Sat Apr 19 17:37:38 UTC 2014 - mardnh@gmx.de + +- update to version 3.3.4 + + * New functions fftw_alignment_of (to check whether two arrays are equally + aligned for the purposes of applying a plan) and fftw_sprint_plan + (to output a description of plan to a string). + + * Bugfix in fftw-wisdom-to-conf; thanks to Florian Oppermann for the bug report. + + * Fixed manual to work with texinfo-5. + + * Increased timing interval on x86_64 to reduce timing errors. + + * Default to Win32 threads, not pthreads, if both are present. + + * Various build-script fixes. + ------------------------------------------------------------------- Sun Dec 16 19:26:48 UTC 2012 - dhall@wustl.edu diff --git a/fftw3.spec b/fftw3.spec index 4cc41f7..f03a9c5 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -1,7 +1,7 @@ # # spec file for package fftw3 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -23,7 +23,7 @@ BuildRequires: pkgconfig %ifnarch s390 s390x BuildRequires: openmpi-devel %endif -Version: 3.3.3 +Version: 3.3.4 Release: 0 Summary: Discrete Fourier Transform (DFT) C Subroutine Library License: GPL-2.0+ @@ -31,7 +31,6 @@ Group: Productivity/Scientific/Math Url: http://www.fftw.org 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 @@ -146,7 +145,6 @@ data, and of arbitrary input size. %prep %setup -q -n fftw-%{version} -%patch0 %build %ifnarch s390 s390x @@ -180,7 +178,22 @@ source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh --enable-mpi \ %endif %ifarch %ix86 x86_64 - --enable-sse \ + --enable-sse2 \ +%endif + --disable-static + +make %{?_smp_mflags} +%makeinstall + +# hack to also compile/install long-double-precision version: +make distclean + +%ifnarch s390 s390x +source %_libdir/mpi/gcc/openmpi/bin/mpivars.sh +%endif +%configure --enable-shared --enable-threads --enable-long-double --enable-openmp \ +%ifnarch s390 s390x + --enable-mpi \ %endif --disable-static @@ -227,6 +240,7 @@ find doc -name 'Makefile*' | xargs rm %defattr(-,root,root) %{_libdir}/libfftw3.so.3* %{_libdir}/libfftw3f.so.3* +%{_libdir}/libfftw3l.so.3* %files devel %defattr(-,root,root) @@ -239,6 +253,7 @@ find doc -name 'Makefile*' | xargs rm %{_includedir}/fftw3l.f03 %{_libdir}/libfftw3.so %{_libdir}/libfftw3f.so +%{_libdir}/libfftw3l.so %{_libdir}/pkgconfig/*.pc %{_bindir}/* @@ -246,21 +261,25 @@ find doc -name 'Makefile*' | xargs rm %defattr(-,root,root) %{_libdir}/libfftw3_threads.so.3* %{_libdir}/libfftw3f_threads.so.3* +%{_libdir}/libfftw3l_threads.so.3* %files threads-devel %defattr(-,root,root) %{_libdir}/libfftw3_threads.so %{_libdir}/libfftw3f_threads.so +%{_libdir}/libfftw3l_threads.so %files -n libfftw3_omp3 %defattr(-,root,root) %{_libdir}/libfftw3_omp.so.3* %{_libdir}/libfftw3f_omp.so.3* +%{_libdir}/libfftw3l_omp.so.3* %files openmp-devel %defattr(-,root,root) %{_libdir}/libfftw3_omp.so %{_libdir}/libfftw3f_omp.so +%{_libdir}/libfftw3l_omp.so %ifnarch s390 s390x @@ -268,13 +287,16 @@ find doc -name 'Makefile*' | xargs rm %defattr(-,root,root) %{_libdir}/libfftw3_mpi.so.3* %{_libdir}/libfftw3f_mpi.so.3* +%{_libdir}/libfftw3l_mpi.so.3* %files mpi-devel %defattr(-,root,root) %{_libdir}/libfftw3_mpi.so %{_libdir}/libfftw3f_mpi.so +%{_libdir}/libfftw3l_mpi.so %{_includedir}/fftw3-mpi.* %{_includedir}/fftw3l-mpi.f03 +%{_includedir}/fftw3l-mpi.f03 %endif %changelog From d50749d4768bcea96d48c77eac52f990156544d4d69548dbbd525a01fc5fb2de Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 5 May 2014 08:55:05 +0000 Subject: [PATCH 2/2] Accepting request 232656 from home:tiwai:branches:multimedia:libs Mention a dropped patch in changelog - Drop obsoleted 1_man_macro.patch OBS-URL: https://build.opensuse.org/request/show/232656 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=41 --- fftw3.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fftw3.changes b/fftw3.changes index 136c8a7..53f7bab 100644 --- a/fftw3.changes +++ b/fftw3.changes @@ -22,6 +22,8 @@ Sat Apr 19 17:37:38 UTC 2014 - mardnh@gmx.de * Various build-script fixes. +- Drop obsoleted 1_man_macro.patch + ------------------------------------------------------------------- Sun Dec 16 19:26:48 UTC 2012 - dhall@wustl.edu