View | Details | Raw Unified | Return to bug 259255 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-27 / +15 lines)
Lines 1-52 Link Here
1
PORTNAME=	portaudio
1
PORTNAME=	portaudio
2
PORTVERSION=	19.6.0
2
PORTVERSION=	19.7.0
3
PORTREVISION=	7
4
PORTEPOCH=	1
3
PORTEPOCH=	1
5
CATEGORIES=	audio
4
CATEGORIES=	audio
6
MASTER_SITES=	http://www.portaudio.com/archives/
5
MASTER_SITES=	https://files.portaudio.com/archives/
7
DISTNAME=	pa_stable_v190600_20161030
6
DISTNAME=	pa_stable_v190700_20210406
8
7
9
MAINTAINER=	multimedia@FreeBSD.org
8
MAINTAINER=	multimedia@FreeBSD.org
10
COMMENT=	Portable cross-platform Audio API
9
COMMENT=	Portable cross-platform Audio API
11
WWW=		http://www.portaudio.com/
10
WWW=		https://www.portaudio.com/
12
11
13
LICENSE=	MIT
12
LICENSE=	MIT
14
LICENSE_FILE=	${WRKSRC}/LICENSE.txt
13
LICENSE_FILE=	${WRKSRC}/LICENSE.txt
15
14
16
USES=		autoreconf:2.69 cpe dos2unix gmake libtool localbase:ldflags \
15
USES=		autoreconf:2.69 cpe gmake libtool localbase:ldflags pathfix\
17
		pathfix pkgconfig tar:tgz
16
		pkgconfig tar:tgz
18
USE_LDCONFIG=	yes
19
CPE_VENDOR=	portaudio_project
20
17
18
CPE_VENDOR=	portaudio_project
19
USE_LDCONFIG=	yes
21
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
22
CONFIGURE_ARGS=	--disable-dependency-tracking \
21
CONFIGURE_ARGS=	--disable-dependency-tracking --enable-cxx
23
		--enable-cxx \
24
		--without-alsa
25
MAKE_ARGS=	EXAMPLES=""
22
MAKE_ARGS=	EXAMPLES=""
26
27
MAKE_JOBS_UNSAFE=	yes
23
MAKE_JOBS_UNSAFE=	yes
28
24
SUB_FILES=	pkg-message
29
WRKSRC=		${WRKDIR}/${PORTNAME}
25
WRKSRC=		${WRKDIR}/${PORTNAME}
30
31
PORTDOCS=	*
26
PORTDOCS=	*
32
PORTEXAMPLES=	*
27
PORTEXAMPLES=	*
33
28
OPTIONS_DEFINE=	ALSA DOCS DOXYGEN EXAMPLES JACK PATEST SNDIO
34
OPTIONS_DEFINE=	DOCS DOXYGEN EXAMPLES JACK PATEST SNDIO
35
OPTIONS_SUB=	yes
29
OPTIONS_SUB=	yes
36
37
SUB_FILES=	pkg-message
38
39
PATEST_DESC=	PortAudio Test Programs
30
PATEST_DESC=	PortAudio Test Programs
40
31
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
32
ALSA_CONFIGURE_WITH=	alsa
41
DOXYGEN_IMPLIES=	DOCS
33
DOXYGEN_IMPLIES=	DOCS
42
DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
34
DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
43
44
JACK_LIB_DEPENDS=	libjack.so:audio/jack
35
JACK_LIB_DEPENDS=	libjack.so:audio/jack
45
JACK_CONFIGURE_WITH=	jack
36
JACK_CONFIGURE_WITH=	jack
46
37
PATEST_MAKE_ARGS_OFF=	SELFTESTS="" TESTS=""
47
PATEST_MAKE_ARGS_OFF=	SELFTESTS="" \
48
			TESTS=""
49
50
SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
38
SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
51
SNDIO_CONFIGURE_WITH=	sndio
39
SNDIO_CONFIGURE_WITH=	sndio
52
40
Lines 61-67 post-install: Link Here
61
49
62
post-install-DOCS-on:
50
post-install-DOCS-on:
63
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
51
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
64
	cd ${WRKSRC} && ${INSTALL_DATA} README.txt index.html ${STAGEDIR}${DOCSDIR}
52
	cd ${WRKSRC} && ${INSTALL_DATA} README.md ${STAGEDIR}${DOCSDIR}
65
53
66
post-install-DOXYGEN-on:
54
post-install-DOXYGEN-on:
67
	@cd ${WRKSRC} && doxygen
55
	@cd ${WRKSRC} && doxygen
(-)./distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1531882553
1
TIMESTAMP = 1698786673
2
SHA256 (pa_stable_v190600_20161030.tgz) = f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513
2
SHA256 (pa_stable_v190700_20210406.tgz) = 47efbf42c77c19a05d22e627d42873e991ec0c1357219c0d74ce6a2948cb2def
3
SIZE (pa_stable_v190600_20161030.tgz) = 1450572
3
SIZE (pa_stable_v190700_20210406.tgz) = 1462695
(-)./files/patch-Makefile.in (-3 / +2 lines)
Lines 1-11 Link Here
1
$OpenBSD: patch-Makefile_in,v 1.4 2013/03/12 00:59:50 brad Exp $
1
--- Makefile.in.orig	2021-04-01 00:35:41 UTC
2
--- Makefile.in.orig	2016-06-22 08:28:31 UTC
3
+++ Makefile.in
2
+++ Makefile.in
4
@@ -146,6 +146,7 @@ SRC_DIRS = \
3
@@ -146,6 +146,7 @@ SRC_DIRS = \
5
 	src/hostapi/dsound \
4
 	src/hostapi/dsound \
6
 	src/hostapi/jack \
5
 	src/hostapi/jack \
7
 	src/hostapi/oss \
6
 	src/hostapi/oss \
8
+	src/hostapi/sndio \
7
+	src/hostapi/sndio \
8
 	src/hostapi/skeleton \
9
 	src/hostapi/wasapi \
9
 	src/hostapi/wasapi \
10
 	src/hostapi/wdmks \
10
 	src/hostapi/wdmks \
11
 	src/hostapi/wmme \
(-)./files/patch-configure.in (-6 / +5 lines)
Lines 1-7 Link Here
1
$OpenBSD: patch-configure_in,v 1.4 2014/09/13 04:56:28 bentley Exp $
1
--- configure.in.orig	2021-04-01 00:35:42 UTC
2
--- configure.in.orig	2016-06-22 08:28:31 UTC
3
+++ configure.in
2
+++ configure.in
4
@@ -24,6 +24,10 @@ AC_ARG_WITH(alsa,
3
@@ -33,6 +33,10 @@ AC_ARG_WITH(alsa,
5
             AS_HELP_STRING([--with-alsa], [Enable support for ALSA @<:@autodetect@:>@]),
4
             AS_HELP_STRING([--with-alsa], [Enable support for ALSA @<:@autodetect@:>@]),
6
             [with_alsa=$withval])
5
             [with_alsa=$withval])
7
 
6
 
Lines 12-18 $OpenBSD: patch-configure_in,v 1.4 2014/09/13 04:56:28 Link Here
12
 AC_ARG_WITH(jack,
11
 AC_ARG_WITH(jack,
13
             AS_HELP_STRING([--with-jack], [Enable support for JACK @<:@autodetect@:>@]),
12
             AS_HELP_STRING([--with-jack], [Enable support for JACK @<:@autodetect@:>@]),
14
             [with_jack=$withval])
13
             [with_jack=$withval])
15
@@ -120,6 +124,10 @@ have_alsa=no
14
@@ -129,6 +133,10 @@ have_alsa=no
16
 if test "x$with_alsa" != "xno"; then
15
 if test "x$with_alsa" != "xno"; then
17
     AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
16
     AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
18
 fi
17
 fi
Lines 23-29 $OpenBSD: patch-configure_in,v 1.4 2014/09/13 04:56:28 Link Here
23
 have_asihpi=no
22
 have_asihpi=no
24
 if test "x$with_asihpi" != "xno"; then
23
 if test "x$with_asihpi" != "xno"; then
25
     AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
24
     AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
26
@@ -397,6 +405,13 @@ case "${host_os}" in
25
@@ -401,6 +409,13 @@ case "${host_os}" in
27
            AC_DEFINE(PA_USE_ALSA,1)
26
            AC_DEFINE(PA_USE_ALSA,1)
28
         fi
27
         fi
29
 
28
 
Lines 37-43 $OpenBSD: patch-configure_in,v 1.4 2014/09/13 04:56:28 Link Here
37
         if [[ "$have_jack" = "yes" ] && [ "$with_jack" != "no" ]] ; then
36
         if [[ "$have_jack" = "yes" ] && [ "$with_jack" != "no" ]] ; then
38
            DLL_LIBS="$DLL_LIBS $JACK_LIBS"
37
            DLL_LIBS="$DLL_LIBS $JACK_LIBS"
39
            CFLAGS="$CFLAGS $JACK_CFLAGS"
38
            CFLAGS="$CFLAGS $JACK_CFLAGS"
40
@@ -500,6 +515,7 @@ case "$target_os" in
39
@@ -504,6 +519,7 @@ case "$target_os" in
41
         ;;
40
         ;;
42
      *)
41
      *)
43
 	AC_MSG_RESULT([
42
 	AC_MSG_RESULT([
(-)./files/patch-include_portaudio.h (-4 / +3 lines)
Lines 1-7 Link Here
1
$OpenBSD: patch-include_portaudio_h,v 1.2 2013/03/12 00:59:50 brad Exp $
1
--- include/portaudio.h.orig	2021-04-01 00:35:42 UTC
2
--- include/portaudio.h.orig	2018-07-17 06:55:08 UTC
3
+++ include/portaudio.h
2
+++ include/portaudio.h
4
@@ -236,7 +236,8 @@ typedef enum PaHostApiTypeId
3
@@ -287,7 +287,8 @@ typedef enum PaHostApiTypeId
5
     paWDMKS=11,
4
     paWDMKS=11,
6
     paJACK=12,
5
     paJACK=12,
7
     paWASAPI=13,
6
     paWASAPI=13,
Lines 11-17 $OpenBSD: patch-include_portaudio_h,v 1.2 2013/03/12 0 Link Here
11
 } PaHostApiTypeId;
10
 } PaHostApiTypeId;
12
 
11
 
13
 
12
 
14
@@ -1144,6 +1145,15 @@ signed long Pa_GetStreamReadAvailable( PaStream* strea
13
@@ -1198,6 +1199,15 @@ signed long Pa_GetStreamReadAvailable( PaStream* strea
15
  error is encountered.
14
  error is encountered.
16
 */
15
 */
17
 signed long Pa_GetStreamWriteAvailable( PaStream* stream );
16
 signed long Pa_GetStreamWriteAvailable( PaStream* stream );
(-)./files/patch-portaudio-2.0.pc.in (-1 / +1 lines)
Lines 1-4 Link Here
1
--- portaudio-2.0.pc.in.orig	2020-06-28 02:59:37 UTC
1
--- portaudio-2.0.pc.in.orig	2021-04-01 00:35:42 UTC
2
+++ portaudio-2.0.pc.in
2
+++ portaudio-2.0.pc.in
3
@@ -8,5 +8,6 @@ Description: Portable audio I/O
3
@@ -8,5 +8,6 @@ Description: Portable audio I/O
4
 Requires:
4
 Requires:
(-)./files/patch-src_common_pa__front.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/common/pa_front.c.orig	2018-07-17 06:44:39 UTC
1
--- src/common/pa_front.c.orig	2021-04-01 00:35:42 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
 
(-)./files/patch-src_common_pa__stream.c (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/common/pa_stream.c.orig	2018-07-17 06:44:39 UTC
1
--- src/common/pa_stream.c.orig	2021-04-01 00:35:42 UTC
2
+++ src/common/pa_stream.c
2
+++ src/common/pa_stream.c
3
@@ -93,6 +93,8 @@ void PaUtil_InitializeStreamRepresentation( PaUtilStre
3
@@ -93,6 +93,8 @@ void PaUtil_InitializeStreamRepresentation( PaUtilStre
4
     streamRepresentation->streamInfo.inputLatency = 0.;
4
     streamRepresentation->streamInfo.inputLatency = 0.;
(-)./files/patch-src_common_pa__stream.h (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/common/pa_stream.h.orig	2018-07-17 06:44:39 UTC
1
--- src/common/pa_stream.h.orig	2021-04-01 00:35:42 UTC
2
+++ src/common/pa_stream.h
2
+++ src/common/pa_stream.h
3
@@ -152,6 +152,7 @@ typedef struct PaUtilStreamRepresentation {
3
@@ -152,6 +152,7 @@ typedef struct PaUtilStreamRepresentation {
4
     PaStreamFinishedCallback *streamFinishedCallback;
4
     PaStreamFinishedCallback *streamFinishedCallback;
(-)./files/patch-src_hostapi_oss_pa__unix__oss.c (-22 / +4 lines)
Lines 1-26 Link Here
1
--- src/hostapi/oss/pa_unix_oss.c.orig	2019-03-01 03:09:23 UTC
1
--- src/hostapi/oss/pa_unix_oss.c.orig	2021-04-01 00:35:42 UTC
2
+++ src/hostapi/oss/pa_unix_oss.c
2
+++ src/hostapi/oss/pa_unix_oss.c
3
@@ -535,13 +535,13 @@ static PaError BuildDeviceList( PaOSSHostApiRepresenta
3
@@ -2050,3 +2050,27 @@ error:
4
      * add it to a linked list.
5
      * A: Set an arbitrary of 100 devices, should probably be a smarter way. */
6
 
7
-    for( i = 0; i < 100; i++ )
8
+    for( i = -1; i < 100; i++ )
9
     {
10
        char deviceName[32];
11
        PaDeviceInfo *deviceInfo;
12
        int testResult;
13
 
14
-       if( i == 0 )
15
+       if( i == -1 )
16
           snprintf(deviceName, sizeof (deviceName), "%s", DEVICE_NAME_BASE);
17
        else
18
           snprintf(deviceName, sizeof (deviceName), "%s%d", DEVICE_NAME_BASE, i);
19
@@ -2041,5 +2041,29 @@ static signed long GetStreamWriteAvailable( PaStream* 
20
 error:
21
     return result;
4
     return result;
22
 #endif
5
 #endif
23
+}
6
 }
24
+
7
+
25
+const char *PaOSS_GetStreamInputDevice( PaStream* s )
8
+const char *PaOSS_GetStreamInputDevice( PaStream* s )
26
+{
9
+{
Lines 44-48 Link Here
44
+    }
27
+    }
45
+
28
+
46
+   return NULL;
29
+   return NULL;
47
 }
30
+}
48
 
(-)./files/patch-src_os_unix_pa__unix__hostapis.c (-12 / +7 lines)
Lines 1-9 Link Here
1
$OpenBSD: patch-src_os_unix_pa_unix_hostapis_c,v 1.2 2013/03/12 00:59:50 brad Exp $
1
--- src/os/unix/pa_unix_hostapis.c.orig	2021-04-01 00:35:42 UTC
2
3
Difference to OpenBSD patch: PA_USE_SNDIO has been moved before
4
PA_USE_OSS, so that portaudio prefers the sndio output.
5
6
--- src/os/unix/pa_unix_hostapis.c.orig	2018-07-17 07:08:09 UTC
7
+++ src/os/unix/pa_unix_hostapis.c
2
+++ src/os/unix/pa_unix_hostapis.c
8
@@ -44,6 +44,7 @@
3
@@ -44,6 +44,7 @@
9
 
4
 
Lines 13-26 PA_USE_OSS, so that portaudio prefers the sndio output Link Here
13
 PaError PaOSS_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
8
 PaError PaOSS_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
14
 /* Added for IRIX, Pieter, oct 2, 2003: */
9
 /* Added for IRIX, Pieter, oct 2, 2003: */
15
 PaError PaSGI_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
10
 PaError PaSGI_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
16
@@ -68,6 +69,10 @@ PaUtilHostApiInitializer *paHostApiInitializers[] =
11
@@ -61,6 +62,10 @@ PaUtilHostApiInitializer *paHostApiInitializers[] =
17
 #endif
18
 
12
 
19
 #else   /* __linux__ */
13
 #if PA_USE_ALSA
14
         PaAlsa_Initialize,
15
+#endif
20
+
16
+
21
+#ifdef PA_USE_SNDIO
17
+#ifdef PA_USE_SNDIO
22
+	PaSndio_Initialize,
18
+        PaSndio_Initialize,
23
+#endif
19
 #endif
24
 
20
 
25
 #if PA_USE_OSS
21
 #if PA_USE_OSS
26
         PaOSS_Initialize,
(-)./pkg-plist (+1 lines)
Lines 32-37 Link Here
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