CVS commit: pkgsrc/audio/pulseaudio

["Richard PALO" <richard%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   richard
Date:           Sat Aug  6 15:56:50 UTC 2016

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

Log Message:
SunOS needs c99 and at the same time add option for 'fftw' enabling the use
of the Discrete Fourier Transforms library.


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/audio/pulseaudio/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/audio/pulseaudio/PLIST
cvs rdiff -u -r1.5 -r1.6 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.110 pkgsrc/audio/pulseaudio/Makefile:1.111
--- pkgsrc/audio/pulseaudio/Makefile:1.110      Thu Aug  4 16:45:55 2016
+++ pkgsrc/audio/pulseaudio/Makefile    Sat Aug  6 15:56:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2016/08/04 16:45:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.111 2016/08/06 15:56:50 richard Exp $
 
 DISTNAME=      pulseaudio-9.0
 CATEGORIES=    audio
@@ -88,6 +88,7 @@ CONF_FILES+=  ${EGDIR}/pulseaudio-system.
 PLIST_VARS+=           alsa bonjour coreaudio evdev oss sun
 
 .if ${OPSYS} == "SunOS"
+USE_LANGUAGES+=                c99
 PLIST.sun=             yes
 .  if ${OS_VERSION} == "5.11"
 PLIST.oss=             yes

Index: pkgsrc/audio/pulseaudio/PLIST
diff -u pkgsrc/audio/pulseaudio/PLIST:1.22 pkgsrc/audio/pulseaudio/PLIST:1.23
--- pkgsrc/audio/pulseaudio/PLIST:1.22  Thu Aug  4 16:45:55 2016
+++ pkgsrc/audio/pulseaudio/PLIST       Sat Aug  6 15:56:50 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2016/08/04 16:45:55 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.23 2016/08/06 15:56:50 richard Exp $
 bin/esdcompat
 bin/pacat
 bin/pacmd
@@ -11,6 +11,7 @@ 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
@@ -116,6 +117,8 @@ lib/pulse-${PKGVERSION}/modules/module-d
 lib/pulse-${PKGVERSION}/modules/module-device-restore.so
 lib/pulse-${PKGVERSION}/modules/module-echo-cancel.a
 lib/pulse-${PKGVERSION}/modules/module-echo-cancel.so
+${PLIST.fftw}lib/pulse-${PKGVERSION}/modules/module-equalizer-sink.a
+${PLIST.fftw}lib/pulse-${PKGVERSION}/modules/module-equalizer-sink.so
 lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnfd.a
 lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnfd.so
 lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnpid.a

Index: pkgsrc/audio/pulseaudio/options.mk
diff -u pkgsrc/audio/pulseaudio/options.mk:1.5 pkgsrc/audio/pulseaudio/options.mk:1.6
--- pkgsrc/audio/pulseaudio/options.mk:1.5      Tue Jan 29 15:35:04 2013
+++ pkgsrc/audio/pulseaudio/options.mk  Sat Aug  6 15:56:50 2016
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.5 2013/01/29 15:35:04 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2016/08/06 15:56:50 richard Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pulseaudio
-PKG_SUPPORTED_OPTIONS= avahi x11
+PKG_SUPPORTED_OPTIONS= avahi fftw x11
 PKG_SUGGESTED_OPTIONS= avahi x11
 PLIST_VARS+=           ${PKG_SUPPORTED_OPTIONS}
 .include "../../mk/bsd.options.mk"
@@ -17,6 +17,28 @@ CONFIGURE_ARGS+=     --disable-avahi
 .endif
 
 ###
+### fftw
+###
+.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
+
+###
 ### X11
 ###
 .if !empty(PKG_OPTIONS:Mx11)