summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/audacity/Makefile126
-rw-r--r--audio/audacity/PLIST112
-rw-r--r--audio/audacity/distinfo3
-rw-r--r--audio/audacity/options.mk45
-rw-r--r--audio/audacity/patches/patch-lib-src_portaudio-v19_Makefile.in17
-rw-r--r--audio/portaudio/Makefile10
-rw-r--r--audio/portaudio/PLIST3
-rw-r--r--audio/portaudio/distinfo12
-rw-r--r--audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c52
-rw-r--r--audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c39
10 files changed, 217 insertions, 202 deletions
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 0efcdce987d..536ccff6ca2 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,99 +1,82 @@
-# $NetBSD: Makefile,v 1.125 2019/10/20 09:59:13 nia Exp $
+# $NetBSD: Makefile,v 1.126 2019/10/26 17:22:08 nia Exp $
-DISTNAME= audacity-2.3.2
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GITHUB:=audacity/}
-GITHUB_PROJECT= Audacity
-GITHUB_TAG= Audacity-${PKGVERSION_NOREV}
+DISTNAME= audacity-2.3.2
+PKGREVISION= 2
+CATEGORIES= audio
+MASTER_SITES= ${MASTER_SITE_GITHUB:=audacity/}
+GITHUB_PROJECT= Audacity
+GITHUB_TAG= Audacity-${PKGVERSION_NOREV}
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.audacityteam.org/
-COMMENT= Audio editor
-LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= https://www.audacityteam.org/
+COMMENT= Audio editor
+LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license
-WRKSRC= ${WRKDIR}/audacity-${GITHUB_PROJECT}-${PKGVERSION_NOREV}
+WRKSRC= ${WRKDIR}/audacity-${GITHUB_PROJECT}-${PKGVERSION_NOREV}
-.include "../../mk/bsd.prefs.mk"
+EXTRACT_USING= bsdtar
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+
+USE_TOOLS+= automake autoreconf bash
+USE_TOOLS+= gmake intltool msgfmt msgmerge pkg-config
+USE_TOOLS+= xgettext zip:run
+
+USE_LANGUAGES= c gnu++11
-EXTRACT_USING= bsdtar
-USE_LIBTOOL= yes
-USE_TOOLS+= automake autoreconf bash
-USE_TOOLS+= gmake intltool msgfmt msgmerge pkg-config
-USE_TOOLS+= xgettext zip:run
-USE_LANGUAGES= c c++
# configure: error: Audacity requires at least GCC 4.9
-GCC_REQD+= 4.9
-
-WRAPPER_SHELL= ${BASH}
-CONFIG_SHELL= ${BASH}
-
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+= --enable-nyquist=yes
-CONFIGURE_ARGS+= --with-expat=system
-CONFIGURE_ARGS+= --with-ffmpeg=system
-CONFIGURE_ARGS+= --with-lame=system
-CONFIGURE_ARGS+= --with-libflac=system
-CONFIGURE_ARGS+= --with-libid3tag=system
-CONFIGURE_ARGS+= --with-libsamplerate=system
-CONFIGURE_ARGS+= --with-libsndfile=system
-CONFIGURE_ARGS+= --with-libtwolame=system
-CONFIGURE_ARGS+= --with-libvamp=local
-CONFIGURE_ARGS+= --with-libvorbis=system
-CONFIGURE_ARGS+= --with-lv2=system
-CONFIGURE_ARGS+= --with-midi=local
-# configure: error: Your version of portaudio does not include
-# required Pa_GetStreamHostApiType function
-CONFIGURE_ARGS+= --with-portaudio=local
-CONFIGURE_ARGS+= --with-sbsms=local
-CONFIGURE_ARGS+= --with-soundtouch=system
-CONFIGURE_ARGS+= --with-libsoxr=system
-CONFIGURE_ARGS+= --with-widgetextra=local
-
-# for internal portaudio...
-.if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+= --with-alsa
-.else
-CONFIGURE_ARGS+= --without-alsa
-CONFIGURE_ENV+= ac_cv_header_pa_linux_alsa_h=no
-.endif
+GCC_REQD+= 4.9
+
+WRAPPER_SHELL= ${BASH}
+CONFIG_SHELL= ${BASH}
+
+CONFIGURE_ARGS+= --enable-ladspa
+
+CONFIGURE_ARGS+= --with-libmad="no"
+CONFIGURE_ARGS+= --with-expat="system"
+CONFIGURE_ARGS+= --with-libsndfile="system"
+CONFIGURE_ARGS+= --with-libsoxr="system"
+CONFIGURE_ARGS+= --with-portaudio="system"
+CONFIGURE_ARGS+= --with-sbsms="local" # system version doesn't work
+CONFIGURE_ARGS+= --with-portmidi="local"
+CONFIGURE_ARGS+= --with-ffmpeg="system"
+CONFIGURE_ARGS+= --with-lame="system"
+CONFIGURE_ARGS+= --with-libflac="system"
+CONFIGURE_ARGS+= --with-libid3tag="system"
+CONFIGURE_ARGS+= --with-libtwolame="system"
+CONFIGURE_ARGS+= --with-libvamp="system"
+CONFIGURE_ARGS+= --with-libvorbis="system"
+CONFIGURE_ARGS+= --with-lv2="system"
+CONFIGURE_ARGS+= --with-soundtouch="system"
+
+.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} == "i386"
# 64 bit atomic ops are required
-CXXFLAGS+= -march=i586
+CXXFLAGS+= -march=i586
.endif
.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
CONFIGURE_ARGS+= --disable-sse
.endif
-.include "../../mk/oss.buildlink3.mk"
+CFLAGS.SunOS+= -fPIC
-.if !empty(OSS_TYPE) && ${OSS_TYPE} != "none"
-CONFIGURE_ARGS+= --with-oss
-.else
-CONFIGURE_ARGS+= --without-oss
-.endif
+LIBS.NetBSD+= -lcompat
CONFIG_GUESS_OVERRIDE= \
config.guess */config.guess */*/config.guess */*/*/config.guess
CONFIG_SUB_OVERRIDE= \
config.sub */config.sub */*/config.sub */*/*/config.sub
-CFLAGS.SunOS+= -fPIC
-
PTHREAD_AUTO_VARS= yes
-BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=./build/vamp-plugin.map
-LIBS.NetBSD+= -lcompat
-
INSTALLATION_DIRS+= lib
# regen Makefile.in to avoid being built as shared libraries
pre-configure:
- cd ${WRKSRC}/lib-src/portaudio-v19 && ${PKGSRC_SETENV} autoreconf -fiv
cd ${WRKSRC}/lib-src/portmixer && ${PKGSRC_SETENV} autoreconf -fiv
cd ${WRKSRC}/lib-src/lib-widget-extra && autoreconf -fiv
@@ -101,8 +84,6 @@ post-install:
${INSTALL_LIB} ${WRKSRC}/lib-src/FileDialog/.libs/libFileDialog.so.0.0.0 \
${DESTDIR}${PREFIX}/lib/libFileDialog.so.0
-.include "options.mk"
-
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../audio/alsa-lib/buildlink3.mk"
@@ -111,13 +92,17 @@ post-install:
.include "../../audio/soundtouch/buildlink3.mk"
BUILDLINK_API_DEPENDS.twolame+= twolame>=0.3.9
.include "../../audio/twolame/buildlink3.mk"
+.include "../../audio/ladspa/buildlink3.mk"
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/libsoxr/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
+BUILDLINK_API_DEPENDS.portaudio+= portaudio>=190600.20161030nb1
+.include "../../audio/portaudio/buildlink3.mk"
.include "../../audio/suil/buildlink3.mk"
+.include "../../audio/vamp-plugin-sdk/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
BUILDLINK_API_DEPENDS.flac+= flac>=1.3.0
.include "../../audio/flac/buildlink3.mk"
@@ -126,5 +111,6 @@ BUILDLINK_API_DEPENDS.flac+= flac>=1.3.0
.include "../../textproc/expat/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
+BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/audacity/PLIST b/audio/audacity/PLIST
index 9e1a623fc66..0e36a838aef 100644
--- a/audio/audacity/PLIST
+++ b/audio/audacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2019/06/04 23:09:51 nia Exp $
+@comment $NetBSD: PLIST,v 1.16 2019/10/26 17:22:08 nia Exp $
bin/audacity
lib/libFileDialog.so.0
man/man1/audacity.1
@@ -92,61 +92,61 @@ share/icons/hicolor/24x24/apps/audacity.png
share/icons/hicolor/32x32/apps/audacity.png
share/icons/hicolor/48x48/apps/audacity.png
share/icons/hicolor/scalable/apps/audacity.svg
-${PLIST.nls}share/locale/af/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ar/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/be/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/bg/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/bn/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/bs/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ca/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/cs/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/cy/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/da/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/de/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/el/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/es/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/eu/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/eu_ES/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/fa/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/fi/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/fr/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ga/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/gl/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/he/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/hi/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/hr/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/hu/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/hy/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/id/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/it/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ja/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ka/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/km/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ko/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/lt/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/mk/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/my/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/nb/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/nl/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/oc/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/pl/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/pt_PT/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ro/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ru/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/sk/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/sl/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/sr_RS/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/sv/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/ta/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/tg/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/tr/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/uk/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/vi/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/audacity.mo
-${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/audacity.mo
+share/locale/af/LC_MESSAGES/audacity.mo
+share/locale/ar/LC_MESSAGES/audacity.mo
+share/locale/be/LC_MESSAGES/audacity.mo
+share/locale/bg/LC_MESSAGES/audacity.mo
+share/locale/bn/LC_MESSAGES/audacity.mo
+share/locale/bs/LC_MESSAGES/audacity.mo
+share/locale/ca/LC_MESSAGES/audacity.mo
+share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
+share/locale/cs/LC_MESSAGES/audacity.mo
+share/locale/cy/LC_MESSAGES/audacity.mo
+share/locale/da/LC_MESSAGES/audacity.mo
+share/locale/de/LC_MESSAGES/audacity.mo
+share/locale/el/LC_MESSAGES/audacity.mo
+share/locale/es/LC_MESSAGES/audacity.mo
+share/locale/eu/LC_MESSAGES/audacity.mo
+share/locale/eu_ES/LC_MESSAGES/audacity.mo
+share/locale/fa/LC_MESSAGES/audacity.mo
+share/locale/fi/LC_MESSAGES/audacity.mo
+share/locale/fr/LC_MESSAGES/audacity.mo
+share/locale/ga/LC_MESSAGES/audacity.mo
+share/locale/gl/LC_MESSAGES/audacity.mo
+share/locale/he/LC_MESSAGES/audacity.mo
+share/locale/hi/LC_MESSAGES/audacity.mo
+share/locale/hr/LC_MESSAGES/audacity.mo
+share/locale/hu/LC_MESSAGES/audacity.mo
+share/locale/hy/LC_MESSAGES/audacity.mo
+share/locale/id/LC_MESSAGES/audacity.mo
+share/locale/it/LC_MESSAGES/audacity.mo
+share/locale/ja/LC_MESSAGES/audacity.mo
+share/locale/ka/LC_MESSAGES/audacity.mo
+share/locale/km/LC_MESSAGES/audacity.mo
+share/locale/ko/LC_MESSAGES/audacity.mo
+share/locale/lt/LC_MESSAGES/audacity.mo
+share/locale/mk/LC_MESSAGES/audacity.mo
+share/locale/my/LC_MESSAGES/audacity.mo
+share/locale/nb/LC_MESSAGES/audacity.mo
+share/locale/nl/LC_MESSAGES/audacity.mo
+share/locale/oc/LC_MESSAGES/audacity.mo
+share/locale/pl/LC_MESSAGES/audacity.mo
+share/locale/pt_BR/LC_MESSAGES/audacity.mo
+share/locale/pt_PT/LC_MESSAGES/audacity.mo
+share/locale/ro/LC_MESSAGES/audacity.mo
+share/locale/ru/LC_MESSAGES/audacity.mo
+share/locale/sk/LC_MESSAGES/audacity.mo
+share/locale/sl/LC_MESSAGES/audacity.mo
+share/locale/sr_RS/LC_MESSAGES/audacity.mo
+share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo
+share/locale/sv/LC_MESSAGES/audacity.mo
+share/locale/ta/LC_MESSAGES/audacity.mo
+share/locale/tg/LC_MESSAGES/audacity.mo
+share/locale/tr/LC_MESSAGES/audacity.mo
+share/locale/uk/LC_MESSAGES/audacity.mo
+share/locale/vi/LC_MESSAGES/audacity.mo
+share/locale/zh_CN/LC_MESSAGES/audacity.mo
+share/locale/zh_TW/LC_MESSAGES/audacity.mo
share/mime/packages/audacity.xml
share/pixmaps/audacity.xpm
share/pixmaps/audacity16.xpm
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index 5c3ac3cf405..9cc65fe234a 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2019/06/04 23:09:51 nia Exp $
+$NetBSD: distinfo,v 1.39 2019/10/26 17:22:08 nia Exp $
SHA1 (audacity-2.3.2.tar.gz) = b91b88aa68521a03fa5cc7dacaf5eb39f92e3b6f
RMD160 (audacity-2.3.2.tar.gz) = 8bf05565f6a4afd464670b2e6fb5ed261a886ef2
@@ -12,7 +12,6 @@ SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = 03d080c141259fbf02a9c5a70ce0
SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = dbc0b5b88043c7b2895742e78e6a5990f65012ef
SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = 2d4558f059d86633a1fcdda22ef0c914758b35a0
-SHA1 (patch-lib-src_portaudio-v19_Makefile.in) = 9e86fbd93d322322b8416ef6b43ba5c98141c986
SHA1 (patch-lib-src_portmixer_src-extra_Makefile.am) = 9a0d5be37753683a2cade42673edb3d08e01ab4d
SHA1 (patch-lib-src_sbsms_src-extra_Makefile.am) = 2beca18a286de1b26f4f96976fb58e1665d0531c
SHA1 (patch-src_AudioIO.cpp) = 1b44c68c4233b24a5fa4e17515eb237fee0e283a
diff --git a/audio/audacity/options.mk b/audio/audacity/options.mk
deleted file mode 100644
index 183da39452d..00000000000
--- a/audio/audacity/options.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2019/06/04 23:09:51 nia Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.audacity
-PKG_SUPPORTED_OPTIONS= debug jack ladspa mad nls
-PKG_SUGGESTED_OPTIONS+= ladspa nls
-PLIST_VARS+= nls
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+= --enable-debug=yes
-.else
-CONFIGURE_ARGS+= --enable-debug=no
-.endif
-
-# for internal portaudio...
-.if !empty(PKG_OPTIONS:Mjack)
-CONFIGURE_ARGS+= --with-jack
-.include "../../audio/jack/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-jack
-.endif
-
-# libmad is disabled by default because it's been unmaintained
-# since 2004 and is a pile of CVEs.
-.if !empty(PKG_OPTIONS:Mmad)
-CONFIGURE_ARGS+= --with-libmad
-.include "../../audio/libmad/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --with-libmad=no
-.endif
-
-.if !empty(PKG_OPTIONS:Mladspa)
-.include "../../audio/ladspa/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-ladspa=yes
-.else
-CONFIGURE_ARGS+= --enable-ladspa=no
-.endif
-
-.if !empty(PKG_OPTIONS:Mnls)
-.include "../../devel/gettext-lib/buildlink3.mk"
-PLIST.nls= yes
-.else
-CONFIGURE_ARGS+= --disable-nls
-.endif
diff --git a/audio/audacity/patches/patch-lib-src_portaudio-v19_Makefile.in b/audio/audacity/patches/patch-lib-src_portaudio-v19_Makefile.in
deleted file mode 100644
index ccc9ef28f34..00000000000
--- a/audio/audacity/patches/patch-lib-src_portaudio-v19_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-lib-src_portaudio-v19_Makefile.in,v 1.1 2015/09/29 04:49:55 mrg Exp $
-
-force static library build.
-
---- lib-src/portaudio-v19/Makefile.in.orig 2015-03-01 17:07:00.000000000 -0800
-+++ lib-src/portaudio-v19/Makefile.in 2015-09-28 17:57:01.000000000 -0700
-@@ -43,9 +43,7 @@
- PALIB = libportaudio.la
- PAINC = include/portaudio.h
-
--PA_LDFLAGS = $(LDFLAGS) $(SHARED_FLAGS) -rpath $(libdir) -no-undefined \
-- -export-symbols-regex "(Pa|PaMacCore|PaJack|PaAlsa|PaAsio|PaOSS)_.*" \
-- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+PA_LDFLAGS = $(LDFLAGS) -static
-
- COMMON_OBJS = \
- src/common/pa_allocation.o \
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index 9d394a9b499..8271d706da0 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2019/10/20 11:10:49 nia Exp $
+# $NetBSD: Makefile,v 1.25 2019/10/26 17:22:07 nia Exp $
DISTNAME= pa_stable_v190600_20161030
PKGNAME= ${DISTNAME:S/^pa_stable_v/portaudio-/1:S/_/./g}
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.portaudio.com/archives/
EXTRACT_SUFX= .tgz
@@ -27,7 +28,13 @@ CONFIGURE_ARGS+= --enable-cxx
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/portaudio2
CONFIGURE_ARGS+= --disable-mac-universal
+.include "../../mk/oss.buildlink3.mk"
+PLIST_VARS+= oss
+.if ${OSS_TYPE} != "none"
+PLIST.oss= yes
LDFLAGS+= ${LIBOSSAUDIO}
+.endif
+
PKGCONFIG_OVERRIDE= portaudio-2.0.pc.in
WRKSRC= ${WRKDIR}/portaudio
@@ -50,5 +57,4 @@ CFLAGS.Darwin+= -Wno-deprecated-declarations
.include "options.mk"
.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/portaudio/PLIST b/audio/portaudio/PLIST
index 4c95c53a00e..41438a1f35a 100644
--- a/audio/portaudio/PLIST
+++ b/audio/portaudio/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2019/10/20 11:10:49 nia Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/10/26 17:22:07 nia Exp $
${PLIST.alsa}include/portaudio2/pa_linux_alsa.h
+${PLIST.oss}include/portaudio2/pa_unix_oss.h
include/portaudio2/portaudio.h
include/portaudio2/portaudiocpp/AutoSystem.hxx
include/portaudio2/portaudiocpp/BlockingStream.hxx
diff --git a/audio/portaudio/distinfo b/audio/portaudio/distinfo
index 57c5be29d64..45ffddb9bff 100644
--- a/audio/portaudio/distinfo
+++ b/audio/portaudio/distinfo
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.17 2019/10/20 11:10:49 nia Exp $
+$NetBSD: distinfo,v 1.18 2019/10/26 17:22:07 nia Exp $
SHA1 (pa_stable_v190600_20161030.tgz) = 56c596bba820d90df7d057d8f6a0ec6bf9ab82e8
RMD160 (pa_stable_v190600_20161030.tgz) = e6e5cd3f3cb7469aa17549c189e445d573567e13
SHA512 (pa_stable_v190600_20161030.tgz) = 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
Size (pa_stable_v190600_20161030.tgz) = 1450572 bytes
-SHA1 (patch-src_hostapi_alsa_pa__linux__alsa.c) = b83c77d1dd23ab16f940dc11228bee3460d2a58b
-SHA1 (patch-src_hostapi_oss_pa__unix__oss.c) = 81b6633bdb1cac8d3397bd7ebb6da1e28b68e3df
+SHA1 (patch-configure) = 79c78737a8812adfb9d03dc395f63951d53a440b
+SHA1 (patch-include_pa__unix__oss.h) = 55213cf8dfa4f81b8be23c912deddd8cc8b8117f
+SHA1 (patch-include_portaudio.h) = fc5ea598b2e6fc80a0e106a400ffab521ea3cf4e
+SHA1 (patch-src_common_pa__front.c) = cdddb6f537f803b55873ad6bfa936a6bff47556d
+SHA1 (patch-src_common_pa__stream.c) = 58e6ab2a61957208973a59be2f1140abc922f360
+SHA1 (patch-src_common_pa__stream.h) = 94781a9ae79ea1340eea8caadc106416c019cf74
+SHA1 (patch-src_hostapi_alsa_pa__linux__alsa.c) = 6ddbeca36be30153f9c6c316c2fb78c06bbbf05d
+SHA1 (patch-src_hostapi_oss_pa__unix__oss.c) = 5652426814a3fc82ed802d8082a74aa460c822ca
diff --git a/audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c b/audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c
index 607c4722963..92881b57f45 100644
--- a/audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c
+++ b/audio/portaudio/patches/patch-src_hostapi_alsa_pa__linux__alsa.c
@@ -1,7 +1,9 @@
-$NetBSD: patch-src_hostapi_alsa_pa__linux__alsa.c,v 1.1 2019/10/20 11:10:49 nia Exp $
+$NetBSD: patch-src_hostapi_alsa_pa__linux__alsa.c,v 1.2 2019/10/26 17:22:08 nia Exp $
Support building on non-Linux systems.
+Add features needed to make portmixer work with audacity.
+
--- src/hostapi/alsa/pa_linux_alsa.c.orig 2016-10-30 01:23:04.000000000 +0000
+++ src/hostapi/alsa/pa_linux_alsa.c
@@ -79,6 +79,10 @@
@@ -15,3 +17,51 @@ Support building on non-Linux systems.
/* Add missing define (for compatibility with older ALSA versions) */
#ifndef SND_PCM_TSTAMP_ENABLE
#define SND_PCM_TSTAMP_ENABLE SND_PCM_TSTAMP_MMAP
+@@ -621,6 +625,7 @@ typedef struct
+ StreamDirection streamDir;
+
+ snd_pcm_channel_area_t *channelAreas; /* Needed for channel adaption */
++ int card;
+ } PaAlsaStreamComponent;
+
+ /* Implementation specific stream structure */
+@@ -1873,6 +1878,7 @@ static PaError PaAlsaStreamComponent_Ini
+ {
+ PaError result = paNoError;
+ PaSampleFormat userSampleFormat = params->sampleFormat, hostSampleFormat = paNoError;
++ snd_pcm_info_t* pcmInfo;
+ assert( params->channelCount > 0 );
+
+ /* Make sure things have an initial value */
+@@ -1900,6 +1906,9 @@ static PaError PaAlsaStreamComponent_Ini
+ self->device = params->device;
+
+ PA_ENSURE( AlsaOpen( &alsaApi->baseHostApiRep, params, streamDir, &self->pcm ) );
++
++ snd_pcm_info_alloca( &pcmInfo );
++ self->card = snd_pcm_info_get_card( pcmInfo );
+ self->nfds = alsa_snd_pcm_poll_descriptors_count( self->pcm );
+
+ PA_ENSURE( hostSampleFormat = PaUtil_SelectClosestAvailableFormat( GetAvailableFormats( self->pcm ), userSampleFormat ) );
+@@ -4605,9 +4614,7 @@ PaError PaAlsa_GetStreamInputCard( PaStr
+ /* XXX: More descriptive error? */
+ PA_UNLESS( stream->capture.pcm, paDeviceUnavailable );
+
+- alsa_snd_pcm_info_alloca( &pcmInfo );
+- PA_ENSURE( alsa_snd_pcm_info( stream->capture.pcm, pcmInfo ) );
+- *card = alsa_snd_pcm_info_get_card( pcmInfo );
++ *card = stream->capture.card;
+
+ error:
+ return result;
+@@ -4624,9 +4631,7 @@ PaError PaAlsa_GetStreamOutputCard( PaSt
+ /* XXX: More descriptive error? */
+ PA_UNLESS( stream->playback.pcm, paDeviceUnavailable );
+
+- alsa_snd_pcm_info_alloca( &pcmInfo );
+- PA_ENSURE( alsa_snd_pcm_info( stream->playback.pcm, pcmInfo ) );
+- *card = alsa_snd_pcm_info_get_card( pcmInfo );
++ *card = stream->playback.card;
+
+ error:
+ return result;
diff --git a/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c b/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c
index bf4377acae2..5ab5efb730c 100644
--- a/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c
+++ b/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c
@@ -1,17 +1,19 @@
-$NetBSD: patch-src_hostapi_oss_pa__unix__oss.c,v 1.1 2019/10/20 11:10:49 nia Exp $
+$NetBSD: patch-src_hostapi_oss_pa__unix__oss.c,v 1.2 2019/10/26 17:22:08 nia Exp $
Don't write an endless stream of silence when preparing the stream.
+Add features needed to make portmixer work with audacity.
+
--- src/hostapi/oss/pa_unix_oss.c.orig 2016-10-30 01:23:04.000000000 +0000
+++ src/hostapi/oss/pa_unix_oss.c
-@@ -1479,6 +1479,7 @@ static PaError PaOssStream_Prepare( PaOs
+@@ -1477,6 +1477,7 @@ static PaError PaOssStream_Prepare( PaOs
+ size_t bufSz = PaOssStreamComponent_BufferSize( stream->playback );
+ memset( stream->playback->buffer, 0, bufSz );
++#ifndef __NetBSD__
/* Looks like we have to turn off blocking before we try this, but if we don't fill the buffer
* OSS will complain. */
-+#ifndef __NetBSD__
PA_ENSURE( ModifyBlocking( stream->playback->fd, 0 ) );
- while (1)
- {
@@ -1486,6 +1487,7 @@ static PaError PaOssStream_Prepare( PaOs
break;
}
@@ -20,3 +22,30 @@ Don't write an endless stream of silence when preparing the stream.
}
if( stream->sharedDevice )
+@@ -2043,3 +2045,26 @@ error:
+ #endif
+ }
+
++const char *PaOSS_GetStreamInputDevice( PaStream* s )
++{
++ PaOssStream *stream = (PaOssStream*)s;
++
++ if( stream->capture )
++ {
++ return stream->capture->devName;
++ }
++
++ return NULL;
++}
++
++const char *PaOSS_GetStreamOutputDevice( PaStream* s )
++{
++ PaOssStream *stream = (PaOssStream*)s;
++
++ if( stream->playback )
++ {
++ return stream->playback->devName;
++ }
++
++ return NULL;
++}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 18:09:11 +0000