<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7da86ccc71c622fe0794b5ffb2d8a943d9dd569e">https://github.com/macports/macports-ports/commit/7da86ccc71c622fe0794b5ffb2d8a943d9dd569e</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 7da86cc portaudio: Update to 19.20161030
</span>7da86cc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7da86ccc71c622fe0794b5ffb2d8a943d9dd569e
</span>Author: Gregorio Litenstein <g.litenstein@gmail.com>
AuthorDate: Fri Apr 27 20:14:28 2018 -0300
<span style='display:block; white-space:pre;color:#404040;'> portaudio: Update to 19.20161030
</span>---
audio/portaudio/Portfile | 13 ++--
.../portaudio/files/patch-audacity-portmixer.diff | 72 +++++++++++-----------
audio/portaudio/files/patch-configure.diff | 8 +--
audio/portaudio/files/patch-ltmain.sh.diff | 2 +-
...tch-src__hostapi__coreaudio__pa_mac_core.c.diff | 12 ++--
5 files changed, 55 insertions(+), 52 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 c8da374..fcdd127 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;'>@@ -3,8 +3,10 @@
</span> PortSystem 1.0
name portaudio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 19.20140130
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set major 19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set minor 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set reldate 20161030
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version ${major}.${reldate}
</span> categories audio devel
platforms darwin macosx
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,11 +25,12 @@ long_description PortAudio is a free, cross platform, open-source, audio I/O
</span> homepage http://www.portaudio.com/
master_sites ${homepage}archives
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname pa_stable_v[strsed ${version} {g/\./_/}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname pa_stable_v${major}[format %04d [expr {$minor * 100}]]_${reldate}
</span> extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0a290cea8a102a45b2df9b72046b3eed0ab35b4f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8fe024a5f0681e112c6979808f684c3516061cc51d3acc0b726af98fc96c8d57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e6e5cd3f3cb7469aa17549c189e445d573567e13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1450572
</span>
worksrcdir ${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/portaudio/files/patch-audacity-portmixer.diff b/audio/portaudio/files/patch-audacity-portmixer.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4570efe..248fc49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/portaudio/files/patch-audacity-portmixer.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/portaudio/files/patch-audacity-portmixer.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,30 +5,30 @@ Last-Update: 2011-12-07
</span> --- include/pa_win_ds.h
+++ include/pa_win_ds.h
@@ -86,6 +86,21 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }PaWinDirectSoundStreamInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/** Retrieve the GUID of the input device.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @param stream The stream to query.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @return A pointer to the GUID, or NULL if none.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LPGUID PaWinDS_GetStreamInputGUID( PaStream* s );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/** Retrieve the GUID of the output device.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @param stream The stream to query.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @return A pointer to the GUID, or NULL if none.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LPGUID PaWinDS_GetStreamOutputGUID( PaStream* s );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }PaWinDirectSoundStreamInfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/** Retrieve the GUID of the input device.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @param stream The stream to query.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @return A pointer to the GUID, or NULL if none.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LPGUID PaWinDS_GetStreamInputGUID( PaStream* s );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/** Retrieve the GUID of the output device.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @param stream The stream to query.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @return A pointer to the GUID, or NULL if none.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LPGUID PaWinDS_GetStreamOutputGUID( PaStream* s );
</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;'>+ #ifdef __cplusplus
</span> --- include/portaudio.h
+++ include/portaudio.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1146,6 +1146,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1197,6 +1197,15 @@
</span> signed long Pa_GetStreamWriteAvailable( PaStream* stream );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,7 +153,7 @@ Last-Update: 2011-12-07
</span> +#endif
--- src/common/pa_front.c
+++ src/common/pa_front.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1216,8 +1216,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1257,8 +1257,10 @@
</span> hostApiInputParametersPtr, hostApiOutputParametersPtr,
sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,7 +165,7 @@ Last-Update: 2011-12-07
</span>
PA_LOGAPI(("Pa_OpenStream returned:\n" ));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1729,6 +1731,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1770,6 +1772,32 @@
</span> return result;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -222,15 +222,15 @@ Last-Update: 2011-12-07
</span> --- src/hostapi/coreaudio/pa_mac_core_blocking.c
+++ src/hostapi/coreaudio/pa_mac_core_blocking.c
@@ -66,6 +66,9 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define OSAtomicOr32( a, b ) ( (*(b)) |= (a) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define OSAtomicAnd32( a, b ) ( (*(b)) &= (a) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSAtomicOr32( a, b ) BitOrAtomic( a, (UInt32 *) b )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OSAtomicAnd32( a, b ) BitAndAtomic( a, (UInt32 *) b )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <libkern/OSAtomic.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define OSAtomicOr32( a, b ) ( (*(b)) |= (a) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define OSAtomicAnd32( a, b ) ( (*(b)) &= (a) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define OSAtomicOr32( a, b ) BitOrAtomic( a, (UInt32 *) b )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define OSAtomicAnd32( a, b ) BitAndAtomic( a, (UInt32 *) b )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <libkern/OSAtomic.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span> --- src/hostapi/alsa/pa_linux_alsa.c
+++ src/hostapi/alsa/pa_linux_alsa.c
@@ -621,6 +621,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,7 +259,7 @@ Last-Update: 2011-12-07
</span> self->nfds = alsa_snd_pcm_poll_descriptors_count( self->pcm );
PA_ENSURE( hostSampleFormat = PaUtil_SelectClosestAvailableFormat( GetAvailableFormats( self->pcm ), userSampleFormat ) );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4588,9 +4593,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4605,9 +4610,7 @@
</span> /* XXX: More descriptive error? */
PA_UNLESS( stream->capture.pcm, paDeviceUnavailable );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -270,7 +270,7 @@ Last-Update: 2011-12-07
</span>
error:
return result;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4607,9 +4610,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4624,9 +4627,7 @@
</span> /* XXX: More descriptive error? */
PA_UNLESS( stream->playback.pcm, paDeviceUnavailable );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,7 +312,7 @@ Last-Update: 2011-12-07
</span> +}
--- configure.in
+++ configure.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -405,6 +405,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -420,6 +420,7 @@
</span> DLL_LIBS="$DLL_LIBS -lossaudio"
LIBS="$LIBS -lossaudio"
fi
<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 f4b5b86..d213a40 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,6 +1,6 @@
</span> --- configure
+++ configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15676,7 +15676,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15711,7 +15711,6 @@
</span>
cat >>confdefs.h <<_ACEOF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,12 +8,12 @@
</span> _ACEOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15787,7 +15786,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15822,7 +15821,7 @@
</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 -Werror"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -DNDEBUG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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 -DNDEBUG"
</span> LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
if test "x$enable_mac_universal" = "xyes" ; then
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/portaudio/files/patch-ltmain.sh.diff b/audio/portaudio/files/patch-ltmain.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a0d573..c0e30ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/portaudio/files/patch-ltmain.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/portaudio/files/patch-ltmain.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- ltmain.sh
+++ ltmain.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5838,9 +5838,10 @@ func_mode_link ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5851,9 +5851,10 @@ func_mode_link ()
</span> # -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
# -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/portaudio/files/patch-src__hostapi__coreaudio__pa_mac_core.c.diff b/audio/portaudio/files/patch-src__hostapi__coreaudio__pa_mac_core.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2066cc1..ca73640 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/portaudio/files/patch-src__hostapi__coreaudio__pa_mac_core.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/portaudio/files/patch-src__hostapi__coreaudio__pa_mac_core.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/hostapi/coreaudio/pa_mac_core.c
+++ src/hostapi/coreaudio/pa_mac_core.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1158,8 +1158,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1173,8 +1173,8 @@
</span> const double sampleRate,
void *refCon )
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> /*An Apple TN suggests using CAStreamBasicDescription, but that is C++*/
AudioStreamBasicDescription desiredFormat;
OSStatus result = noErr;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1230,7 +1230,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1245,7 +1245,7 @@
</span> desc.componentFlags = 0;
desc.componentFlagsMask = 0;
/* -- find the component -- */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@
</span> if( !comp )
{
DBUG( ( "AUHAL component not found." ) );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1239,7 +1239,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1254,7 +1254,7 @@
</span> return paUnanticipatedHostError;
}
/* -- open it -- */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@
</span> if( result )
{
DBUG( ( "Failed to open AUHAL component." ) );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1592,7 +1592,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1607,7 +1607,7 @@
</span> #undef ERR_WRAP
error:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@
</span> *audioUnit = NULL;
if( result )
return PaMacCore_SetError( result, line, 1 );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2613,13 +2613,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2645,13 +2645,13 @@
</span> }
if( stream->outputUnit && stream->outputUnit != stream->inputUnit ) {
AudioUnitUninitialize( stream->outputUnit );
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@
</span> stream->inputUnit = NULL;
}
if( stream->inputRingBuffer.buffer )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2679,12 +2679,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2711,12 +2711,12 @@
</span>
// it's not clear from appl's docs that this really waits
// until all data is flushed.
</pre><pre style='margin:0'>
</pre>