CVS commit: pkgsrc/audio/portaudio-devel

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Oct 16 12:50:28 UTC 2019

Modified Files:
        pkgsrc/audio/portaudio-devel: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/audio/portaudio-devel: options.mk
        pkgsrc/audio/portaudio-devel/patches:
            patch-src_hostapi_alsa_pa__linux__alsa.c

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

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/portaudio-devel/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/portaudio-devel/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/portaudio-devel/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/portaudio-devel/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/portaudio-devel/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/portaudio-devel/patches/patch-src_hostapi_alsa_pa__linux__alsa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/portaudio-devel/Makefile
diff -u pkgsrc/audio/portaudio-devel/Makefile:1.13 pkgsrc/audio/portaudio-devel/Makefile:1.14
--- pkgsrc/audio/portaudio-devel/Makefile:1.13  Thu Apr 27 07:14:01 2017
+++ pkgsrc/audio/portaudio-devel/Makefile       Wed Oct 16 12:50:27 2019
@@ -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@localhost
 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/${PT
 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"

Index: pkgsrc/audio/portaudio-devel/PLIST
diff -u pkgsrc/audio/portaudio-devel/PLIST:1.3 pkgsrc/audio/portaudio-devel/PLIST:1.4
--- pkgsrc/audio/portaudio-devel/PLIST:1.3      Sun Jun 14 17:32:20 2009
+++ pkgsrc/audio/portaudio-devel/PLIST  Wed Oct 16 12:50:27 2019
@@ -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

Index: pkgsrc/audio/portaudio-devel/buildlink3.mk
diff -u pkgsrc/audio/portaudio-devel/buildlink3.mk:1.4 pkgsrc/audio/portaudio-devel/buildlink3.mk:1.5
--- pkgsrc/audio/portaudio-devel/buildlink3.mk:1.4      Fri Mar 20 19:23:58 2009
+++ pkgsrc/audio/portaudio-devel/buildlink3.mk  Wed Oct 16 12:50:27 2019
@@ -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

Index: pkgsrc/audio/portaudio-devel/distinfo
diff -u pkgsrc/audio/portaudio-devel/distinfo:1.10 pkgsrc/audio/portaudio-devel/distinfo:1.11
--- pkgsrc/audio/portaudio-devel/distinfo:1.10  Thu Apr 27 07:14:01 2017
+++ pkgsrc/audio/portaudio-devel/distinfo       Wed Oct 16 12:50:27 2019
@@ -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

Added files:

Index: pkgsrc/audio/portaudio-devel/options.mk
diff -u /dev/null pkgsrc/audio/portaudio-devel/options.mk:1.1
--- /dev/null   Wed Oct 16 12:50:28 2019
+++ pkgsrc/audio/portaudio-devel/options.mk     Wed Oct 16 12:50:27 2019
@@ -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

Index: pkgsrc/audio/portaudio-devel/patches/patch-src_hostapi_alsa_pa__linux__alsa.c
diff -u /dev/null pkgsrc/audio/portaudio-devel/patches/patch-src_hostapi_alsa_pa__linux__alsa.c:1.1
--- /dev/null   Wed Oct 16 12:50:28 2019
+++ pkgsrc/audio/portaudio-devel/patches/patch-src_hostapi_alsa_pa__linux__alsa.c       Wed Oct 16 12:50:27 2019
@@ -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