CVS commit: pkgsrc/audio/pulseaudio

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sun Oct 27 12:44:28 UTC 2019

Modified Files:
        pkgsrc/audio/pulseaudio: Makefile PLIST options.mk

Log Message:
pulseaudio: Drop the fftw option

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


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 pkgsrc/audio/pulseaudio/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/audio/pulseaudio/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/pulseaudio/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/pulseaudio/Makefile
diff -u pkgsrc/audio/pulseaudio/Makefile:1.139 pkgsrc/audio/pulseaudio/Makefile:1.140
--- pkgsrc/audio/pulseaudio/Makefile:1.139      Sat Sep 21 10:02:30 2019
+++ pkgsrc/audio/pulseaudio/Makefile    Sun Oct 27 12:44:27 2019
@@ -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

Index: pkgsrc/audio/pulseaudio/PLIST
diff -u pkgsrc/audio/pulseaudio/PLIST:1.32 pkgsrc/audio/pulseaudio/PLIST:1.33
--- pkgsrc/audio/pulseaudio/PLIST:1.32  Mon Sep 30 11:20:03 2019
+++ pkgsrc/audio/pulseaudio/PLIST       Sun Oct 27 12:44:28 2019
@@ -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-
 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

Index: pkgsrc/audio/pulseaudio/options.mk
diff -u pkgsrc/audio/pulseaudio/options.mk:1.12 pkgsrc/audio/pulseaudio/options.mk:1.13
--- pkgsrc/audio/pulseaudio/options.mk:1.12     Tue Jul  2 12:51:34 2019
+++ pkgsrc/audio/pulseaudio/options.mk  Sun Oct 27 12:44:28 2019
@@ -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