portaudio-devel: Support C++ bindings, ALSA, JACK.

Bump PKGREVISION.

6 files changed, 82 insertions, 14 deletions

diff --git a/audio/portaudio-devel/Makefile b/audio/portaudio-devel/Makefile
index 8b67e11872c..479d534fc1b 100644
--- a/audio/portaudio-devel/Makefile
+++ b/audio/portaudio-devel/Makefile
@@ -1,26 +1,30 @@
-# $NetBSD: Makefile,v 1.13 2017/04/27 07:14:01 nat Exp $
+# $NetBSD: Makefile,v 1.14 2019/10/16 12:50:27 nia Exp $
 
 DISTNAME=	pa_stable_v190600_20161030
 PKGNAME=	portaudio-devel-20161030
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.portaudio.com/archives/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.portaudio.com/
-COMMENT=	Portable cross-platform Audio API
+COMMENT=	Portable cross-platform audio API
 LICENSE=	mit
 
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	gmake pkg-config
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+
+GNU_CONFIGURE_LIBSUBDIR=	portaudio2
+
 NOT_FOR_PLATFORM=	Interix-*-*
 
-USE_TOOLS+=		gmake pkg-config
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-GNU_CONFIGURE_LIBSUBDIR=portaudio2
+CONFIGURE_ARGS+=	--enable-cxx
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/portaudio2
-CONFIGURE_ARGS+=	--without-alsa
 CONFIGURE_ARGS+=	--disable-mac-universal
+
 LDFLAGS+=		${LIBOSSAUDIO}
 PKGCONFIG_OVERRIDE=	portaudio-2.0.pc.in
 WRKSRC=			${WRKDIR}/portaudio
@@ -37,11 +41,12 @@ SUBST_SED.pthread+=	-e 's/-lpthread/${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}/g'
 SUBST_CLASSES+=		pc
 SUBST_STAGE.pc=		pre-configure
 SUBST_MESSAGE.pc=	Fixing pkgconfig directory
-SUBST_FILES.pc=		Makefile.in
+SUBST_FILES.pc=		Makefile.in bindings/cpp/Makefile.in
 SUBST_SED.pc=		-e 's/$$(libdir)\/pkgconfig/$$(prefix)\/lib\/pkgconfig/g'
 
 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-devel/PLIST b/audio/portaudio-devel/PLIST
index ef102baf4d2..d45ec1247ea 100644
--- a/audio/portaudio-devel/PLIST
+++ b/audio/portaudio-devel/PLIST
@@ -1,4 +1,26 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:32:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/10/16 12:50:27 nia Exp $
+${PLIST.alsa}include/portaudio2/pa_linux_alsa.h
 include/portaudio2/portaudio.h
+include/portaudio2/portaudiocpp/AutoSystem.hxx
+include/portaudio2/portaudiocpp/BlockingStream.hxx
+include/portaudio2/portaudiocpp/CFunCallbackStream.hxx
+include/portaudio2/portaudiocpp/CallbackInterface.hxx
+include/portaudio2/portaudiocpp/CallbackStream.hxx
+include/portaudio2/portaudiocpp/CppFunCallbackStream.hxx
+include/portaudio2/portaudiocpp/Device.hxx
+include/portaudio2/portaudiocpp/DirectionSpecificStreamParameters.hxx
+include/portaudio2/portaudiocpp/Exception.hxx
+include/portaudio2/portaudiocpp/HostApi.hxx
+include/portaudio2/portaudiocpp/InterfaceCallbackStream.hxx
+include/portaudio2/portaudiocpp/MemFunCallbackStream.hxx
+include/portaudio2/portaudiocpp/PortAudioCpp.hxx
+include/portaudio2/portaudiocpp/SampleDataFormat.hxx
+include/portaudio2/portaudiocpp/Stream.hxx
+include/portaudio2/portaudiocpp/StreamParameters.hxx
+include/portaudio2/portaudiocpp/System.hxx
+include/portaudio2/portaudiocpp/SystemDeviceIterator.hxx
+include/portaudio2/portaudiocpp/SystemHostApiIterator.hxx
 lib/pkgconfig/portaudio-2.0.pc
+lib/pkgconfig/portaudiocpp.pc
 lib/portaudio2/libportaudio.la
+lib/portaudio2/libportaudiocpp.la
diff --git a/audio/portaudio-devel/buildlink3.mk b/audio/portaudio-devel/buildlink3.mk
index a22d05422ca..45af721286a 100644
--- a/audio/portaudio-devel/buildlink3.mk
+++ b/audio/portaudio-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2019/10/16 12:50:27 nia Exp $
 
 BUILDLINK_TREE+=	portaudio-devel
 
@@ -8,8 +8,8 @@ PORTAUDIO_DEVEL_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.portaudio-devel+=	portaudio-devel>=20060521
 BUILDLINK_PKGSRCDIR.portaudio-devel?=	../../audio/portaudio-devel
 BUILDLINK_INCDIRS.portaudio-devel?=	include/portaudio2
-BUILDLINK_LIBDIRS.portaudio-devel?=	lib/portaudio2
-BUILDLINK_CPPFLAGS.portaudio-devel?=	-I${BUILDLINK_PREFIX.portaudio-devel}/include/portaudio2
+BUILDLINK_LIBDIRS.portaudio-devel+=	lib/portaudio2
+BUILDLINK_CPPFLAGS.portaudio-devel+=	-I${BUILDLINK_PREFIX.portaudio-devel}/include/portaudio2
 .endif # PORTAUDIO_DEVEL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-portaudio-devel
diff --git a/audio/portaudio-devel/distinfo b/audio/portaudio-devel/distinfo
index f2c8b1a81c1..58798982383 100644
--- a/audio/portaudio-devel/distinfo
+++ b/audio/portaudio-devel/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2017/04/27 07:14:01 nat Exp $
+$NetBSD: distinfo,v 1.11 2019/10/16 12:50:27 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
diff --git a/audio/portaudio-devel/options.mk b/audio/portaudio-devel/options.mk
new file mode 100644
index 00000000000..b61501a902e
--- /dev/null
+++ b/audio/portaudio-devel/options.mk
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2019/10/16 12:50:27 nia Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.portaudio
+PKG_SUPPORTED_OPTIONS=		alsa jack
+PKG_SUGGESTED_OPTIONS.Linux=	alsa
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		alsa
+.if !empty(PKG_OPTIONS:Malsa)
+PLIST.alsa=		yes
+CONFIGURE_ARGS+=	--with-alsa
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-alsa
+.endif
+
+.if !empty(PKG_OPTIONS:Mjack)
+CONFIGURE_ARGS+=	--with-jack
+.include "../../audio/jack/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-jack
+.endif
diff --git a/audio/portaudio-devel/patches/patch-src_hostapi_alsa_pa__linux__alsa.c b/audio/portaudio-devel/patches/patch-src_hostapi_alsa_pa__linux__alsa.c
new file mode 100644
index 00000000000..09f35aa8807
--- /dev/null
+++ b/audio/portaudio-devel/patches/patch-src_hostapi_alsa_pa__linux__alsa.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_hostapi_alsa_pa__linux__alsa.c,v 1.1 2019/10/16 12:50:27 nia Exp $
+
+Support building on non-Linux systems.
+
+--- 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 @@
+ 
+ #include "pa_linux_alsa.h"
+ 
++#ifndef ESTRPIPE
++    #define ESTRPIPE EPIPE
++#endif
++
+ /* Add missing define (for compatibility with older ALSA versions) */
+ #ifndef SND_PCM_TSTAMP_ENABLE
+     #define SND_PCM_TSTAMP_ENABLE SND_PCM_TSTAMP_MMAP