--- audio/portaudio/Makefile +++ audio/portaudio/Makefile @@ -21,8 +21,7 @@ CPE_VENDOR= portaudio_project GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking \ - --enable-cxx \ - --without-alsa + --enable-cxx MAKE_ARGS= EXAMPLES="" MAKE_JOBS_UNSAFE= yes @@ -32,11 +31,14 @@ WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= * PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS DOXYGEN EXAMPLES JACK PATEST SNDIO +OPTIONS_DEFINE= ALSA DOCS DOXYGEN EXAMPLES JACK PATEST SNDIO OPTIONS_SUB= yes PATEST_DESC= PortAudio Test Programs +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_CONFIGURE_WITH= alsa + DOXYGEN_IMPLIES= DOCS DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen --- audio/portaudio/files/patch-configure.in +++ audio/portaudio/files/patch-configure.in @@ -1,5 +1,5 @@ $OpenBSD: patch-configure_in,v 1.4 2014/09/13 04:56:28 bentley Exp $ ---- configure.in.orig 2016-06-22 08:28:31 UTC +--- configure.in.orig 2016-10-30 01:23:04 UTC +++ configure.in @@ -24,6 +24,10 @@ AC_ARG_WITH(alsa, AS_HELP_STRING([--with-alsa], [Enable support for ALSA @<:@autodetect@:>@]), @@ -23,7 +23,7 @@ $OpenBSD: patch-configure_in,v 1.4 2014/09/13 04:56:28 bentley Exp $ have_asihpi=no if test "x$with_asihpi" != "xno"; then AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm) -@@ -397,6 +405,13 @@ case "${host_os}" in +@@ -406,6 +414,13 @@ case "${host_os}" in AC_DEFINE(PA_USE_ALSA,1) fi @@ -37,11 +37,12 @@ $OpenBSD: patch-configure_in,v 1.4 2014/09/13 04:56:28 bentley Exp $ if [[ "$have_jack" = "yes" ] && [ "$with_jack" != "no" ]] ; then DLL_LIBS="$DLL_LIBS $JACK_LIBS" CFLAGS="$CFLAGS $JACK_CFLAGS" -@@ -500,6 +515,7 @@ case "$target_os" in +@@ -509,6 +524,8 @@ case "$target_os" in ;; *) AC_MSG_RESULT([ + Sndio ....................... $have_sndio ++ ALSA ........................ $have_alsa OSS ......................... $have_oss JACK ........................ $have_jack ]) --- audio/portaudio/files/patch-include_portaudio.h +++ audio/portaudio/files/patch-include_portaudio.h @@ -1,7 +1,7 @@ $OpenBSD: patch-include_portaudio_h,v 1.2 2013/03/12 00:59:50 brad Exp $ ---- include/portaudio.h.orig 2018-07-17 06:55:08 UTC +--- include/portaudio.h.orig 2016-10-30 01:23:04 UTC +++ include/portaudio.h -@@ -236,7 +236,8 @@ typedef enum PaHostApiTypeId +@@ -287,7 +287,8 @@ typedef enum PaHostApiTypeId paWDMKS=11, paJACK=12, paWASAPI=13, @@ -11,7 +11,7 @@ $OpenBSD: patch-include_portaudio_h,v 1.2 2013/03/12 00:59:50 brad Exp $ } PaHostApiTypeId; -@@ -1144,6 +1145,15 @@ signed long Pa_GetStreamReadAvailable( PaStream* strea +@@ -1195,6 +1196,15 @@ signed long Pa_GetStreamReadAvailable( PaStream* strea error is encountered. */ signed long Pa_GetStreamWriteAvailable( PaStream* stream ); --- audio/portaudio/files/patch-src_common_pa__front.c +++ audio/portaudio/files/patch-src_common_pa__front.c @@ -1,6 +1,6 @@ ---- src/common/pa_front.c.orig 2018-07-17 06:44:39 UTC +--- src/common/pa_front.c.orig 2016-10-30 01:23:04 UTC +++ src/common/pa_front.c -@@ -1216,8 +1216,10 @@ PaError Pa_OpenStream( PaStream** stream, +@@ -1257,8 +1257,10 @@ PaError Pa_OpenStream( PaStream** stream, hostApiInputParametersPtr, hostApiOutputParametersPtr, sampleRate, framesPerBuffer, streamFlags, streamCallback, userData ); @@ -12,7 +12,7 @@ PA_LOGAPI(("Pa_OpenStream returned:\n" )); -@@ -1729,6 +1731,32 @@ signed long Pa_GetStreamWriteAvailable( PaStream* stre +@@ -1770,6 +1772,32 @@ signed long Pa_GetStreamWriteAvailable( PaStream* stre return result; } --- audio/portaudio/pkg-plist +++ audio/portaudio/pkg-plist @@ -32,6 +32,7 @@ %%PATEST%%bin/patest_underflow %%PATEST%%bin/patest_wire %%JACK%%include/pa_jack.h +%%ALSA%%include/pa_linux_alsa.h include/pa_unix_oss.h include/portaudio.h include/portaudiocpp/AutoSystem.hxx