Sat Aug 6 15:56:50 2016 UTC ()
SunOS needs c99 and at the same time add option for 'fftw' enabling the use
of the Discrete Fourier Transforms library.


(richard)
diff -r1.110 -r1.111 pkgsrc/audio/pulseaudio/Makefile
diff -r1.22 -r1.23 pkgsrc/audio/pulseaudio/PLIST
diff -r1.5 -r1.6 pkgsrc/audio/pulseaudio/options.mk
cvs diff -r1.110 -r1.111 pkgsrc/audio/pulseaudio/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/Makefile 2016/08/04 16:45:55 1.110
+++ pkgsrc/audio/pulseaudio/Makefile 2016/08/06 15:56:50 1.111
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.110 2016/08/04 16:45:55 ryoon Exp $ 1# $NetBSD: Makefile,v 1.111 2016/08/06 15:56:50 richard Exp $
2 2
3DISTNAME= pulseaudio-9.0 3DISTNAME= pulseaudio-9.0
4CATEGORIES= audio 4CATEGORIES= audio
5MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ 5MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.freedesktop.org/wiki/Software/PulseAudio 9HOMEPAGE= http://www.freedesktop.org/wiki/Software/PulseAudio
10COMMENT= Sound server for POSIX and Win32 systems 10COMMENT= Sound server for POSIX and Win32 systems
11LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 11LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
12 12
13LIBTOOL_REQD= 2.4 13LIBTOOL_REQD= 2.4
14 14
@@ -78,26 +78,27 @@ BUILD_DEFS+= VARBASE PKG_SYSCONFBASE @@ -78,26 +78,27 @@ BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
78 78
79PKG_SYSCONFSUBDIR= pulse 79PKG_SYSCONFSUBDIR= pulse
80EGDIR= ${PREFIX}/share/examples/pulseaudio 80EGDIR= ${PREFIX}/share/examples/pulseaudio
81CONF_FILES= ${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf 81CONF_FILES= ${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf
82CONF_FILES+= ${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf 82CONF_FILES+= ${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf
83CONF_FILES+= ${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa 83CONF_FILES+= ${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa
84CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa 84CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa
85CONF_FILES+= ${EGDIR}/pulseaudio-system.conf \ 85CONF_FILES+= ${EGDIR}/pulseaudio-system.conf \
86 ${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf 86 ${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf
87 87
88PLIST_VARS+= alsa bonjour coreaudio evdev oss sun 88PLIST_VARS+= alsa bonjour coreaudio evdev oss sun
89 89
90.if ${OPSYS} == "SunOS" 90.if ${OPSYS} == "SunOS"
 91USE_LANGUAGES+= c99
91PLIST.sun= yes 92PLIST.sun= yes
92. if ${OS_VERSION} == "5.11" 93. if ${OS_VERSION} == "5.11"
93PLIST.oss= yes 94PLIST.oss= yes
94. endif 95. endif
95.elif ${OPSYS} == "Darwin" 96.elif ${OPSYS} == "Darwin"
96PLIST.bonjour= yes 97PLIST.bonjour= yes
97PLIST.coreaudio= yes 98PLIST.coreaudio= yes
98.else 99.else
99PLIST.oss= yes 100PLIST.oss= yes
100.endif 101.endif
101 102
102PKG_GROUPS= ${PULSE_GROUP} 103PKG_GROUPS= ${PULSE_GROUP}
103PKG_GROUPS+= ${PULSE_GROUP_REALTIME} 104PKG_GROUPS+= ${PULSE_GROUP_REALTIME}
cvs diff -r1.22 -r1.23 pkgsrc/audio/pulseaudio/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/PLIST 2016/08/04 16:45:55 1.22
+++ pkgsrc/audio/pulseaudio/PLIST 2016/08/06 15:56:50 1.23
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1@comment $NetBSD: PLIST,v 1.22 2016/08/04 16:45:55 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.23 2016/08/06 15:56:50 richard Exp $
2bin/esdcompat 2bin/esdcompat
3bin/pacat 3bin/pacat
4bin/pacmd 4bin/pacmd
5bin/pactl 5bin/pactl
6${PLIST.oss}bin/padsp 6${PLIST.oss}bin/padsp
7bin/pamon 7bin/pamon
8bin/paplay 8bin/paplay
9bin/parec 9bin/parec
10bin/parecord 10bin/parecord
11bin/pasuspender 11bin/pasuspender
12${PLIST.x11}bin/pax11publish 12${PLIST.x11}bin/pax11publish
13bin/pulseaudio 13bin/pulseaudio
 14${PLIST.fftw}bin/qpaeq
14${PLIST.x11}bin/start-pulseaudio-x11 15${PLIST.x11}bin/start-pulseaudio-x11
15include/pulse/cdecl.h 16include/pulse/cdecl.h
16include/pulse/channelmap.h 17include/pulse/channelmap.h
17include/pulse/context.h 18include/pulse/context.h
18include/pulse/def.h 19include/pulse/def.h
19include/pulse/direction.h 20include/pulse/direction.h
20include/pulse/error.h 21include/pulse/error.h
21include/pulse/ext-device-manager.h 22include/pulse/ext-device-manager.h
22include/pulse/ext-device-restore.h 23include/pulse/ext-device-restore.h
23include/pulse/ext-stream-restore.h 24include/pulse/ext-stream-restore.h
24include/pulse/format.h 25include/pulse/format.h
25include/pulse/gccmacro.h 26include/pulse/gccmacro.h
26include/pulse/glib-mainloop.h 27include/pulse/glib-mainloop.h
@@ -106,26 +107,28 @@ ${PLIST.coreaudio}lib/pulse-${PKGVERSION @@ -106,26 +107,28 @@ ${PLIST.coreaudio}lib/pulse-${PKGVERSION
106${PLIST.coreaudio}lib/pulse-${PKGVERSION}/modules/module-coreaudio-device.so 107${PLIST.coreaudio}lib/pulse-${PKGVERSION}/modules/module-coreaudio-device.so
107lib/pulse-${PKGVERSION}/modules/module-dbus-protocol.a 108lib/pulse-${PKGVERSION}/modules/module-dbus-protocol.a
108lib/pulse-${PKGVERSION}/modules/module-dbus-protocol.so 109lib/pulse-${PKGVERSION}/modules/module-dbus-protocol.so
109lib/pulse-${PKGVERSION}/modules/module-default-device-restore.a 110lib/pulse-${PKGVERSION}/modules/module-default-device-restore.a
110lib/pulse-${PKGVERSION}/modules/module-default-device-restore.so 111lib/pulse-${PKGVERSION}/modules/module-default-device-restore.so
111lib/pulse-${PKGVERSION}/modules/module-detect.a 112lib/pulse-${PKGVERSION}/modules/module-detect.a
112lib/pulse-${PKGVERSION}/modules/module-detect.so 113lib/pulse-${PKGVERSION}/modules/module-detect.so
113lib/pulse-${PKGVERSION}/modules/module-device-manager.a 114lib/pulse-${PKGVERSION}/modules/module-device-manager.a
114lib/pulse-${PKGVERSION}/modules/module-device-manager.so 115lib/pulse-${PKGVERSION}/modules/module-device-manager.so
115lib/pulse-${PKGVERSION}/modules/module-device-restore.a 116lib/pulse-${PKGVERSION}/modules/module-device-restore.a
116lib/pulse-${PKGVERSION}/modules/module-device-restore.so 117lib/pulse-${PKGVERSION}/modules/module-device-restore.so
117lib/pulse-${PKGVERSION}/modules/module-echo-cancel.a 118lib/pulse-${PKGVERSION}/modules/module-echo-cancel.a
118lib/pulse-${PKGVERSION}/modules/module-echo-cancel.so 119lib/pulse-${PKGVERSION}/modules/module-echo-cancel.so
 120${PLIST.fftw}lib/pulse-${PKGVERSION}/modules/module-equalizer-sink.a
 121${PLIST.fftw}lib/pulse-${PKGVERSION}/modules/module-equalizer-sink.so
119lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnfd.a 122lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnfd.a
120lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnfd.so 123lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnfd.so
121lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnpid.a 124lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnpid.a
122lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnpid.so 125lib/pulse-${PKGVERSION}/modules/module-esound-compat-spawnpid.so
123lib/pulse-${PKGVERSION}/modules/module-esound-protocol-tcp.a 126lib/pulse-${PKGVERSION}/modules/module-esound-protocol-tcp.a
124lib/pulse-${PKGVERSION}/modules/module-esound-protocol-tcp.so 127lib/pulse-${PKGVERSION}/modules/module-esound-protocol-tcp.so
125lib/pulse-${PKGVERSION}/modules/module-esound-protocol-unix.a 128lib/pulse-${PKGVERSION}/modules/module-esound-protocol-unix.a
126lib/pulse-${PKGVERSION}/modules/module-esound-protocol-unix.so 129lib/pulse-${PKGVERSION}/modules/module-esound-protocol-unix.so
127lib/pulse-${PKGVERSION}/modules/module-esound-sink.a 130lib/pulse-${PKGVERSION}/modules/module-esound-sink.a
128lib/pulse-${PKGVERSION}/modules/module-esound-sink.so 131lib/pulse-${PKGVERSION}/modules/module-esound-sink.so
129lib/pulse-${PKGVERSION}/modules/module-filter-apply.a 132lib/pulse-${PKGVERSION}/modules/module-filter-apply.a
130lib/pulse-${PKGVERSION}/modules/module-filter-apply.so 133lib/pulse-${PKGVERSION}/modules/module-filter-apply.so
131lib/pulse-${PKGVERSION}/modules/module-filter-heuristics.a 134lib/pulse-${PKGVERSION}/modules/module-filter-heuristics.a
cvs diff -r1.5 -r1.6 pkgsrc/audio/pulseaudio/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/options.mk 2013/01/29 15:35:04 1.5
+++ pkgsrc/audio/pulseaudio/options.mk 2016/08/06 15:56:50 1.6
@@ -1,31 +1,53 @@ @@ -1,31 +1,53 @@
1# $NetBSD: options.mk,v 1.5 2013/01/29 15:35:04 wiz Exp $ 1# $NetBSD: options.mk,v 1.6 2016/08/06 15:56:50 richard Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio 3PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio
4PKG_SUPPORTED_OPTIONS= avahi x11 4PKG_SUPPORTED_OPTIONS= avahi fftw x11
5PKG_SUGGESTED_OPTIONS= avahi x11 5PKG_SUGGESTED_OPTIONS= avahi x11
6PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 6PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9### 9###
10### avahi 10### avahi
11### 11###
12.if !empty(PKG_OPTIONS:Mavahi) 12.if !empty(PKG_OPTIONS:Mavahi)
13.include "../../net/avahi/buildlink3.mk" 13.include "../../net/avahi/buildlink3.mk"
14PLIST.avahi= yes 14PLIST.avahi= yes
15.else 15.else
16CONFIGURE_ARGS+= --disable-avahi 16CONFIGURE_ARGS+= --disable-avahi
17.endif 17.endif
18 18
19### 19###
 20### fftw
 21###
 22.if !empty(PKG_OPTIONS:Mfftw)
 23CONFIGURE_ARGS+= --with-fftw
 24PLIST.fftw= yes
 25
 26.include "../../lang/python/pyversion.mk"
 27# manually replace since check_interpreter detests /usr/bin/env
 28REPLACE_INTERPRETER+= pulse_py
 29REPLACE.pulse_py.old= .*/usr/bin/env python[^ ]*
 30REPLACE.pulse_py.new= ${PYTHONBIN}
 31REPLACE_FILES.pulse_py= src/utils/qpaeq
 32
 33.include "../../math/fftwf/buildlink3.mk"
 34.include "../../sysutils/py-dbus/buildlink3.mk"
 35.include "../../x11/py-qt4/buildlink3.mk"
 36.include "../../x11/py-sip/buildlink3.mk"
 37.else
 38CONFIGURE_ARGS+= --without-fftw
 39.endif
 40
 41###
20### X11 42### X11
21### 43###
22.if !empty(PKG_OPTIONS:Mx11) 44.if !empty(PKG_OPTIONS:Mx11)
23.include "../../x11/libICE/buildlink3.mk" 45.include "../../x11/libICE/buildlink3.mk"
24.include "../../x11/libSM/buildlink3.mk" 46.include "../../x11/libSM/buildlink3.mk"
25.include "../../x11/libX11/buildlink3.mk" 47.include "../../x11/libX11/buildlink3.mk"
26.include "../../x11/libXtst/buildlink3.mk" 48.include "../../x11/libXtst/buildlink3.mk"
27.include "../../x11/xextproto/buildlink3.mk" 49.include "../../x11/xextproto/buildlink3.mk"
28PLIST.x11= yes 50PLIST.x11= yes
29.else 51.else
30CONFIGURE_ARGS+= --disable-x11 52CONFIGURE_ARGS+= --disable-x11
31.endif 53.endif