pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/portaudio
Module Name: pkgsrc
Committed By: adam
Date: Tue Jul 16 11:40:16 UTC 2024
Modified Files:
pkgsrc/audio/portaudio: Makefile buildlink3.mk distinfo
pkgsrc/audio/portaudio/patches: patch-Makefile.in patch-configure.in
patch-src_hostapi_oss_pa__unix__oss.c
Added Files:
pkgsrc/audio/portaudio: PLIST.Darwin
Log Message:
portaudio: updated to 190700.20210406
v19.7.0
Stable release with:
support for latest Mac OS APIs
Jack - fixes for device names that allows use on Linux systems with PipeWire
WASAPI - numerous improvements
OSS - better format support
ALSA - various fixes for hangs and crashes
WDMKS - improved performance and fixes
updated build scripts
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/audio/portaudio/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/portaudio/PLIST.Darwin
cvs rdiff -u -r1.20 -r1.21 pkgsrc/audio/portaudio/buildlink3.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/audio/portaudio/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/portaudio/patches/patch-Makefile.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/portaudio/patches/patch-configure.in
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.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/Makefile
diff -u pkgsrc/audio/portaudio/Makefile:1.39 pkgsrc/audio/portaudio/Makefile:1.40
--- pkgsrc/audio/portaudio/Makefile:1.39 Sat Dec 30 01:16:42 2023
+++ pkgsrc/audio/portaudio/Makefile Tue Jul 16 11:40:16 2024
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.39 2023/12/30 01:16:42 zafer Exp $
+# $NetBSD: Makefile,v 1.40 2024/07/16 11:40:16 adam Exp $
-DISTNAME= pa_stable_v190600_20161030
+DISTNAME= pa_stable_v190700_20210406
PKGNAME= ${DISTNAME:S/^pa_stable_v/portaudio-/1:S/_/./g}
-PKGREVISION= 13
CATEGORIES= audio
-MASTER_SITES= https://www.portaudio.com/archives/
+MASTER_SITES= https://files.portaudio.com/archives/
EXTRACT_SUFX= .tgz
MAINTAINER= nia%NetBSD.org@localhost
-HOMEPAGE= http://www.portaudio.com/
+HOMEPAGE= https://www.portaudio.com/
COMMENT= Portable cross-platform audio API
LICENSE= mit
Index: pkgsrc/audio/portaudio/buildlink3.mk
diff -u pkgsrc/audio/portaudio/buildlink3.mk:1.20 pkgsrc/audio/portaudio/buildlink3.mk:1.21
--- pkgsrc/audio/portaudio/buildlink3.mk:1.20 Sat May 6 19:08:47 2023
+++ pkgsrc/audio/portaudio/buildlink3.mk Tue Jul 16 11:40:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2023/05/06 19:08:47 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2024/07/16 11:40:16 adam Exp $
BUILDLINK_TREE+= portaudio
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= portaudio
PORTAUDIO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.portaudio+= portaudio>=19
-BUILDLINK_ABI_DEPENDS.portaudio?= portaudio>=190600.20161030nb13
+BUILDLINK_ABI_DEPENDS.portaudio+= portaudio>=190600.20161030nb13
BUILDLINK_PKGSRCDIR.portaudio?= ../../audio/portaudio
BUILDLINK_INCDIRS.portaudio?= include/portaudio2
BUILDLINK_LIBDIRS.portaudio+= lib/portaudio2
Index: pkgsrc/audio/portaudio/distinfo
diff -u pkgsrc/audio/portaudio/distinfo:1.29 pkgsrc/audio/portaudio/distinfo:1.30
--- pkgsrc/audio/portaudio/distinfo:1.29 Tue Jun 14 14:18:45 2022
+++ pkgsrc/audio/portaudio/distinfo Tue Jul 16 11:40:16 2024
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.29 2022/06/14 14:18:45 nia Exp $
+$NetBSD: distinfo,v 1.30 2024/07/16 11:40:16 adam Exp $
-BLAKE2s (pa_stable_v190600_20161030.tgz) = 19c45436985da2c2ff7a4f016c7ae9dcb0772b43ffa3356961a2a98cacdb24d9
-SHA512 (pa_stable_v190600_20161030.tgz) = 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
-Size (pa_stable_v190600_20161030.tgz) = 1450572 bytes
-SHA1 (patch-Makefile.in) = 28f587f171b4a504e3982e6f8fcf3f148e5aa5c9
+BLAKE2s (pa_stable_v190700_20210406.tgz) = 570e46ea4a81c83cedbbc1a96d9402b0aa4f6d0d6b04df204937e7dbc851407d
+SHA512 (pa_stable_v190700_20210406.tgz) = 77393bf0628ad9c9d5fb1b0d9b1732d403e23513b1332553964bdafcc80878b2798141011d2615688150d753a594285e718cf716e990b2396f1d8dea7babd02d
+Size (pa_stable_v190700_20210406.tgz) = 1462695 bytes
+SHA1 (patch-Makefile.in) = 642e7d6a22310ac5f352476dcac77288c1c9f30c
SHA1 (patch-bindings_cpp_Makefile.am) = bcd45cba537c867ed9b2e20e1468e9f16ed0b3f7
-SHA1 (patch-configure.in) = 9ccc782631a6aaa9e2c7b8390a6b527ead25d0a5
+SHA1 (patch-configure.in) = bd0ce61a170bc3c440748a41b36ac7cda5a7d2ed
SHA1 (patch-include_pa__unix__oss.h) = 8e4ede09d5bf730bf8c2e8ca4aca6f700f58f2f7
SHA1 (patch-include_portaudio.h) = 9a2e4aeb126056aded5cc49c40cde40e16738757
SHA1 (patch-src_common_pa__front.c) = cdddb6f537f803b55873ad6bfa936a6bff47556d
SHA1 (patch-src_common_pa__stream.c) = 58e6ab2a61957208973a59be2f1140abc922f360
SHA1 (patch-src_common_pa__stream.h) = 94781a9ae79ea1340eea8caadc106416c019cf74
SHA1 (patch-src_hostapi_alsa_pa__linux__alsa.c) = 71daf913422f72aa379ae8cc302186800cff7717
-SHA1 (patch-src_hostapi_oss_pa__unix__oss.c) = 785b6ba7fc89cf973c992541ee79a045a5c40707
+SHA1 (patch-src_hostapi_oss_pa__unix__oss.c) = 242c97f89d6a33ac8491f8725981a60a3d1e210c
SHA1 (patch-src_hostapi_sun_pa__unix__sun.c) = 1e54e4fb75f15e74d931a11ee157beaae9a5f917
SHA1 (patch-src_os_unix_pa__unix__hostapis.c) = 8cfc7d7aac8f9803e204711ded3d64842913f4fd
Index: pkgsrc/audio/portaudio/patches/patch-Makefile.in
diff -u pkgsrc/audio/portaudio/patches/patch-Makefile.in:1.1 pkgsrc/audio/portaudio/patches/patch-Makefile.in:1.2
--- pkgsrc/audio/portaudio/patches/patch-Makefile.in:1.1 Fri Apr 17 15:50:03 2020
+++ pkgsrc/audio/portaudio/patches/patch-Makefile.in Tue Jul 16 11:40:16 2024
@@ -1,19 +1,19 @@
-$NetBSD: patch-Makefile.in,v 1.1 2020/04/17 15:50:03 nia Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2024/07/16 11:40:16 adam Exp $
- Sun/NetBSD audio support.
- Correct path for pkgconfig files.
---- Makefile.in.orig 2016-10-30 01:23:04.000000000 +0000
+--- Makefile.in.orig 2021-04-01 00:35:41.000000000 +0000
+++ Makefile.in
@@ -146,6 +146,7 @@ SRC_DIRS = \
src/hostapi/dsound \
src/hostapi/jack \
src/hostapi/oss \
+ src/hostapi/sun \
+ src/hostapi/skeleton \
src/hostapi/wasapi \
src/hostapi/wdmks \
- src/hostapi/wmme \
-@@ -193,8 +194,8 @@ install: lib/$(PALIB) portaudio-2.0.pc
+@@ -194,8 +195,8 @@ install: lib/$(PALIB) portaudio-2.0.pc
for include in $(INCLUDES); do \
$(INSTALL_DATA) -m 644 $(top_srcdir)/include/$$include $(DESTDIR)$(includedir)/$$include; \
done
Index: pkgsrc/audio/portaudio/patches/patch-configure.in
diff -u pkgsrc/audio/portaudio/patches/patch-configure.in:1.2 pkgsrc/audio/portaudio/patches/patch-configure.in:1.3
--- pkgsrc/audio/portaudio/patches/patch-configure.in:1.2 Sat Apr 25 09:41:32 2020
+++ pkgsrc/audio/portaudio/patches/patch-configure.in Tue Jul 16 11:40:16 2024
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure.in,v 1.2 2020/04/25 09:41:32 nia Exp $
+$NetBSD: patch-configure.in,v 1.3 2024/07/16 11:40:16 adam Exp $
- Sun/NetBSD audio support
- Install extra headers needed by portmixer in Audacity for OSS.
- Don't use -lpthread
---- configure.in.orig 2016-10-30 01:23:04.000000000 +0000
+--- configure.in.orig 2021-04-01 00:35:42.000000000 +0000
+++ configure.in
-@@ -32,6 +32,10 @@ AC_ARG_WITH(oss,
+@@ -41,6 +41,10 @@ AC_ARG_WITH(oss,
AS_HELP_STRING([--with-oss], [Enable support for OSS @<:@autodetect@:>@]),
[with_oss=$withval])
@@ -17,7 +17,7 @@ $NetBSD: patch-configure.in,v 1.2 2020/0
AC_ARG_WITH(asihpi,
AS_HELP_STRING([--with-asihpi], [Enable support for ASIHPI @<:@autodetect@:>@]),
[with_asihpi=$withval])
-@@ -132,6 +136,10 @@ if test "x$with_oss" != "xno"; then
+@@ -141,6 +145,10 @@ if test "x$with_oss" != "xno"; then
AC_CHECK_LIB(ossaudio, _oss_ioctl, have_libossaudio=yes, have_libossaudio=no)
fi
fi
@@ -28,7 +28,15 @@ $NetBSD: patch-configure.in,v 1.2 2020/0
have_jack=no
if test "x$with_jack" != "xno"; then
PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
-@@ -416,6 +424,7 @@ case "${host_os}" in
+@@ -278,6 +286,7 @@ case "${host_os}" in
+ SHARED_FLAGS="$LIBS -dynamiclib $mac_arches $mac_sysroot $mac_version_min"
+ CFLAGS="-std=c99 $CFLAGS $mac_arches $mac_sysroot $mac_version_min"
+ OTHER_OBJS="src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o
src/hostapi/coreaudio/pa_mac_core_blocking.o src/common/pa_ringbuffer.o"
++ INCLUDES="$INCLUDES pa_mac_core.h"
+ PADLL="libportaudio.dylib"
+ ;;
+
+@@ -411,6 +420,7 @@ case "${host_os}" in
if [[ "$with_oss" != "no" ]] ; then
OTHER_OBJS="$OTHER_OBJS src/hostapi/oss/pa_unix_oss.o"
@@ -36,7 +44,7 @@ $NetBSD: patch-configure.in,v 1.2 2020/0
if [[ "$have_libossaudio" = "yes" ]] ; then
DLL_LIBS="$DLL_LIBS -lossaudio"
LIBS="$LIBS -lossaudio"
-@@ -423,6 +432,11 @@ case "${host_os}" in
+@@ -418,6 +428,11 @@ case "${host_os}" in
AC_DEFINE(PA_USE_OSS,1)
fi
@@ -48,7 +56,7 @@ $NetBSD: patch-configure.in,v 1.2 2020/0
if [[ "$have_asihpi" = "yes" ] && [ "$with_asihpi" != "no" ]] ; then
LIBS="$LIBS -lhpi"
DLL_LIBS="$DLL_LIBS -lhpi"
-@@ -430,8 +444,8 @@ case "${host_os}" in
+@@ -425,8 +440,8 @@ case "${host_os}" in
AC_DEFINE(PA_USE_ASIHPI,1)
fi
@@ -59,7 +67,7 @@ $NetBSD: patch-configure.in,v 1.2 2020/0
PADLL="libportaudio.so"
## support sun cc compiler flags
-@@ -510,6 +524,7 @@ case "$target_os" in
+@@ -505,6 +520,7 @@ case "$target_os" in
*)
AC_MSG_RESULT([
OSS ......................... $have_oss
Index: pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c
diff -u pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c:1.5 pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c:1.6
--- pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c:1.5 Tue Jun 14 14:18:45 2022
+++ pkgsrc/audio/portaudio/patches/patch-src_hostapi_oss_pa__unix__oss.c Tue Jul 16 11:40:16 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_hostapi_oss_pa__unix__oss.c,v 1.5 2022/06/14 14:18:45 nia Exp $
+$NetBSD: patch-src_hostapi_oss_pa__unix__oss.c,v 1.6 2024/07/16 11:40:16 adam Exp $
- Add 24-bit and 32-bit sample formats.
- NetBSD-specific changes to make this map better to the emulation layer:
@@ -6,7 +6,7 @@ $NetBSD: patch-src_hostapi_oss_pa__unix_
PaOssStream_WaitForFrames hangs forever unless disabled, this may be a bug.
- Add features needed to make portmixer work with audacity.
---- src/hostapi/oss/pa_unix_oss.c.orig 2016-10-30 01:23:04.000000000 +0000
+--- src/hostapi/oss/pa_unix_oss.c.orig 2021-04-01 00:35:42.000000000 +0000
+++ src/hostapi/oss/pa_unix_oss.c
@@ -65,7 +65,7 @@
@@ -30,7 +30,7 @@ $NetBSD: patch-src_hostapi_oss_pa__unix_
ENSURE_( ioctl( devHandle, SNDCTL_DSP_SPEED, &sr ), paUnanticipatedHostError );
*defaultSampleRate = sr;
-@@ -756,7 +761,7 @@ static PaError PaOssStreamComponent_Init
+@@ -755,7 +760,7 @@ static PaError PaOssStreamComponent_Init
component->devName = deviceName;
component->userChannelCount = parameters->channelCount;
component->userFormat = parameters->sampleFormat;
@@ -39,7 +39,7 @@ $NetBSD: patch-src_hostapi_oss_pa__unix_
component->userInterleaved = !(parameters->sampleFormat & paNonInterleaved);
if( !callbackMode && !component->userInterleaved )
-@@ -938,6 +943,16 @@ static PaError Pa2OssFormat( PaSampleFor
+@@ -937,6 +942,11 @@ static PaError Pa2OssFormat( PaSampleFor
case paInt16:
*ossFormat = AFMT_S16_NE;
break;
@@ -48,15 +48,10 @@ $NetBSD: patch-src_hostapi_oss_pa__unix_
+ *ossFormat = AFMT_S24_NE;
+ break;
+#endif
-+#ifdef AFMT_S32_NE
-+ case paInt32:
-+ *ossFormat = AFMT_S32_NE;
-+ break;
-+#endif
- default:
- return paInternalError; /* This shouldn't happen */
- }
-@@ -961,6 +976,14 @@ static PaError GetAvailableFormats( PaOs
+ #ifdef AFMT_S32_NE
+ case paInt32:
+ *ossFormat = AFMT_S32_NE;
+@@ -965,6 +975,10 @@ static PaError GetAvailableFormats( PaOs
frmts |= paInt8;
if( mask & AFMT_S16_NE )
frmts |= paInt16;
@@ -64,14 +59,10 @@ $NetBSD: patch-src_hostapi_oss_pa__unix_
+ if( mask & AFMT_S24_NE )
+ frmts |= paInt24;
+#endif
-+#ifdef AFMT_S32_NE
-+ if( mask & AFMT_S32_NE )
-+ frmts |= paInt32;
-+#endif
- else
- result = paSampleFormatNotSupported;
-
-@@ -1040,12 +1063,23 @@ static PaError PaOssStreamComponent_Conf
+ #ifdef AFMT_S32_NE
+ if( mask & AFMT_S32_NE )
+ frmts |= paInt32;
+@@ -1048,12 +1062,23 @@ static PaError PaOssStreamComponent_Conf
PA_ENSURE( Pa2OssFormat( hostFormat, &temp ) );
nativeFormat = temp;
ENSURE_( ioctl( component->fd, SNDCTL_DSP_SETFMT, &temp ), paUnanticipatedHostError );
@@ -95,7 +86,7 @@ $NetBSD: patch-src_hostapi_oss_pa__unix_
/* try to set the sample rate */
ENSURE_( ioctl( component->fd, SNDCTL_DSP_SPEED, &sr ), paInvalidSampleRate );
-@@ -1477,6 +1511,7 @@ static PaError PaOssStream_Prepare( PaOs
+@@ -1485,6 +1510,7 @@ static PaError PaOssStream_Prepare( PaOs
size_t bufSz = PaOssStreamComponent_BufferSize( stream->playback );
memset( stream->playback->buffer, 0, bufSz );
@@ -103,7 +94,7 @@ $NetBSD: patch-src_hostapi_oss_pa__unix_
/* Looks like we have to turn off blocking before we try this, but if we don't fill the buffer
* OSS will complain. */
PA_ENSURE( ModifyBlocking( stream->playback->fd, 0 ) );
-@@ -1486,6 +1521,7 @@ static PaError PaOssStream_Prepare( PaOs
+@@ -1494,6 +1520,7 @@ static PaError PaOssStream_Prepare( PaOs
break;
}
PA_ENSURE( ModifyBlocking( stream->playback->fd, 1 ) );
@@ -111,7 +102,7 @@ $NetBSD: patch-src_hostapi_oss_pa__unix_
}
if( stream->sharedDevice )
-@@ -1652,6 +1688,7 @@ static void *PaOSS_AudioThreadProc( void
+@@ -1660,6 +1687,7 @@ static void *PaOSS_AudioThreadProc( void
callbackResult = paComplete;
}
@@ -119,7 +110,7 @@ $NetBSD: patch-src_hostapi_oss_pa__unix_
/* Aspect StreamState: Because of the messy OSS scheme we can't explicitly trigger device start unless
* the stream has been recently started, we will have to go right ahead and read/write in blocking
* fashion to trigger operation. Therefore we begin with processing one host buffer before we switch
-@@ -1667,6 +1704,9 @@ static void *PaOSS_AudioThreadProc( void
+@@ -1675,6 +1703,9 @@ static void *PaOSS_AudioThreadProc( void
{
framesAvail = stream->framesPerHostBuffer;
}
@@ -129,7 +120,7 @@ $NetBSD: patch-src_hostapi_oss_pa__unix_
while( framesAvail > 0 )
{
-@@ -1749,11 +1789,13 @@ static void *PaOSS_AudioThreadProc( void
+@@ -1757,11 +1788,13 @@ static void *PaOSS_AudioThreadProc( void
if( initiateProcessing || !triggered )
{
@@ -143,8 +134,8 @@ $NetBSD: patch-src_hostapi_oss_pa__unix_
initiateProcessing = 0;
sem_post( &stream->semaphore );
-@@ -2043,3 +2085,26 @@ error:
- #endif
+@@ -2032,6 +2065,29 @@ error:
+ return result;
}
+const char *PaOSS_GetStreamInputDevice( PaStream* s )
@@ -170,3 +161,6 @@ $NetBSD: patch-src_hostapi_oss_pa__unix_
+
+ return NULL;
+}
+
+ /* TODO: Compute number of allocated bytes somewhere else, can we use ODELAY with capture */
+ static signed long GetStreamWriteAvailable( PaStream* s )
Added files:
Index: pkgsrc/audio/portaudio/PLIST.Darwin
diff -u /dev/null pkgsrc/audio/portaudio/PLIST.Darwin:1.1
--- /dev/null Tue Jul 16 11:40:16 2024
+++ pkgsrc/audio/portaudio/PLIST.Darwin Tue Jul 16 11:40:16 2024
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2024/07/16 11:40:16 adam Exp $
+include/portaudio2/pa_mac_core.h
Home |
Main Index |
Thread Index |
Old Index