<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15007] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15007">15007</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-09-28 14:47:35 -0500 (Mon, 28 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre> adding port audio patch for snow leopard. </pre>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkpatchesmod_portaudio_snow_leoparddiff">freeswitch/trunk/patches/mod_portaudio_snow_leopard.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkpatchesmod_portaudio_snow_leoparddiff"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/patches/mod_portaudio_snow_leopard.diff (0 => 15007)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/patches/mod_portaudio_snow_leopard.diff (rev 0)
+++ freeswitch/trunk/patches/mod_portaudio_snow_leopard.diff 2009-09-28 19:47:35 UTC (rev 15007)
</span><span class="lines">@@ -0,0 +1,170 @@
</span><ins>+Index: libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c
+===================================================================
+--- libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c (revision 14988)
++++ libs/portaudio/src/hostapi/coreaudio/pa_mac_core.c (working copy)
+@@ -801,8 +801,8 @@
+ const double sampleRate,
+ void *refCon )
+ {
+- ComponentDescription desc;
+- Component comp;
++ AudioComponentDescription desc;
++ AudioComponent comp;
+ /*An Apple TN suggests using CAStreamBasicDescription, but that is C++*/
+ AudioStreamBasicDescription desiredFormat;
+ OSStatus result = noErr;
+@@ -873,7 +873,7 @@
+ desc.componentFlags = 0;
+ desc.componentFlagsMask = 0;
+ /* -- find the component -- */
+- comp = FindNextComponent( NULL, &desc );
++ comp = AudioComponentFindNext( NULL, &desc );
+ if( !comp )
+ {
+ DBUG( ( "AUHAL component not found." ) );
+@@ -882,7 +882,7 @@
+ return paUnanticipatedHostError;
+ }
+ /* -- open it -- */
+- result = OpenAComponent( comp, audioUnit );
++ result = AudioComponentInstanceNew( comp, audioUnit );
+ if( result )
+ {
+ DBUG( ( "Failed to open AUHAL component." ) );
+@@ -1224,7 +1224,7 @@
+ #undef ERR_WRAP
+
+ error:
+- CloseComponent( *audioUnit );
++ AudioComponentInstanceDispose( *audioUnit );
+ *audioUnit = NULL;
+ if( result )
+ return PaMacCore_SetError( result, line, 1 );
+@@ -2146,13 +2146,13 @@
+ xrunCallback );
+ if( stream->outputUnit && stream->outputUnit != stream->inputUnit ) {
+ AudioUnitUninitialize( stream->outputUnit );
+- CloseComponent( stream->outputUnit );
++ AudioComponentInstanceDispose( stream->outputUnit );
+ }
+ stream->outputUnit = NULL;
+ if( stream->inputUnit )
+ {
+ AudioUnitUninitialize( stream->inputUnit );
+- CloseComponent( stream->inputUnit );
++ AudioComponentInstanceDispose( stream->inputUnit );
+ stream->inputUnit = NULL;
+ }
+ if( stream->inputRingBuffer.buffer )
+@@ -2211,12 +2211,12 @@
+
+ // it's not clear from appl's docs that this really waits
+ // until all data is flushed.
+-static ComponentResult BlockWhileAudioUnitIsRunning( AudioUnit audioUnit, AudioUnitElement element )
++static OSStatus BlockWhileAudioUnitIsRunning( AudioUnit audioUnit, AudioUnitElement element )
+ {
+ Boolean isRunning = 1;
+ while( isRunning ) {
+ UInt32 s = sizeof( isRunning );
+- ComponentResult err = AudioUnitGetProperty( audioUnit, kAudioOutputUnitProperty_IsRunning, kAudioUnitScope_Global, element, &isRunning, &s );
++ OSStatus err = AudioUnitGetProperty( audioUnit, kAudioOutputUnitProperty_IsRunning, kAudioUnitScope_Global, element, &isRunning, &s );
+ if( err )
+ return err;
+ Pa_Sleep( 100 );
+Index: libs/portaudio/src/common/pa_types.h
+===================================================================
+--- libs/portaudio/src/common/pa_types.h (revision 14988)
++++ libs/portaudio/src/common/pa_types.h (working copy)
+@@ -62,7 +62,11 @@
+ #endif
+
+ #ifndef SIZEOF_LONG
++#ifdef __LP64__
++#define SIZEOF_LONG 8
++#else
+ #define SIZEOF_LONG 4
++#endif /* __LP64__ */
+ #endif
+
+
+Index: libs/libsndfile/M4/ltsugar.m4
+===================================================================
+--- libs/libsndfile/M4/ltsugar.m4 (revision 14988)
++++ libs/libsndfile/M4/ltsugar.m4 (working copy)
+@@ -1,13 +1,13 @@
+ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+ #
+-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+-# Written by Gary V. Vaughan, 2004
++# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
++# Written by Gary V. Vaughan, 2004
+ #
+ # This file is free software; the Free Software Foundation gives
+ # unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+
+-# serial 6 ltsugar.m4
++# serial 5 ltsugar.m4
+
+ # This is to help aclocal find these macros, as it can't see m4_define.
+ AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+@@ -63,14 +63,14 @@
+ # Produce a SEP delimited list of all paired combinations of elements of
+ # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
+ # has the form PREFIXmINFIXSUFFIXn.
+-# Needed until we can rely on m4_combine added in Autoconf 2.62.
+ m4_define([lt_combine],
+-[m4_if(m4_eval([$# > 3]), [1],
+- [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+-[[m4_foreach([_Lt_prefix], [$2],
+- [m4_foreach([_Lt_suffix],
+- ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+- [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
++[m4_if([$2], [], [],
++ [m4_if([$4], [], [],
++ [lt_join(m4_quote(m4_default([$1], [[, ]])),
++ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
++ [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
++ [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
++])
+
+
+ # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+Index: libs/libsndfile/M4/ltversion.m4
+===================================================================
+--- libs/libsndfile/M4/ltversion.m4 (revision 14988)
++++ libs/libsndfile/M4/ltversion.m4 (working copy)
+@@ -9,15 +9,15 @@
+
+ # Generated from ltversion.in.
+
+-# serial 3012 ltversion.m4
++# serial 2976 ltversion.m4
+ # This file is part of GNU Libtool
+
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
++m4_define([LT_PACKAGE_VERSION], [2.2.4])
++m4_define([LT_PACKAGE_REVISION], [1.2976])
+
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.6'
+-macro_revision='1.3012'
++[macro_version='2.2.4'
++macro_revision='1.2976'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+Index: libs/libsndfile/M4/ltoptions.m4
+===================================================================
+--- libs/libsndfile/M4/ltoptions.m4 (revision 14988)
++++ libs/libsndfile/M4/ltoptions.m4 (working copy)
+@@ -125,7 +125,7 @@
+ [enable_win32_dll=yes
+
+ case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
++*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
</ins></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>