[pkgsrc/trunk]: pkgsrc math/fftw and dependents: merge math/fftwf backin and ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc math/fftw and dependents: merge math/fftwf backin and ...
From: thor <thor%pkgsrc.org@localhost>
Date: Fri, 30 Apr 2021 00:34:30 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/b0281d8ff95d
branches:  trunk
changeset: 451646:b0281d8ff95d
user:      thor <thor%pkgsrc.org@localhost>
date:      Thu Apr 29 23:30:12 2021 +0000

description:
math/fftw and dependents: merge math/fftwf backin and add MPI and OpenMP

This yields one common package to provide libfftw3 (double) and libfftw3f
(single) by default and optionally the Fortran bindings as well as
OpenMP and MPI variants, and those with long double or quad precision.

This changes all packages depending on fftwf in the same commit to minimize
the time of inconsistency. Soon, math/fftwf will disappear.

diffstat:

 audio/ardour/Makefile             |   6 +-
 audio/liblastfm/Makefile          |   6 +-
 audio/liblastfm/buildlink3.mk     |   4 +-
 audio/lmms/Makefile               |   6 +-
 audio/speex/Makefile              |   3 +-
 audio/speex/options.mk            |   4 +-
 games/powder-toy/Makefile         |   4 +-
 games/powder-toy/options.mk       |   4 +-
 graphics/luminance-hdr/Makefile   |   6 +-
 graphics/pfstools/Makefile        |   6 +-
 graphics/rawtherapee/Makefile     |   6 +-
 ham/gnuradio-channels/Makefile    |   4 +-
 ham/gnuradio-companion/Makefile   |   4 +-
 ham/gnuradio-core/Makefile        |   4 +-
 ham/gnuradio-core/Makefile.common |   4 +-
 ham/gnuradio-ctrlport/Makefile    |   4 +-
 ham/gnuradio-digital/Makefile     |   4 +-
 ham/gnuradio-doxygen/Makefile     |   4 +-
 ham/gnuradio-dtv/Makefile         |   4 +-
 ham/gnuradio-fec/Makefile         |   4 +-
 ham/gnuradio-network/Makefile     |   4 +-
 ham/gnuradio-qtgui/Makefile       |   4 +-
 ham/gnuradio-trellis/Makefile     |   4 +-
 ham/gnuradio-uhd/Makefile         |   4 +-
 ham/gnuradio-utils/Makefile       |   4 +-
 ham/gnuradio-video-sdl/Makefile   |   4 +-
 ham/gnuradio-vocoder/Makefile     |   4 +-
 ham/gnuradio-wavelet/Makefile     |   4 +-
 ham/gnuradio-zeromq/Makefile      |   4 +-
 ham/hackrf/Makefile               |   4 +-
 math/fftw/Makefile                |  63 ++++++++++++++++++++++++++++++++++++--
 math/fftw/Makefile.common         |  33 --------------------
 math/fftw/PLIST                   |  35 ++++++++++++++++++++-
 math/fftw/buildlink3.mk           |   9 ++++-
 math/fftw/options.mk              |  31 +++++++++++++++++-
 math/octave/Makefile              |   5 +-
 36 files changed, 197 insertions(+), 110 deletions(-)

diffs (truncated from 722 to 300 lines):

diff -r 38cac0c974d2 -r b0281d8ff95d audio/ardour/Makefile
--- a/audio/ardour/Makefile     Thu Apr 29 20:15:59 2021 +0000
+++ b/audio/ardour/Makefile     Thu Apr 29 23:30:12 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2021/04/21 13:24:20 adam Exp $
+# $NetBSD: Makefile,v 1.49 2021/04/29 23:30:12 thor Exp $
 
 DISTNAME=      Ardour-5.12.0
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   14
+PKGREVISION=   15
 CATEGORIES=    audio
 # currently, distfiles must be downloaded by hand from ardour.org
 # and uploaded using `make upload-distfiles`.
@@ -109,7 +109,7 @@
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/tool.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/liblrdf/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff -r 38cac0c974d2 -r b0281d8ff95d audio/liblastfm/Makefile
--- a/audio/liblastfm/Makefile  Thu Apr 29 20:15:59 2021 +0000
+++ b/audio/liblastfm/Makefile  Thu Apr 29 23:30:12 2021 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2020/08/18 17:57:25 leot Exp $
+# $NetBSD: Makefile,v 1.40 2021/04/29 23:30:13 thor Exp $
 #
 
 DISTNAME=      mxcl-liblastfm-0.3.3-0-gf0b3239
 PKGNAME=       liblastfm-0.3.3
-PKGREVISION=   28
+PKGREVISION=   29
 CATEGORIES=    audio net
 MASTER_SITES=  http://download.github.com/
 
@@ -40,7 +40,7 @@
 .include "../../lang/ruby/replace.mk"
 BUILDLINK_DEPMETHOD.${RUBY_BASE}=      build
 .include "../../lang/ruby/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 38cac0c974d2 -r b0281d8ff95d audio/liblastfm/buildlink3.mk
--- a/audio/liblastfm/buildlink3.mk     Thu Apr 29 20:15:59 2021 +0000
+++ b/audio/liblastfm/buildlink3.mk     Thu Apr 29 23:30:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2020/08/18 17:57:25 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2021/04/29 23:30:13 thor Exp $
 
 BUILDLINK_TREE+=       liblastfm
 
@@ -10,7 +10,7 @@
 BUILDLINK_PKGSRCDIR.liblastfm?=                ../../audio/liblastfm
 
 .include "../../audio/libsamplerate/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .endif # LIBLASTFM_BUILDLINK3_MK
diff -r 38cac0c974d2 -r b0281d8ff95d audio/lmms/Makefile
--- a/audio/lmms/Makefile       Thu Apr 29 20:15:59 2021 +0000
+++ b/audio/lmms/Makefile       Thu Apr 29 23:30:12 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2021/04/21 11:40:59 adam Exp $
+# $NetBSD: Makefile,v 1.73 2021/04/29 23:30:13 thor Exp $
 
 DISTNAME=      lmms_1.2.2
 PKGNAME=       ${DISTNAME:S/_/-/1}
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=LMMS/}
 GITHUB_PROJECT=        lmms
@@ -50,7 +50,7 @@
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/fltk13/buildlink3.mk" # used for zynaddsubfx
diff -r 38cac0c974d2 -r b0281d8ff95d audio/speex/Makefile
--- a/audio/speex/Makefile      Thu Apr 29 20:15:59 2021 +0000
+++ b/audio/speex/Makefile      Thu Apr 29 23:30:12 2021 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2020/03/12 23:01:43 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2021/04/29 23:30:13 thor Exp $
 
 DISTNAME=      speex-1.2.0
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  http://downloads.us.xiph.org/releases/speex/
 
diff -r 38cac0c974d2 -r b0281d8ff95d audio/speex/options.mk
--- a/audio/speex/options.mk    Thu Apr 29 20:15:59 2021 +0000
+++ b/audio/speex/options.mk    Thu Apr 29 23:30:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2011/07/07 12:26:45 obache Exp $
+# $NetBSD: options.mk,v 1.4 2021/04/29 23:30:13 thor Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.speex
@@ -28,5 +28,5 @@
 
 .if !empty(PKG_OPTIONS:Mfftw)
 CONFIGURE_ARGS+=       --with-fft=gpl-fftw3
-.  include "../../math/fftwf/buildlink3.mk"
+.  include "../../math/fftw/buildlink3.mk"
 .endif
diff -r 38cac0c974d2 -r b0281d8ff95d games/powder-toy/Makefile
--- a/games/powder-toy/Makefile Thu Apr 29 20:15:59 2021 +0000
+++ b/games/powder-toy/Makefile Thu Apr 29 23:30:12 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2021/04/21 13:24:42 adam Exp $
+# $NetBSD: Makefile,v 1.9 2021/04/29 23:30:13 thor Exp $
 
 DISTNAME=      powder-toy-95.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ThePowderToy/}
 GITHUB_PROJECT=        The-Powder-Toy
diff -r 38cac0c974d2 -r b0281d8ff95d games/powder-toy/options.mk
--- a/games/powder-toy/options.mk       Thu Apr 29 20:15:59 2021 +0000
+++ b/games/powder-toy/options.mk       Thu Apr 29 23:30:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2019/04/13 12:08:04 nia Exp $
+# $NetBSD: options.mk,v 1.2 2021/04/29 23:30:13 thor Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.powder-toy
 PKG_SUPPORTED_OPTIONS= debug fftw lua
@@ -23,7 +23,7 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mfftw)
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .else
 SCONS_ARGS+=   --nofft
 .endif
diff -r 38cac0c974d2 -r b0281d8ff95d graphics/luminance-hdr/Makefile
--- a/graphics/luminance-hdr/Makefile   Thu Apr 29 20:15:59 2021 +0000
+++ b/graphics/luminance-hdr/Makefile   Thu Apr 29 23:30:12 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2021/04/21 13:24:49 adam Exp $
+# $NetBSD: Makefile,v 1.55 2021/04/29 23:30:13 thor Exp $
 
 DISTNAME=      luminance-hdr-2.6.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=qtpfsgui/}
 EXTRACT_SUFX=  .tar.bz2
@@ -25,7 +25,7 @@
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/eigen3/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"
 .include "../../parallel/openmp/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff -r 38cac0c974d2 -r b0281d8ff95d graphics/pfstools/Makefile
--- a/graphics/pfstools/Makefile        Thu Apr 29 20:15:59 2021 +0000
+++ b/graphics/pfstools/Makefile        Thu Apr 29 23:30:12 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2021/04/21 13:24:49 adam Exp $
+# $NetBSD: Makefile,v 1.73 2021/04/29 23:30:13 thor Exp $
 
 DISTNAME=      pfstools-2.1.0
-PKGREVISION=   15
+PKGREVISION=   16
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pfstools/}
 EXTRACT_SUFX=  .tgz
@@ -42,6 +42,6 @@
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 38cac0c974d2 -r b0281d8ff95d graphics/rawtherapee/Makefile
--- a/graphics/rawtherapee/Makefile     Thu Apr 29 20:15:59 2021 +0000
+++ b/graphics/rawtherapee/Makefile     Thu Apr 29 23:30:12 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2021/04/21 11:41:57 adam Exp $
+# $NetBSD: Makefile,v 1.19 2021/04/29 23:30:13 thor Exp $
 
 DISTNAME=      rawtherapee-5.6
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    graphics
 MASTER_SITES=  http://rawtherapee.com/shared/source/
 EXTRACT_SUFX=  .tar.xz
@@ -28,7 +28,7 @@
 .include "../../graphics/libiptcdata/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../math/fftwf/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/gtkmm3/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff -r 38cac0c974d2 -r b0281d8ff95d ham/gnuradio-channels/Makefile
--- a/ham/gnuradio-channels/Makefile    Thu Apr 29 20:15:59 2021 +0000
+++ b/ham/gnuradio-channels/Makefile    Thu Apr 29 23:30:12 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2021/04/21 13:24:50 adam Exp $
+# $NetBSD: Makefile,v 1.26 2021/04/29 23:30:13 thor Exp $
 
 PKGNAME=       gnuradio-channels-${VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       Signal processing blocks to simulate channel models of GNU Radio
 
 .include       "../../ham/gnuradio-core/Makefile.common"
diff -r 38cac0c974d2 -r b0281d8ff95d ham/gnuradio-companion/Makefile
--- a/ham/gnuradio-companion/Makefile   Thu Apr 29 20:15:59 2021 +0000
+++ b/ham/gnuradio-companion/Makefile   Thu Apr 29 23:30:12 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2021/04/21 13:24:50 adam Exp $
+# $NetBSD: Makefile,v 1.45 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=       gnuradio-companion-${VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       User interface entry of GNU Radio
 
 #CONF_FILES+=  ${EGDIR}/grc.conf       ${PKG_SYSCONFDIR}/grc.conf
diff -r 38cac0c974d2 -r b0281d8ff95d ham/gnuradio-core/Makefile
--- a/ham/gnuradio-core/Makefile        Thu Apr 29 20:15:59 2021 +0000
+++ b/ham/gnuradio-core/Makefile        Thu Apr 29 23:30:12 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2021/04/21 13:24:50 adam Exp $
+# $NetBSD: Makefile,v 1.81 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=       gnuradio-core-${VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       Core part of GNU Radio, all others need this
 
 PLIST_MINUS=   # empty
diff -r 38cac0c974d2 -r b0281d8ff95d ham/gnuradio-core/Makefile.common
--- a/ham/gnuradio-core/Makefile.common Thu Apr 29 20:15:59 2021 +0000
+++ b/ham/gnuradio-core/Makefile.common Thu Apr 29 23:30:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2021/04/07 16:14:07 tnn Exp $
+# $NetBSD: Makefile.common,v 1.33 2021/04/29 23:30:14 thor Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -143,7 +143,7 @@
 .include       "../../graphics/cairo-gobject/buildlink3.mk"
 .include       "../../lang/python/application.mk"
 .include       "../../math/py-numpy/buildlink3.mk"
-.include       "../../math/fftwf/buildlink3.mk"
+.include       "../../math/fftw/buildlink3.mk"
 .include       "../../math/gsl/buildlink3.mk"
 .include       "../../math/volk/buildlink3.mk"
 .include       "../../textproc/log4cpp/buildlink3.mk"
diff -r 38cac0c974d2 -r b0281d8ff95d ham/gnuradio-ctrlport/Makefile
--- a/ham/gnuradio-ctrlport/Makefile    Thu Apr 29 20:15:59 2021 +0000
+++ b/ham/gnuradio-ctrlport/Makefile    Thu Apr 29 23:30:12 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.27 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=       gnuradio-ctrlport-${VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       New set of hooks into GNU Radio to allow a remote client to attach
 .include       "../../ham/gnuradio-core/Makefile.common"
 .include       "../../ham/gnuradio-core/Nocore.mk"
diff -r 38cac0c974d2 -r b0281d8ff95d ham/gnuradio-digital/Makefile
--- a/ham/gnuradio-digital/Makefile     Thu Apr 29 20:15:59 2021 +0000
+++ b/ham/gnuradio-digital/Makefile     Thu Apr 29 23:30:12 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2021/04/21 13:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.27 2021/04/29 23:30:14 thor Exp $
 
 PKGNAME=       gnuradio-digital-${VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       Digital related algorithms for GNU Radio
 
 .include       "../../ham/gnuradio-core/Makefile.common"
diff -r 38cac0c974d2 -r b0281d8ff95d ham/gnuradio-doxygen/Makefile
--- a/ham/gnuradio-doxygen/Makefile     Thu Apr 29 20:15:59 2021 +0000
+++ b/ham/gnuradio-doxygen/Makefile     Thu Apr 29 23:30:12 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2021/04/21 13:24:51 adam Exp $
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc CHANGES: removed fftwf
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated math/fftw to 3.3.9nb4
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc CHANGES: removed fftwf
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated math/fftw to 3.3.9nb4
Indexes:
Home | Main Index | Thread Index | Old Index