pulseaudio: Drop the fftw option

It used to depend on qt4 and was not actively maintained.

3 files changed, 7 insertions, 27 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 334648e361f..a2c23689958 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.139 2019/09/21 10:02:30 nia Exp $
+# $NetBSD: Makefile,v 1.140 2019/10/27 12:44:27 kamil Exp $
 
 DISTNAME=	pulseaudio-13.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://freedesktop.org/software/pulseaudio/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -27,6 +28,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-tcpwrap
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
+CONFIGURE_ARGS+=	--without-fftw
 CONFIGURE_ENV+=		DATADIRNAME=${PKGLOCALEDIR}
 PKGCONFIG_OVERRIDE+=	libpulse-mainloop-glib.pc.in
 PKGCONFIG_OVERRIDE+=	libpulse-simple.pc.in
diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST
index 7aba1ac0049..987a280cf6f 100644
--- a/audio/pulseaudio/PLIST
+++ b/audio/pulseaudio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2019/09/30 11:20:03 maya Exp $
+@comment $NetBSD: PLIST,v 1.33 2019/10/27 12:44:28 kamil Exp $
 bin/esdcompat
 bin/pa-info
 bin/pacat
@@ -12,7 +12,6 @@ bin/parecord
 bin/pasuspender
 ${PLIST.x11}bin/pax11publish
 bin/pulseaudio
-${PLIST.fftw}bin/qpaeq
 ${PLIST.x11}bin/start-pulseaudio-x11
 include/pulse/cdecl.h
 include/pulse/channelmap.h
@@ -122,8 +121,6 @@ lib/pulse-${PULSELIBVER}/modules/module-device-restore.a
 lib/pulse-${PULSELIBVER}/modules/module-device-restore.so
 lib/pulse-${PULSELIBVER}/modules/module-echo-cancel.a
 lib/pulse-${PULSELIBVER}/modules/module-echo-cancel.so
-${PLIST.fftw}lib/pulse-${PULSELIBVER}/modules/module-equalizer-sink.a
-${PLIST.fftw}lib/pulse-${PULSELIBVER}/modules/module-equalizer-sink.so
 lib/pulse-${PULSELIBVER}/modules/module-esound-compat-spawnfd.a
 lib/pulse-${PULSELIBVER}/modules/module-esound-compat-spawnfd.so
 lib/pulse-${PULSELIBVER}/modules/module-esound-compat-spawnpid.a
diff --git a/audio/pulseaudio/options.mk b/audio/pulseaudio/options.mk
index effceb69a68..d2de2c97890 100644
--- a/audio/pulseaudio/options.mk
+++ b/audio/pulseaudio/options.mk
@@ -1,14 +1,14 @@
-# $NetBSD: options.mk,v 1.12 2019/07/02 12:51:34 ryoon Exp $
+# $NetBSD: options.mk,v 1.13 2019/10/27 12:44:28 kamil Exp $
 
 .include "../../comms/lirc/available.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pulseaudio
-PKG_SUPPORTED_OPTIONS=	avahi fftw gsettings x11
+PKG_SUPPORTED_OPTIONS=	avahi gsettings x11
 .if ${LIRC_AVAILABLE} == "yes"
 PKG_SUPPORTED_OPTIONS+=	lirc
 .endif
 PKG_SUGGESTED_OPTIONS=	avahi x11
-PLIST_VARS+=		avahi fftw gsettings x11 lirc
+PLIST_VARS+=		avahi gsettings x11 lirc
 
 .include "../../mk/bsd.options.mk"
 
@@ -19,25 +19,6 @@ PLIST.avahi=		yes
 CONFIGURE_ARGS+=	--disable-avahi
 .endif
 
-.if !empty(PKG_OPTIONS:Mfftw)
-CONFIGURE_ARGS+=	--with-fftw
-PLIST.fftw=		yes
-
-.include "../../lang/python/pyversion.mk"
-# manually replace since check_interpreter detests /usr/bin/env
-REPLACE_INTERPRETER+=	pulse_py
-REPLACE.pulse_py.old=	.*/usr/bin/env python[^ ]*
-REPLACE.pulse_py.new=	${PYTHONBIN}
-REPLACE_FILES.pulse_py=	src/utils/qpaeq
-
-.include "../../math/fftwf/buildlink3.mk"
-.include "../../sysutils/py-dbus/buildlink3.mk"
-.include "../../x11/py-qt4/buildlink3.mk"
-.include "../../x11/py-sip/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-fftw
-.endif
-
 .if !empty(PKG_OPTIONS:Mgsettings)
 PLIST.gsettings=	yes
 CONFIGURE_ARGS+=	--enable-gsettings