<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/64d3b67dced2a28e1b702019d9a88e298536b61c">https://github.com/macports/macports-ports/commit/64d3b67dced2a28e1b702019d9a88e298536b61c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 64d3b67dced portaudio: update to 20240113
</span>64d3b67dced is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 64d3b67dced2a28e1b702019d9a88e298536b61c
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat Jan 20 06:51:41 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> portaudio: update to 20240113
</span>---
audio/portaudio/Portfile | 17 ++--
.../files/patch-Restore-support-for-10.5.diff | 106 +++++++++++++++++++++
audio/portaudio/files/patch-configure.diff | 30 +++++-
3 files changed, 143 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/portaudio/Portfile b/audio/portaudio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 461c206873e..c5939eb28b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/portaudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/portaudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,15 +19,15 @@ long_description PortAudio is a free, cross platform, open-source, audio I/O
</span> software between developers on different platforms. \
Many applications use PortAudio for Audio I/O.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.portaudio.com/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.portaudio.com
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# next commit aa053464eb261337c2c763f2a3df1e5ef8f4797e drop 10.5 support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Portaudio portaudio 147dd722548358763a8b649b3e4b41dfffbcfbb6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20210401-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2449e768b762c5c1777dd3c2a291e3cdbe9dc30c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d29bbe2b5a6f9447571e738a65c09239da61e73eae7d3b6ffd7cb7a32b2a8709 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1463021
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Portaudio portaudio daaf637f6f9fce670031221abfd7dfde92e5cce3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20240113-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5355d211fa72846bcd92e43c0a31c350a7ff0f16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7778154896d11fe9ecb01c31b6d143d42908640796f46441495e72f616e1a247 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1484435
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
# By default, PortAudio is built as a universal binary.
# To build a non-universal library for the host architecture,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,8 @@ use_parallel_build no
</span> patchfiles patch-configure.diff \
patch-ltmain.sh.diff \
patch-src__common__pa_types.h.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-audacity-portmixer.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-audacity-portmixer.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Restore-support-for-10.5.diff
</span>
variant jack description {Enable JACK support} {
depends_lib-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/portaudio/files/patch-Restore-support-for-10.5.diff b/audio/portaudio/files/patch-Restore-support-for-10.5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..858a1584bc8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/portaudio/files/patch-Restore-support-for-10.5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,106 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 79aefe1cbede5b460b716147e780ce7f94deb11c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 20 Jan 2024 04:22:39 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Restore support for 10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reverts breaking changes introduced in https://github.com/PortAudio/portaudio/commit/aa053464eb261337c2c763f2a3df1e5ef8f4797e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hostapi/coreaudio/pa_mac_core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hostapi/coreaudio/pa_mac_core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -728,11 +728,19 @@ PaError PaMacCore_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VVDBUG(("PaMacCore_Initialize(): hostApiIndex=%d\n", hostApiIndex));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFRunLoopRef theRunLoop = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AudioObjectPropertyAddress theAddress = { kAudioHardwarePropertyRunLoop, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OSStatus osErr = AudioObjectSetPropertyData (kAudioObjectSystemObject, &theAddress, 0, NULL, sizeof(CFRunLoopRef), &theRunLoop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (osErr != noErr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SInt32 major;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SInt32 minor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Gestalt(gestaltSystemVersionMajor, &major);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Gestalt(gestaltSystemVersionMinor, &minor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Starting with 10.6 systems, the HAL notification thread is created internally
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( major > 10 || (major == 10 && minor >= 6) ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFRunLoopRef theRunLoop = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AudioObjectPropertyAddress theAddress = { kAudioHardwarePropertyRunLoop, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OSStatus osErr = AudioObjectSetPropertyData (kAudioObjectSystemObject, &theAddress, 0, NULL, sizeof(CFRunLoopRef), &theRunLoop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (osErr != noErr) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unixErr = initializeXRunListenerList();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1174,8 +1182,13 @@ static PaError OpenAndSetupOneAudioUnit(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const double sampleRate,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *refCon )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioComponentDescription desc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioComponent comp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ComponentDescription desc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Component comp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*An Apple TN suggests using CAStreamBasicDescription, but that is C++*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioStreamBasicDescription desiredFormat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSStatus result = noErr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1242,7 +1255,11 @@ static PaError OpenAndSetupOneAudioUnit(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ desc.componentFlags = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ desc.componentFlagsMask = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -- find the component -- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ comp = AudioComponentFindNext( NULL, &desc );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ comp = FindNextComponent( NULL, &desc );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !comp )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DBUG( ( "AUHAL component not found." ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1251,7 +1268,11 @@ static PaError OpenAndSetupOneAudioUnit(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return paUnanticipatedHostError;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* -- open it -- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = AudioComponentInstanceNew( comp, audioUnit );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = OpenAComponent( comp, audioUnit );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( result )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DBUG( ( "Failed to open AUHAL component." ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1600,7 +1621,11 @@ static PaError OpenAndSetupOneAudioUnit(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioComponentInstanceDispose( *audioUnit );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CloseComponent( *audioUnit );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *audioUnit = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( result )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return PaMacCore_SetError( result, line, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2655,13 +2680,21 @@ static PaError CloseStream( PaStream* s )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( stream->outputUnit && stream->outputUnit != stream->inputUnit ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioUnitUninitialize( stream->outputUnit );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioComponentInstanceDispose( stream->outputUnit );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CloseComponent( stream->outputUnit );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream->outputUnit = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( stream->inputUnit )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioUnitUninitialize( stream->inputUnit );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AudioComponentInstanceDispose( stream->inputUnit );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CloseComponent( stream->inputUnit );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream->inputUnit = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( stream->inputRingBuffer.buffer )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/portaudio/files/patch-configure.diff b/audio/portaudio/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a861150d0f..db456a7f872 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/portaudio/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/portaudio/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,37 @@
</span> --- configure
+++ configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15822,7 +15821,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15866,12 +15842,31 @@
</span> $as_echo "#define PA_USE_COREAUDIO 1" >>confdefs.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated -Werror"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated"
</span> + CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated -DNDEBUG"
LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreFoundation -framework CoreServices"
if test "x$enable_mac_universal" = "xyes" ; then
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- mac_version_min="-mmacosx-version-min=10.6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mac_sysroot="-isysroot $(xcrun --sdk macosx --show-sdk-path)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case `xcodebuild -version | sed -n 's/Xcode \(.*\)/\1/p'` in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 3.0|3.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ -d /Developer/SDKs/MacOSX10.5.sdk ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac_version_min="-mmacosx-version-min=10.5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac_sysroot="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac_version_min="-mmacosx-version-min=10.4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac_sysroot="-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if xcrun --sdk macosx10.5 --show-sdk-path >/dev/null 2>&1 ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac_version_min="-mmacosx-version-min=10.5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac_sysroot="-isysroot $(xcrun --sdk macosx10.5 --show-sdk-path)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac_version_min="-mmacosx-version-min=10.6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mac_sysroot="-isysroot $(xcrun --sdk macosx --show-sdk-path)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mac_arches=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for arch in x86_64 arm64
</span></pre><pre style='margin:0'>
</pre>