Attachment #228816 for bug #259255





GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-dependency-tracking \
		--enable-cxx
		--without-alsa
MAKE_ARGS=	EXAMPLES=""

MAKE_JOBS_UNSAFE=	yes

PORTDOCS=	*
PORTEXAMPLES=	*

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





$OpenBSD: patch-configure_in,v 1.4 2014/09/13 04:56:28 bentley Exp $
--- 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@:>@]),

 have_asihpi=no
 if test "x$with_asihpi" != "xno"; then
     AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
@@ -406,6 +414,13 @@ case "${host_os}" in
            AC_DEFINE(PA_USE_ALSA,1)
         fi
 

         if [[ "$have_jack" = "yes" ] && [ "$with_jack" != "no" ]] ; then
            DLL_LIBS="$DLL_LIBS $JACK_LIBS"
            CFLAGS="$CFLAGS $JACK_CFLAGS"
@@ -509,6 +524,8 @@ case "$target_os" in
         ;;
      *)
 	AC_MSG_RESULT([
+  Sndio ....................... $have_sndio
+  ALSA ........................ $have_alsa
   OSS ......................... $have_oss
   JACK ........................ $have_jack
 ])

Lines 1-7 Link Here

(-)audio/portaudio/files/patch-include_portaudio.h (-3 / +3 lines)
1	$OpenBSD: patch-include_portaudio_h,v 1.2 2013/03/12 00:59:50 brad Exp $	1	$OpenBSD: patch-include_portaudio_h,v 1.2 2013/03/12 00:59:50 brad Exp $
2	--- include/portaudio.h.orig 2018-07-17 06:55:08 UTC	2	--- include/portaudio.h.orig 2016-10-30 01:23:04 UTC
3	+++ include/portaudio.h	3	+++ include/portaudio.h
4	@@ -236,7 +236,8 @@ typedef enum PaHostApiTypeId	4	@@ -287,7 +287,8 @@ typedef enum PaHostApiTypeId
5	paWDMKS=11,	5	paWDMKS=11,
6	paJACK=12,	6	paJACK=12,
7	paWASAPI=13,	7	paWASAPI=13,
Lines 11-17 $OpenBSD: patch-include_portaudio_h,v 1.2 2013/03/12 00:59:50 brad Exp $ Link Here
11	} PaHostApiTypeId;	11	} PaHostApiTypeId;
12		12
13		13
14	@@ -1144,6 +1145,15 @@ signed long Pa_GetStreamReadAvailable( PaStream* strea	14	@@ -1195,6 +1196,15 @@ signed long Pa_GetStreamReadAvailable( PaStream* strea
15	error is encountered.	15	error is encountered.
16	*/	16	*/
17	signed long Pa_GetStreamWriteAvailable( PaStream* stream );	17	signed long Pa_GetStreamWriteAvailable( PaStream* stream );

Lines 1-6 Link Here

(-)audio/portaudio/files/patch-src_common_pa__front.c (-3 / +3 lines)
1	--- src/common/pa_front.c.orig 2018-07-17 06:44:39 UTC	1	--- src/common/pa_front.c.orig 2016-10-30 01:23:04 UTC
2	+++ src/common/pa_front.c	2	+++ src/common/pa_front.c
3	@@ -1216,8 +1216,10 @@ PaError Pa_OpenStream( PaStream** stream,	3	@@ -1257,8 +1257,10 @@ PaError Pa_OpenStream( PaStream** stream,
4	hostApiInputParametersPtr, hostApiOutputParametersPtr,	4	hostApiInputParametersPtr, hostApiOutputParametersPtr,
5	sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );	5	sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );
6		6
Lines 12-18 Link Here
12		12
13		13
14	PA_LOGAPI(("Pa_OpenStream returned:\n" ));	14	PA_LOGAPI(("Pa_OpenStream returned:\n" ));
15	@@ -1729,6 +1731,32 @@ signed long Pa_GetStreamWriteAvailable( PaStream* stre	15	@@ -1770,6 +1772,32 @@ signed long Pa_GetStreamWriteAvailable( PaStream* stre
16	return result;	16	return result;
17	}	17	}
18		18

Lines 32-37 Link Here

(-)audio/portaudio/pkg-plist (+1 lines)
32	%%PATEST%%bin/patest_underflow	32	%%PATEST%%bin/patest_underflow
33	%%PATEST%%bin/patest_wire	33	%%PATEST%%bin/patest_wire
34	%%JACK%%include/pa_jack.h	34	%%JACK%%include/pa_jack.h
		35	%%ALSA%%include/pa_linux_alsa.h
35	include/pa_unix_oss.h	36	include/pa_unix_oss.h
36	include/portaudio.h	37	include/portaudio.h
37	include/portaudiocpp/AutoSystem.hxx	38	include/portaudiocpp/AutoSystem.hxx

Return to bug 259255

Lines 21-28 CPE_VENDOR= portaudio_project Link Here

(-)audio/portaudio/Makefile (-3 / +5 lines)
21		21
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --disable-dependency-tracking \	23	CONFIGURE_ARGS= --disable-dependency-tracking \
24	--enable-cxx \	24	--enable-cxx
25	--without-alsa
26	MAKE_ARGS= EXAMPLES=""	25	MAKE_ARGS= EXAMPLES=""
27		26
28	MAKE_JOBS_UNSAFE= yes	27	MAKE_JOBS_UNSAFE= yes
Lines 32-42 WRKSRC= ${WRKDIR}/${PORTNAME} Link Here
32	PORTDOCS= *	31	PORTDOCS= *
33	PORTEXAMPLES= *	32	PORTEXAMPLES= *
34		33
35	OPTIONS_DEFINE= DOCS DOXYGEN EXAMPLES JACK PATEST SNDIO	34	OPTIONS_DEFINE= ALSA DOCS DOXYGEN EXAMPLES JACK PATEST SNDIO
36	OPTIONS_SUB= yes	35	OPTIONS_SUB= yes
37		36
38	PATEST_DESC= PortAudio Test Programs	37	PATEST_DESC= PortAudio Test Programs
39		38
		39	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
		40	ALSA_CONFIGURE_WITH= alsa
		41
40	DOXYGEN_IMPLIES= DOCS	42	DOXYGEN_IMPLIES= DOCS
41	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen	43	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
42		44

Lines 1-5 Link Here

(-)audio/portaudio/files/patch-configure.in (-3 / +4 lines)
1	$OpenBSD: patch-configure_in,v 1.4 2014/09/13 04:56:28 bentley Exp $	1	$OpenBSD: patch-configure_in,v 1.4 2014/09/13 04:56:28 bentley Exp $
2	--- configure.in.orig 2016-06-22 08:28:31 UTC	2	--- configure.in.orig 2016-10-30 01:23:04 UTC
3	+++ configure.in	3	+++ configure.in
4	@@ -24,6 +24,10 @@ AC_ARG_WITH(alsa,	4	@@ -24,6 +24,10 @@ AC_ARG_WITH(alsa,
5	AS_HELP_STRING([--with-alsa], [Enable support for ALSA @<:@autodetect@:>@]),	5	AS_HELP_STRING([--with-alsa], [Enable support for ALSA @<:@autodetect@:>@]),
Lines 23-29 $OpenBSD: patch-configure_in,v 1.4 2014/09/13 04:56:28 bentley Exp $ Link Here
23	have_asihpi=no	23	have_asihpi=no
24	if test "x$with_asihpi" != "xno"; then	24	if test "x$with_asihpi" != "xno"; then
25	AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)	25	AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
26	@@ -397,6 +405,13 @@ case "${host_os}" in	26	@@ -406,6 +414,13 @@ case "${host_os}" in
27	AC_DEFINE(PA_USE_ALSA,1)	27	AC_DEFINE(PA_USE_ALSA,1)
28	fi	28	fi
29		29
Lines 37-47 $OpenBSD: patch-configure_in,v 1.4 2014/09/13 04:56:28 bentley Exp $ Link Here
37	if [[ "$have_jack" = "yes" ] && [ "$with_jack" != "no" ]] ; then	37	if [[ "$have_jack" = "yes" ] && [ "$with_jack" != "no" ]] ; then
38	DLL_LIBS="$DLL_LIBS $JACK_LIBS"	38	DLL_LIBS="$DLL_LIBS $JACK_LIBS"
39	CFLAGS="$CFLAGS $JACK_CFLAGS"	39	CFLAGS="$CFLAGS $JACK_CFLAGS"
40	@@ -500,6 +515,7 @@ case "$target_os" in	40	@@ -509,6 +524,8 @@ case "$target_os" in
41	;;	41	;;
42	*)	42	*)
43	AC_MSG_RESULT([	43	AC_MSG_RESULT([
44	+ Sndio ....................... $have_sndio	44	+ Sndio ....................... $have_sndio
		45	+ ALSA ........................ $have_alsa
45	OSS ......................... $have_oss	46	OSS ......................... $have_oss
46	JACK ........................ $have_jack	47	JACK ........................ $have_jack
47	])	48	])