Sat Oct 26 17:22:08 2019 UTC ()
audio: Allow audacity to use the system's portaudio.

This should make it easier to diagnose and fix recording problems later.
Probably.


(nia)
diff -r1.125 -r1.126 pkgsrc/audio/audacity/Makefile
diff -r1.15 -r1.16 pkgsrc/audio/audacity/PLIST
diff -r1.38 -r1.39 pkgsrc/audio/audacity/distinfo
diff -r1.4 -r0 pkgsrc/audio/audacity/options.mk
diff -r1.1 -r0 pkgsrc/audio/audacity/patches/patch-lib-src_portaudio-v19_Makefile.in
diff -r1.24 -r1.25 pkgsrc/audio/portaudio/Makefile
diff -r1.4 -r1.5 pkgsrc/audio/portaudio/PLIST
diff -r1.17 -r1.18 pkgsrc/audio/portaudio/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c
diff -r1.1 -r1.2 pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c
cvs diff -r1.125 -r1.126 pkgsrc/audio/audacity/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/audacity/Makefile 2019/10/20 09:59:13 1.125
+++ pkgsrc/audio/audacity/Makefile 2019/10/26 17:22:08 1.126
@@ -1,130 +1,116 @@ @@ -1,130 +1,116 @@
1# $NetBSD: Makefile,v 1.125 2019/10/20 09:59:13 nia Exp $ 1# $NetBSD: Makefile,v 1.126 2019/10/26 17:22:08 nia Exp $
2 2
3DISTNAME= audacity-2.3.2 3DISTNAME= audacity-2.3.2
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=audacity/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=audacity/}
7GITHUB_PROJECT= Audacity 7GITHUB_PROJECT= Audacity
8GITHUB_TAG= Audacity-${PKGVERSION_NOREV} 8GITHUB_TAG= Audacity-${PKGVERSION_NOREV}
9 
10MAINTAINER= pkgsrc-users@NetBSD.org 
11HOMEPAGE= https://www.audacityteam.org/ 
12COMMENT= Audio editor 
13LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license 
14 9
15WRKSRC= ${WRKDIR}/audacity-${GITHUB_PROJECT}-${PKGVERSION_NOREV} 10MAINTAINER= pkgsrc-users@NetBSD.org
 11HOMEPAGE= https://www.audacityteam.org/
 12COMMENT= Audio editor
 13LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license
16 14
17.include "../../mk/bsd.prefs.mk" 15WRKSRC= ${WRKDIR}/audacity-${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 16
 17EXTRACT_USING= bsdtar
 18
 19GNU_CONFIGURE= yes
 20USE_LIBTOOL= yes
 21
 22USE_TOOLS+= automake autoreconf bash
 23USE_TOOLS+= gmake intltool msgfmt msgmerge pkg-config
 24USE_TOOLS+= xgettext zip:run
 25
 26USE_LANGUAGES= c gnu++11
18 27
19EXTRACT_USING= bsdtar 
20USE_LIBTOOL= yes 
21USE_TOOLS+= automake autoreconf bash 
22USE_TOOLS+= gmake intltool msgfmt msgmerge pkg-config 
23USE_TOOLS+= xgettext zip:run 
24USE_LANGUAGES= c c++ 
25# configure: error: Audacity requires at least GCC 4.9 28# configure: error: Audacity requires at least GCC 4.9
26GCC_REQD+= 4.9 29GCC_REQD+= 4.9
27 30
28WRAPPER_SHELL= ${BASH} 31WRAPPER_SHELL= ${BASH}
29CONFIG_SHELL= ${BASH} 32CONFIG_SHELL= ${BASH}
30 33
31GNU_CONFIGURE= yes 34CONFIGURE_ARGS+= --enable-ladspa
32 35
33CONFIGURE_ARGS+= --enable-nyquist=yes 36CONFIGURE_ARGS+= --with-libmad="no"
34CONFIGURE_ARGS+= --with-expat=system 37CONFIGURE_ARGS+= --with-expat="system"
35CONFIGURE_ARGS+= --with-ffmpeg=system 38CONFIGURE_ARGS+= --with-libsndfile="system"
36CONFIGURE_ARGS+= --with-lame=system 39CONFIGURE_ARGS+= --with-libsoxr="system"
37CONFIGURE_ARGS+= --with-libflac=system 40CONFIGURE_ARGS+= --with-portaudio="system"
38CONFIGURE_ARGS+= --with-libid3tag=system 41CONFIGURE_ARGS+= --with-sbsms="local" # system version doesn't work
39CONFIGURE_ARGS+= --with-libsamplerate=system 42CONFIGURE_ARGS+= --with-portmidi="local"
40CONFIGURE_ARGS+= --with-libsndfile=system 43CONFIGURE_ARGS+= --with-ffmpeg="system"
41CONFIGURE_ARGS+= --with-libtwolame=system 44CONFIGURE_ARGS+= --with-lame="system"
42CONFIGURE_ARGS+= --with-libvamp=local 45CONFIGURE_ARGS+= --with-libflac="system"
43CONFIGURE_ARGS+= --with-libvorbis=system 46CONFIGURE_ARGS+= --with-libid3tag="system"
44CONFIGURE_ARGS+= --with-lv2=system 47CONFIGURE_ARGS+= --with-libtwolame="system"
45CONFIGURE_ARGS+= --with-midi=local 48CONFIGURE_ARGS+= --with-libvamp="system"
46# configure: error: Your version of portaudio does not include 49CONFIGURE_ARGS+= --with-libvorbis="system"
47# required Pa_GetStreamHostApiType function 50CONFIGURE_ARGS+= --with-lv2="system"
48CONFIGURE_ARGS+= --with-portaudio=local 51CONFIGURE_ARGS+= --with-soundtouch="system"
49CONFIGURE_ARGS+= --with-sbsms=local 52
50CONFIGURE_ARGS+= --with-soundtouch=system 53.include "../../mk/bsd.prefs.mk"
51CONFIGURE_ARGS+= --with-libsoxr=system 
52CONFIGURE_ARGS+= --with-widgetextra=local 
53 
54# for internal portaudio... 
55.if ${OPSYS} == "Linux" 
56CONFIGURE_ARGS+= --with-alsa 
57.else 
58CONFIGURE_ARGS+= --without-alsa 
59CONFIGURE_ENV+= ac_cv_header_pa_linux_alsa_h=no 
60.endif 
61 54
62.if ${MACHINE_ARCH} == "i386" 55.if ${MACHINE_ARCH} == "i386"
63# 64 bit atomic ops are required 56# 64 bit atomic ops are required
64CXXFLAGS+= -march=i586 57CXXFLAGS+= -march=i586
65.endif 58.endif
66 59
67.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64" 60.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
68CONFIGURE_ARGS+= --disable-sse 61CONFIGURE_ARGS+= --disable-sse
69.endif 62.endif
70 63
71.include "../../mk/oss.buildlink3.mk" 64CFLAGS.SunOS+= -fPIC
72 65
73.if !empty(OSS_TYPE) && ${OSS_TYPE} != "none" 66LIBS.NetBSD+= -lcompat
74CONFIGURE_ARGS+= --with-oss 
75.else 
76CONFIGURE_ARGS+= --without-oss 
77.endif 
78 67
79CONFIG_GUESS_OVERRIDE= \ 68CONFIG_GUESS_OVERRIDE= \
80 config.guess */config.guess */*/config.guess */*/*/config.guess 69 config.guess */config.guess */*/config.guess */*/*/config.guess
81CONFIG_SUB_OVERRIDE= \ 70CONFIG_SUB_OVERRIDE= \
82 config.sub */config.sub */*/config.sub */*/*/config.sub 71 config.sub */config.sub */*/config.sub */*/*/config.sub
83 72
84CFLAGS.SunOS+= -fPIC 
85 
86PTHREAD_AUTO_VARS= yes 73PTHREAD_AUTO_VARS= yes
87BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 
88BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=./build/vamp-plugin.map 74BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=./build/vamp-plugin.map
89 75
90LIBS.NetBSD+= -lcompat 
91 
92INSTALLATION_DIRS+= lib 76INSTALLATION_DIRS+= lib
93 77
94# regen Makefile.in to avoid being built as shared libraries 78# regen Makefile.in to avoid being built as shared libraries
95pre-configure: 79pre-configure:
96 cd ${WRKSRC}/lib-src/portaudio-v19 && ${PKGSRC_SETENV} autoreconf -fiv 
97 cd ${WRKSRC}/lib-src/portmixer && ${PKGSRC_SETENV} autoreconf -fiv 80 cd ${WRKSRC}/lib-src/portmixer && ${PKGSRC_SETENV} autoreconf -fiv
98 cd ${WRKSRC}/lib-src/lib-widget-extra && autoreconf -fiv 81 cd ${WRKSRC}/lib-src/lib-widget-extra && autoreconf -fiv
99 82
100post-install: 83post-install:
101 ${INSTALL_LIB} ${WRKSRC}/lib-src/FileDialog/.libs/libFileDialog.so.0.0.0 \ 84 ${INSTALL_LIB} ${WRKSRC}/lib-src/FileDialog/.libs/libFileDialog.so.0.0.0 \
102 ${DESTDIR}${PREFIX}/lib/libFileDialog.so.0 85 ${DESTDIR}${PREFIX}/lib/libFileDialog.so.0
103 86
104.include "options.mk" 
105 
106.include "../../sysutils/desktop-file-utils/desktopdb.mk" 87.include "../../sysutils/desktop-file-utils/desktopdb.mk"
107.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 88.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
108.include "../../audio/alsa-lib/buildlink3.mk" 89.include "../../audio/alsa-lib/buildlink3.mk"
109.include "../../audio/lilv/buildlink3.mk" 90.include "../../audio/lilv/buildlink3.mk"
110.include "../../audio/lv2/buildlink3.mk" 91.include "../../audio/lv2/buildlink3.mk"
111.include "../../audio/soundtouch/buildlink3.mk" 92.include "../../audio/soundtouch/buildlink3.mk"
112BUILDLINK_API_DEPENDS.twolame+= twolame>=0.3.9 93BUILDLINK_API_DEPENDS.twolame+= twolame>=0.3.9
113.include "../../audio/twolame/buildlink3.mk" 94.include "../../audio/twolame/buildlink3.mk"
 95.include "../../audio/ladspa/buildlink3.mk"
114.include "../../audio/lame/buildlink3.mk" 96.include "../../audio/lame/buildlink3.mk"
115.include "../../audio/libid3tag/buildlink3.mk" 97.include "../../audio/libid3tag/buildlink3.mk"
116.include "../../audio/libsamplerate/buildlink3.mk" 
117.include "../../audio/libsoxr/buildlink3.mk" 98.include "../../audio/libsoxr/buildlink3.mk"
118.include "../../audio/libsndfile/buildlink3.mk" 99.include "../../audio/libsndfile/buildlink3.mk"
119.include "../../audio/libvorbis/buildlink3.mk" 100.include "../../audio/libvorbis/buildlink3.mk"
 101BUILDLINK_API_DEPENDS.portaudio+= portaudio>=190600.20161030nb1
 102.include "../../audio/portaudio/buildlink3.mk"
120.include "../../audio/suil/buildlink3.mk" 103.include "../../audio/suil/buildlink3.mk"
 104.include "../../audio/vamp-plugin-sdk/buildlink3.mk"
 105.include "../../devel/gettext-lib/buildlink3.mk"
121.include "../../devel/zlib/buildlink3.mk" 106.include "../../devel/zlib/buildlink3.mk"
122BUILDLINK_API_DEPENDS.flac+= flac>=1.3.0 107BUILDLINK_API_DEPENDS.flac+= flac>=1.3.0
123.include "../../audio/flac/buildlink3.mk" 108.include "../../audio/flac/buildlink3.mk"
124.include "../../multimedia/ffmpeg4/buildlink3.mk" 109.include "../../multimedia/ffmpeg4/buildlink3.mk"
125.include "../../multimedia/libogg/buildlink3.mk" 110.include "../../multimedia/libogg/buildlink3.mk"
126.include "../../textproc/expat/buildlink3.mk" 111.include "../../textproc/expat/buildlink3.mk"
127.include "../../x11/wxGTK30/buildlink3.mk" 112.include "../../x11/wxGTK30/buildlink3.mk"
128.include "../../mk/dlopen.buildlink3.mk" 113.include "../../mk/dlopen.buildlink3.mk"
 114BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
129.include "../../mk/pthread.buildlink3.mk" 115.include "../../mk/pthread.buildlink3.mk"
130.include "../../mk/bsd.pkg.mk" 116.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/audio/audacity/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/audacity/PLIST 2019/06/04 23:09:51 1.15
+++ pkgsrc/audio/audacity/PLIST 2019/10/26 17:22:08 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.15 2019/06/04 23:09:51 nia Exp $ 1@comment $NetBSD: PLIST,v 1.16 2019/10/26 17:22:08 nia Exp $
2bin/audacity 2bin/audacity
3lib/libFileDialog.so.0 3lib/libFileDialog.so.0
4man/man1/audacity.1 4man/man1/audacity.1
5share/appdata/audacity.appdata.xml 5share/appdata/audacity.appdata.xml
6share/applications/audacity.desktop 6share/applications/audacity.desktop
7share/audacity/EQDefaultCurves.xml 7share/audacity/EQDefaultCurves.xml
8share/audacity/include/audacity/ComponentInterface.h 8share/audacity/include/audacity/ComponentInterface.h
9share/audacity/include/audacity/ConfigInterface.h 9share/audacity/include/audacity/ConfigInterface.h
10share/audacity/include/audacity/EffectAutomationParameters.h 10share/audacity/include/audacity/EffectAutomationParameters.h
11share/audacity/include/audacity/EffectInterface.h 11share/audacity/include/audacity/EffectInterface.h
12share/audacity/include/audacity/ImporterInterface.h 12share/audacity/include/audacity/ImporterInterface.h
13share/audacity/include/audacity/ModuleInterface.h 13share/audacity/include/audacity/ModuleInterface.h
14share/audacity/include/audacity/PluginInterface.h 14share/audacity/include/audacity/PluginInterface.h
@@ -82,73 +82,73 @@ share/audacity/plug-ins/sample-data-expo @@ -82,73 +82,73 @@ share/audacity/plug-ins/sample-data-expo
82share/audacity/plug-ins/sample-data-import.ny 82share/audacity/plug-ins/sample-data-import.ny
83share/audacity/plug-ins/tremolo.ny 83share/audacity/plug-ins/tremolo.ny
84share/audacity/plug-ins/vocalrediso.ny 84share/audacity/plug-ins/vocalrediso.ny
85share/audacity/plug-ins/vocalremover.ny 85share/audacity/plug-ins/vocalremover.ny
86share/audacity/plug-ins/vocoder.ny 86share/audacity/plug-ins/vocoder.ny
87share/doc/audacity/LICENSE.txt 87share/doc/audacity/LICENSE.txt
88share/doc/audacity/README.txt 88share/doc/audacity/README.txt
89share/icons/hicolor/16x16/apps/audacity.png 89share/icons/hicolor/16x16/apps/audacity.png
90share/icons/hicolor/22x22/apps/audacity.png 90share/icons/hicolor/22x22/apps/audacity.png
91share/icons/hicolor/24x24/apps/audacity.png 91share/icons/hicolor/24x24/apps/audacity.png
92share/icons/hicolor/32x32/apps/audacity.png 92share/icons/hicolor/32x32/apps/audacity.png
93share/icons/hicolor/48x48/apps/audacity.png 93share/icons/hicolor/48x48/apps/audacity.png
94share/icons/hicolor/scalable/apps/audacity.svg 94share/icons/hicolor/scalable/apps/audacity.svg
95${PLIST.nls}share/locale/af/LC_MESSAGES/audacity.mo 95share/locale/af/LC_MESSAGES/audacity.mo
96${PLIST.nls}share/locale/ar/LC_MESSAGES/audacity.mo 96share/locale/ar/LC_MESSAGES/audacity.mo
97${PLIST.nls}share/locale/be/LC_MESSAGES/audacity.mo 97share/locale/be/LC_MESSAGES/audacity.mo
98${PLIST.nls}share/locale/bg/LC_MESSAGES/audacity.mo 98share/locale/bg/LC_MESSAGES/audacity.mo
99${PLIST.nls}share/locale/bn/LC_MESSAGES/audacity.mo 99share/locale/bn/LC_MESSAGES/audacity.mo
100${PLIST.nls}share/locale/bs/LC_MESSAGES/audacity.mo 100share/locale/bs/LC_MESSAGES/audacity.mo
101${PLIST.nls}share/locale/ca/LC_MESSAGES/audacity.mo 101share/locale/ca/LC_MESSAGES/audacity.mo
102${PLIST.nls}share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo 102share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
103${PLIST.nls}share/locale/cs/LC_MESSAGES/audacity.mo 103share/locale/cs/LC_MESSAGES/audacity.mo
104${PLIST.nls}share/locale/cy/LC_MESSAGES/audacity.mo 104share/locale/cy/LC_MESSAGES/audacity.mo
105${PLIST.nls}share/locale/da/LC_MESSAGES/audacity.mo 105share/locale/da/LC_MESSAGES/audacity.mo
106${PLIST.nls}share/locale/de/LC_MESSAGES/audacity.mo 106share/locale/de/LC_MESSAGES/audacity.mo
107${PLIST.nls}share/locale/el/LC_MESSAGES/audacity.mo 107share/locale/el/LC_MESSAGES/audacity.mo
108${PLIST.nls}share/locale/es/LC_MESSAGES/audacity.mo 108share/locale/es/LC_MESSAGES/audacity.mo
109${PLIST.nls}share/locale/eu/LC_MESSAGES/audacity.mo 109share/locale/eu/LC_MESSAGES/audacity.mo
110${PLIST.nls}share/locale/eu_ES/LC_MESSAGES/audacity.mo 110share/locale/eu_ES/LC_MESSAGES/audacity.mo
111${PLIST.nls}share/locale/fa/LC_MESSAGES/audacity.mo 111share/locale/fa/LC_MESSAGES/audacity.mo
112${PLIST.nls}share/locale/fi/LC_MESSAGES/audacity.mo 112share/locale/fi/LC_MESSAGES/audacity.mo
113${PLIST.nls}share/locale/fr/LC_MESSAGES/audacity.mo 113share/locale/fr/LC_MESSAGES/audacity.mo
114${PLIST.nls}share/locale/ga/LC_MESSAGES/audacity.mo 114share/locale/ga/LC_MESSAGES/audacity.mo
115${PLIST.nls}share/locale/gl/LC_MESSAGES/audacity.mo 115share/locale/gl/LC_MESSAGES/audacity.mo
116${PLIST.nls}share/locale/he/LC_MESSAGES/audacity.mo 116share/locale/he/LC_MESSAGES/audacity.mo
117${PLIST.nls}share/locale/hi/LC_MESSAGES/audacity.mo 117share/locale/hi/LC_MESSAGES/audacity.mo
118${PLIST.nls}share/locale/hr/LC_MESSAGES/audacity.mo 118share/locale/hr/LC_MESSAGES/audacity.mo
119${PLIST.nls}share/locale/hu/LC_MESSAGES/audacity.mo 119share/locale/hu/LC_MESSAGES/audacity.mo
120${PLIST.nls}share/locale/hy/LC_MESSAGES/audacity.mo 120share/locale/hy/LC_MESSAGES/audacity.mo
121${PLIST.nls}share/locale/id/LC_MESSAGES/audacity.mo 121share/locale/id/LC_MESSAGES/audacity.mo
122${PLIST.nls}share/locale/it/LC_MESSAGES/audacity.mo 122share/locale/it/LC_MESSAGES/audacity.mo
123${PLIST.nls}share/locale/ja/LC_MESSAGES/audacity.mo 123share/locale/ja/LC_MESSAGES/audacity.mo
124${PLIST.nls}share/locale/ka/LC_MESSAGES/audacity.mo 124share/locale/ka/LC_MESSAGES/audacity.mo
125${PLIST.nls}share/locale/km/LC_MESSAGES/audacity.mo 125share/locale/km/LC_MESSAGES/audacity.mo
126${PLIST.nls}share/locale/ko/LC_MESSAGES/audacity.mo 126share/locale/ko/LC_MESSAGES/audacity.mo
127${PLIST.nls}share/locale/lt/LC_MESSAGES/audacity.mo 127share/locale/lt/LC_MESSAGES/audacity.mo
128${PLIST.nls}share/locale/mk/LC_MESSAGES/audacity.mo 128share/locale/mk/LC_MESSAGES/audacity.mo
129${PLIST.nls}share/locale/my/LC_MESSAGES/audacity.mo 129share/locale/my/LC_MESSAGES/audacity.mo
130${PLIST.nls}share/locale/nb/LC_MESSAGES/audacity.mo 130share/locale/nb/LC_MESSAGES/audacity.mo
131${PLIST.nls}share/locale/nl/LC_MESSAGES/audacity.mo 131share/locale/nl/LC_MESSAGES/audacity.mo
132${PLIST.nls}share/locale/oc/LC_MESSAGES/audacity.mo 132share/locale/oc/LC_MESSAGES/audacity.mo
133${PLIST.nls}share/locale/pl/LC_MESSAGES/audacity.mo 133share/locale/pl/LC_MESSAGES/audacity.mo
134${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/audacity.mo 134share/locale/pt_BR/LC_MESSAGES/audacity.mo
135${PLIST.nls}share/locale/pt_PT/LC_MESSAGES/audacity.mo 135share/locale/pt_PT/LC_MESSAGES/audacity.mo
136${PLIST.nls}share/locale/ro/LC_MESSAGES/audacity.mo 136share/locale/ro/LC_MESSAGES/audacity.mo
137${PLIST.nls}share/locale/ru/LC_MESSAGES/audacity.mo 137share/locale/ru/LC_MESSAGES/audacity.mo
138${PLIST.nls}share/locale/sk/LC_MESSAGES/audacity.mo 138share/locale/sk/LC_MESSAGES/audacity.mo
139${PLIST.nls}share/locale/sl/LC_MESSAGES/audacity.mo 139share/locale/sl/LC_MESSAGES/audacity.mo
140${PLIST.nls}share/locale/sr_RS/LC_MESSAGES/audacity.mo 140share/locale/sr_RS/LC_MESSAGES/audacity.mo
141${PLIST.nls}share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo 141share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo
142${PLIST.nls}share/locale/sv/LC_MESSAGES/audacity.mo 142share/locale/sv/LC_MESSAGES/audacity.mo
143${PLIST.nls}share/locale/ta/LC_MESSAGES/audacity.mo 143share/locale/ta/LC_MESSAGES/audacity.mo
144${PLIST.nls}share/locale/tg/LC_MESSAGES/audacity.mo 144share/locale/tg/LC_MESSAGES/audacity.mo
145${PLIST.nls}share/locale/tr/LC_MESSAGES/audacity.mo 145share/locale/tr/LC_MESSAGES/audacity.mo
146${PLIST.nls}share/locale/uk/LC_MESSAGES/audacity.mo 146share/locale/uk/LC_MESSAGES/audacity.mo
147${PLIST.nls}share/locale/vi/LC_MESSAGES/audacity.mo 147share/locale/vi/LC_MESSAGES/audacity.mo
148${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/audacity.mo 148share/locale/zh_CN/LC_MESSAGES/audacity.mo
149${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/audacity.mo 149share/locale/zh_TW/LC_MESSAGES/audacity.mo
150share/mime/packages/audacity.xml 150share/mime/packages/audacity.xml
151share/pixmaps/audacity.xpm 151share/pixmaps/audacity.xpm
152share/pixmaps/audacity16.xpm 152share/pixmaps/audacity16.xpm
153share/pixmaps/audacity32.xpm 153share/pixmaps/audacity32.xpm
154share/pixmaps/gnome-mime-application-x-audacity-project.xpm 154share/pixmaps/gnome-mime-application-x-audacity-project.xpm
cvs diff -r1.38 -r1.39 pkgsrc/audio/audacity/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/audacity/distinfo 2019/06/04 23:09:51 1.38
+++ pkgsrc/audio/audacity/distinfo 2019/10/26 17:22:08 1.39
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1$NetBSD: distinfo,v 1.38 2019/06/04 23:09:51 nia Exp $ 1$NetBSD: distinfo,v 1.39 2019/10/26 17:22:08 nia Exp $
2 2
3SHA1 (audacity-2.3.2.tar.gz) = b91b88aa68521a03fa5cc7dacaf5eb39f92e3b6f 3SHA1 (audacity-2.3.2.tar.gz) = b91b88aa68521a03fa5cc7dacaf5eb39f92e3b6f
4RMD160 (audacity-2.3.2.tar.gz) = 8bf05565f6a4afd464670b2e6fb5ed261a886ef2 4RMD160 (audacity-2.3.2.tar.gz) = 8bf05565f6a4afd464670b2e6fb5ed261a886ef2
5SHA512 (audacity-2.3.2.tar.gz) = a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0 5SHA512 (audacity-2.3.2.tar.gz) = a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
6Size (audacity-2.3.2.tar.gz) = 61972597 bytes 6Size (audacity-2.3.2.tar.gz) = 61972597 bytes
7SHA1 (patch-Makefile.in) = 2aca8c2ae0af7863f8f090a707c08fba693c7c86 7SHA1 (patch-Makefile.in) = 2aca8c2ae0af7863f8f090a707c08fba693c7c86
8SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994 8SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
9SHA1 (patch-lib-src_FileDialog_Makefile.am) = efa6ca612f3984a4cf8150e3c624e347d144af87 9SHA1 (patch-lib-src_FileDialog_Makefile.am) = efa6ca612f3984a4cf8150e3c624e347d144af87
10SHA1 (patch-lib-src_FileDialog_Makefile.in) = 44ca2539d68ab3951ae44377ed56f574785c1b08 10SHA1 (patch-lib-src_FileDialog_Makefile.in) = 44ca2539d68ab3951ae44377ed56f574785c1b08
11SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = 03d080c141259fbf02a9c5a70ce06625fcebf75e 11SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = 03d080c141259fbf02a9c5a70ce06625fcebf75e
12SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = dbc0b5b88043c7b2895742e78e6a5990f65012ef 12SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = dbc0b5b88043c7b2895742e78e6a5990f65012ef
13SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee 13SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
14SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = 2d4558f059d86633a1fcdda22ef0c914758b35a0 14SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = 2d4558f059d86633a1fcdda22ef0c914758b35a0
15SHA1 (patch-lib-src_portaudio-v19_Makefile.in) = 9e86fbd93d322322b8416ef6b43ba5c98141c986 
16SHA1 (patch-lib-src_portmixer_src-extra_Makefile.am) = 9a0d5be37753683a2cade42673edb3d08e01ab4d 15SHA1 (patch-lib-src_portmixer_src-extra_Makefile.am) = 9a0d5be37753683a2cade42673edb3d08e01ab4d
17SHA1 (patch-lib-src_sbsms_src-extra_Makefile.am) = 2beca18a286de1b26f4f96976fb58e1665d0531c 16SHA1 (patch-lib-src_sbsms_src-extra_Makefile.am) = 2beca18a286de1b26f4f96976fb58e1665d0531c
18SHA1 (patch-src_AudioIO.cpp) = 1b44c68c4233b24a5fa4e17515eb237fee0e283a 17SHA1 (patch-src_AudioIO.cpp) = 1b44c68c4233b24a5fa4e17515eb237fee0e283a
19SHA1 (patch-src_effects_Effect.cpp) = 78d9a8f1bdb70284d2ad57243d10f56c993759c6 18SHA1 (patch-src_effects_Effect.cpp) = 78d9a8f1bdb70284d2ad57243d10f56c993759c6
20SHA1 (patch-src_effects_EffectManager.cpp) = 8ce8679cf4530b1fbb0b1d63896be98c41b27bb6 19SHA1 (patch-src_effects_EffectManager.cpp) = 8ce8679cf4530b1fbb0b1d63896be98c41b27bb6
21SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2 20SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2
File Deleted: pkgsrc/audio/audacity/Attic/options.mk
File Deleted: pkgsrc/audio/audacity/patches/Attic/patch-lib-src_portaudio-v19_Makefile.in
cvs diff -r1.24 -r1.25 pkgsrc/audio/portaudio/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/portaudio/Makefile 2019/10/20 11:10:49 1.24
+++ pkgsrc/audio/portaudio/Makefile 2019/10/26 17:22:07 1.25
@@ -1,54 +1,60 @@ @@ -1,54 +1,60 @@
1# $NetBSD: Makefile,v 1.24 2019/10/20 11:10:49 nia Exp $ 1# $NetBSD: Makefile,v 1.25 2019/10/26 17:22:07 nia Exp $
2 2
3DISTNAME= pa_stable_v190600_20161030 3DISTNAME= pa_stable_v190600_20161030
4PKGNAME= ${DISTNAME:S/^pa_stable_v/portaudio-/1:S/_/./g} 4PKGNAME= ${DISTNAME:S/^pa_stable_v/portaudio-/1:S/_/./g}
 5PKGREVISION= 1
5CATEGORIES= audio 6CATEGORIES= audio
6MASTER_SITES= http://www.portaudio.com/archives/ 7MASTER_SITES= http://www.portaudio.com/archives/
7EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.portaudio.com/ 11HOMEPAGE= http://www.portaudio.com/
11COMMENT= Portable cross-platform audio API 12COMMENT= Portable cross-platform audio API
12LICENSE= mit 13LICENSE= mit
13 14
14CONFLICTS+= portaudio-devel-[0-9]* 15CONFLICTS+= portaudio-devel-[0-9]*
15SUPERSEDES+= portaudio-devel-[0-9]* 16SUPERSEDES+= portaudio-devel-[0-9]*
16 17
17USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
18USE_TOOLS+= gmake pkg-config 19USE_TOOLS+= gmake pkg-config
19USE_LIBTOOL= yes 20USE_LIBTOOL= yes
20GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
21 22
22GNU_CONFIGURE_LIBSUBDIR= portaudio2 23GNU_CONFIGURE_LIBSUBDIR= portaudio2
23 24
24NOT_FOR_PLATFORM= Interix-*-* 25NOT_FOR_PLATFORM= Interix-*-*
25 26
26CONFIGURE_ARGS+= --enable-cxx 27CONFIGURE_ARGS+= --enable-cxx
27CONFIGURE_ARGS+= --includedir=${PREFIX}/include/portaudio2 28CONFIGURE_ARGS+= --includedir=${PREFIX}/include/portaudio2
28CONFIGURE_ARGS+= --disable-mac-universal 29CONFIGURE_ARGS+= --disable-mac-universal
29 30
 31.include "../../mk/oss.buildlink3.mk"
 32PLIST_VARS+= oss
 33.if ${OSS_TYPE} != "none"
 34PLIST.oss= yes
30LDFLAGS+= ${LIBOSSAUDIO} 35LDFLAGS+= ${LIBOSSAUDIO}
 36.endif
 37
31PKGCONFIG_OVERRIDE= portaudio-2.0.pc.in 38PKGCONFIG_OVERRIDE= portaudio-2.0.pc.in
32WRKSRC= ${WRKDIR}/portaudio 39WRKSRC= ${WRKDIR}/portaudio
33 40
34INSTALLATION_DIRS= include/portaudio2 lib/portaudio2 lib/pkgconfig 41INSTALLATION_DIRS= include/portaudio2 lib/portaudio2 lib/pkgconfig
35 42
36SUBST_CLASSES+= pthread 43SUBST_CLASSES+= pthread
37SUBST_STAGE.pthread= pre-configure 44SUBST_STAGE.pthread= pre-configure
38SUBST_MESSAGE.pthread= Fixing -lpthread references. 45SUBST_MESSAGE.pthread= Fixing -lpthread references.
39SUBST_FILES.pthread= configure 46SUBST_FILES.pthread= configure
40SUBST_SED.pthread= -e 's/-D_REENTRANT/${PTHREAD_CFLAGS}/g' 47SUBST_SED.pthread= -e 's/-D_REENTRANT/${PTHREAD_CFLAGS}/g'
41SUBST_SED.pthread+= -e 's/-lpthread/${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}/g' 48SUBST_SED.pthread+= -e 's/-lpthread/${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}/g'
42 49
43SUBST_CLASSES+= pc 50SUBST_CLASSES+= pc
44SUBST_STAGE.pc= pre-configure 51SUBST_STAGE.pc= pre-configure
45SUBST_MESSAGE.pc= Fixing pkgconfig directory 52SUBST_MESSAGE.pc= Fixing pkgconfig directory
46SUBST_FILES.pc= Makefile.in bindings/cpp/Makefile.in 53SUBST_FILES.pc= Makefile.in bindings/cpp/Makefile.in
47SUBST_SED.pc= -e 's/$$(libdir)\/pkgconfig/$$(prefix)\/lib\/pkgconfig/g' 54SUBST_SED.pc= -e 's/$$(libdir)\/pkgconfig/$$(prefix)\/lib\/pkgconfig/g'
48 55
49CFLAGS.Darwin+= -Wno-deprecated-declarations 56CFLAGS.Darwin+= -Wno-deprecated-declarations
50 57
51.include "options.mk" 58.include "options.mk"
52.include "../../mk/pthread.buildlink3.mk" 59.include "../../mk/pthread.buildlink3.mk"
53.include "../../mk/oss.buildlink3.mk" 
54.include "../../mk/bsd.pkg.mk" 60.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/audio/portaudio/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/portaudio/PLIST 2019/10/20 11:10:49 1.4
+++ pkgsrc/audio/portaudio/PLIST 2019/10/26 17:22:07 1.5
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1@comment $NetBSD: PLIST,v 1.4 2019/10/20 11:10:49 nia Exp $ 1@comment $NetBSD: PLIST,v 1.5 2019/10/26 17:22:07 nia Exp $
2${PLIST.alsa}include/portaudio2/pa_linux_alsa.h 2${PLIST.alsa}include/portaudio2/pa_linux_alsa.h
 3${PLIST.oss}include/portaudio2/pa_unix_oss.h
3include/portaudio2/portaudio.h 4include/portaudio2/portaudio.h
4include/portaudio2/portaudiocpp/AutoSystem.hxx 5include/portaudio2/portaudiocpp/AutoSystem.hxx
5include/portaudio2/portaudiocpp/BlockingStream.hxx 6include/portaudio2/portaudiocpp/BlockingStream.hxx
6include/portaudio2/portaudiocpp/CFunCallbackStream.hxx 7include/portaudio2/portaudiocpp/CFunCallbackStream.hxx
7include/portaudio2/portaudiocpp/CallbackInterface.hxx 8include/portaudio2/portaudiocpp/CallbackInterface.hxx
8include/portaudio2/portaudiocpp/CallbackStream.hxx 9include/portaudio2/portaudiocpp/CallbackStream.hxx
9include/portaudio2/portaudiocpp/CppFunCallbackStream.hxx 10include/portaudio2/portaudiocpp/CppFunCallbackStream.hxx
10include/portaudio2/portaudiocpp/Device.hxx 11include/portaudio2/portaudiocpp/Device.hxx
11include/portaudio2/portaudiocpp/DirectionSpecificStreamParameters.hxx 12include/portaudio2/portaudiocpp/DirectionSpecificStreamParameters.hxx
12include/portaudio2/portaudiocpp/Exception.hxx 13include/portaudio2/portaudiocpp/Exception.hxx
13include/portaudio2/portaudiocpp/HostApi.hxx 14include/portaudio2/portaudiocpp/HostApi.hxx
14include/portaudio2/portaudiocpp/InterfaceCallbackStream.hxx 15include/portaudio2/portaudiocpp/InterfaceCallbackStream.hxx
15include/portaudio2/portaudiocpp/MemFunCallbackStream.hxx 16include/portaudio2/portaudiocpp/MemFunCallbackStream.hxx
cvs diff -r1.17 -r1.18 pkgsrc/audio/portaudio/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/portaudio/distinfo 2019/10/20 11:10:49 1.17
+++ pkgsrc/audio/portaudio/distinfo 2019/10/26 17:22:07 1.18
@@ -1,8 +1,14 @@ @@ -1,8 +1,14 @@
1$NetBSD: distinfo,v 1.17 2019/10/20 11:10:49 nia Exp $ 1$NetBSD: distinfo,v 1.18 2019/10/26 17:22:07 nia Exp $
2 2
3SHA1 (pa_stable_v190600_20161030.tgz) = 56c596bba820d90df7d057d8f6a0ec6bf9ab82e8 3SHA1 (pa_stable_v190600_20161030.tgz) = 56c596bba820d90df7d057d8f6a0ec6bf9ab82e8
4RMD160 (pa_stable_v190600_20161030.tgz) = e6e5cd3f3cb7469aa17549c189e445d573567e13 4RMD160 (pa_stable_v190600_20161030.tgz) = e6e5cd3f3cb7469aa17549c189e445d573567e13
5SHA512 (pa_stable_v190600_20161030.tgz) = 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c 5SHA512 (pa_stable_v190600_20161030.tgz) = 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
6Size (pa_stable_v190600_20161030.tgz) = 1450572 bytes 6Size (pa_stable_v190600_20161030.tgz) = 1450572 bytes
7SHA1 (patch-src_hostapi_alsa_pa__linux__alsa.c) = b83c77d1dd23ab16f940dc11228bee3460d2a58b 7SHA1 (patch-configure) = 79c78737a8812adfb9d03dc395f63951d53a440b
8SHA1 (patch-src_hostapi_oss_pa__unix__oss.c) = 81b6633bdb1cac8d3397bd7ebb6da1e28b68e3df 8SHA1 (patch-include_pa__unix__oss.h) = 55213cf8dfa4f81b8be23c912deddd8cc8b8117f
 9SHA1 (patch-include_portaudio.h) = fc5ea598b2e6fc80a0e106a400ffab521ea3cf4e
 10SHA1 (patch-src_common_pa__front.c) = cdddb6f537f803b55873ad6bfa936a6bff47556d
 11SHA1 (patch-src_common_pa__stream.c) = 58e6ab2a61957208973a59be2f1140abc922f360
 12SHA1 (patch-src_common_pa__stream.h) = 94781a9ae79ea1340eea8caadc106416c019cf74
 13SHA1 (patch-src_hostapi_alsa_pa__linux__alsa.c) = 6ddbeca36be30153f9c6c316c2fb78c06bbbf05d
 14SHA1 (patch-src_hostapi_oss_pa__unix__oss.c) = 5652426814a3fc82ed802d8082a74aa460c822ca
cvs diff -r1.1 -r1.2 pkgsrc/audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c (expand / switch to unified diff)

--- pkgsrc/audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c 2019/10/20 11:10:49 1.1
+++ pkgsrc/audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c 2019/10/26 17:22:08 1.2
@@ -1,17 +1,67 @@ @@ -1,17 +1,67 @@
1$NetBSD: patch-src_hostapi_alsa_pa__linux__alsa.c,v 1.1 2019/10/20 11:10:49 nia Exp $ 1$NetBSD: patch-src_hostapi_alsa_pa__linux__alsa.c,v 1.2 2019/10/26 17:22:08 nia Exp $
2 2
3Support building on non-Linux systems. 3Support building on non-Linux systems.
4 4
 5Add features needed to make portmixer work with audacity.
 6
5--- src/hostapi/alsa/pa_linux_alsa.c.orig 2016-10-30 01:23:04.000000000 +0000 7--- src/hostapi/alsa/pa_linux_alsa.c.orig 2016-10-30 01:23:04.000000000 +0000
6+++ src/hostapi/alsa/pa_linux_alsa.c 8+++ src/hostapi/alsa/pa_linux_alsa.c
7@@ -79,6 +79,10 @@ 9@@ -79,6 +79,10 @@
8  10
9 #include "pa_linux_alsa.h" 11 #include "pa_linux_alsa.h"
10  12
11+#ifndef ESTRPIPE 13+#ifndef ESTRPIPE
12+ #define ESTRPIPE EPIPE 14+ #define ESTRPIPE EPIPE
13+#endif 15+#endif
14+ 16+
15 /* Add missing define (for compatibility with older ALSA versions) */ 17 /* Add missing define (for compatibility with older ALSA versions) */
16 #ifndef SND_PCM_TSTAMP_ENABLE 18 #ifndef SND_PCM_TSTAMP_ENABLE
17 #define SND_PCM_TSTAMP_ENABLE SND_PCM_TSTAMP_MMAP 19 #define SND_PCM_TSTAMP_ENABLE SND_PCM_TSTAMP_MMAP
 20@@ -621,6 +625,7 @@ typedef struct
 21 StreamDirection streamDir;
 22
 23 snd_pcm_channel_area_t *channelAreas; /* Needed for channel adaption */
 24+ int card;
 25 } PaAlsaStreamComponent;
 26
 27 /* Implementation specific stream structure */
 28@@ -1873,6 +1878,7 @@ static PaError PaAlsaStreamComponent_Ini
 29 {
 30 PaError result = paNoError;
 31 PaSampleFormat userSampleFormat = params->sampleFormat, hostSampleFormat = paNoError;
 32+ snd_pcm_info_t* pcmInfo;
 33 assert( params->channelCount > 0 );
 34
 35 /* Make sure things have an initial value */
 36@@ -1900,6 +1906,9 @@ static PaError PaAlsaStreamComponent_Ini
 37 self->device = params->device;
 38
 39 PA_ENSURE( AlsaOpen( &alsaApi->baseHostApiRep, params, streamDir, &self->pcm ) );
 40+
 41+ snd_pcm_info_alloca( &pcmInfo );
 42+ self->card = snd_pcm_info_get_card( pcmInfo );
 43 self->nfds = alsa_snd_pcm_poll_descriptors_count( self->pcm );
 44
 45 PA_ENSURE( hostSampleFormat = PaUtil_SelectClosestAvailableFormat( GetAvailableFormats( self->pcm ), userSampleFormat ) );
 46@@ -4605,9 +4614,7 @@ PaError PaAlsa_GetStreamInputCard( PaStr
 47 /* XXX: More descriptive error? */
 48 PA_UNLESS( stream->capture.pcm, paDeviceUnavailable );
 49
 50- alsa_snd_pcm_info_alloca( &pcmInfo );
 51- PA_ENSURE( alsa_snd_pcm_info( stream->capture.pcm, pcmInfo ) );
 52- *card = alsa_snd_pcm_info_get_card( pcmInfo );
 53+ *card = stream->capture.card;
 54
 55 error:
 56 return result;
 57@@ -4624,9 +4631,7 @@ PaError PaAlsa_GetStreamOutputCard( PaSt
 58 /* XXX: More descriptive error? */
 59 PA_UNLESS( stream->playback.pcm, paDeviceUnavailable );
 60
 61- alsa_snd_pcm_info_alloca( &pcmInfo );
 62- PA_ENSURE( alsa_snd_pcm_info( stream->playback.pcm, pcmInfo ) );
 63- *card = alsa_snd_pcm_info_get_card( pcmInfo );
 64+ *card = stream->playback.card;
 65
 66 error:
 67 return result;
cvs diff -r1.1 -r1.2 pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c (expand / switch to unified diff)

--- pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c 2019/10/20 11:10:49 1.1
+++ pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c 2019/10/26 17:22:08 1.2
@@ -1,22 +1,51 @@ @@ -1,22 +1,51 @@
1$NetBSD: patch-src_hostapi_oss_pa__unix__oss.c,v 1.1 2019/10/20 11:10:49 nia Exp $ 1$NetBSD: patch-src_hostapi_oss_pa__unix__oss.c,v 1.2 2019/10/26 17:22:08 nia Exp $
2 2
3Don't write an endless stream of silence when preparing the stream. 3Don't write an endless stream of silence when preparing the stream.
4 4
 5Add features needed to make portmixer work with audacity.
 6
5--- src/hostapi/oss/pa_unix_oss.c.orig 2016-10-30 01:23:04.000000000 +0000 7--- src/hostapi/oss/pa_unix_oss.c.orig 2016-10-30 01:23:04.000000000 +0000
6+++ src/hostapi/oss/pa_unix_oss.c 8+++ src/hostapi/oss/pa_unix_oss.c
7@@ -1479,6 +1479,7 @@ static PaError PaOssStream_Prepare( PaOs 9@@ -1477,6 +1477,7 @@ static PaError PaOssStream_Prepare( PaOs
 10 size_t bufSz = PaOssStreamComponent_BufferSize( stream->playback );
 11 memset( stream->playback->buffer, 0, bufSz );
8  12
 13+#ifndef __NetBSD__
9 /* Looks like we have to turn off blocking before we try this, but if we don't fill the buffer 14 /* Looks like we have to turn off blocking before we try this, but if we don't fill the buffer
10 * OSS will complain. */ 15 * OSS will complain. */
11+#ifndef __NetBSD__ 
12 PA_ENSURE( ModifyBlocking( stream->playback->fd, 0 ) ); 16 PA_ENSURE( ModifyBlocking( stream->playback->fd, 0 ) );
13 while (1) 
14 { 
15@@ -1486,6 +1487,7 @@ static PaError PaOssStream_Prepare( PaOs 17@@ -1486,6 +1487,7 @@ static PaError PaOssStream_Prepare( PaOs
16 break; 18 break;
17 } 19 }
18 PA_ENSURE( ModifyBlocking( stream->playback->fd, 1 ) ); 20 PA_ENSURE( ModifyBlocking( stream->playback->fd, 1 ) );
19+#endif 21+#endif
20 } 22 }
21  23
22 if( stream->sharedDevice ) 24 if( stream->sharedDevice )
 25@@ -2043,3 +2045,26 @@ error:
 26 #endif
 27 }
 28
 29+const char *PaOSS_GetStreamInputDevice( PaStream* s )
 30+{
 31+ PaOssStream *stream = (PaOssStream*)s;
 32+
 33+ if( stream->capture )
 34+ {
 35+ return stream->capture->devName;
 36+ }
 37+
 38+ return NULL;
 39+}
 40+
 41+const char *PaOSS_GetStreamOutputDevice( PaStream* s )
 42+{
 43+ PaOssStream *stream = (PaOssStream*)s;
 44+
 45+ if( stream->playback )
 46+ {
 47+ return stream->playback->devName;
 48+ }
 49+
 50+ return NULL;
 51+}