[78554] trunk/dports/audio/portaudio
ryandesign at macports.org
ryandesign at macports.org
Wed May 11 15:55:56 PDT 2011
Revision: 78554
http://trac.macports.org/changeset/78554
Author: ryandesign at macports.org
Date: 2011-05-11 15:55:56 -0700 (Wed, 11 May 2011)
Log Message:
-----------
portaudio: reinstate the patches removed in r78549; see #29431
Revision Links:
--------------
http://trac.macports.org/changeset/78549
Modified Paths:
--------------
trunk/dports/audio/portaudio/Portfile
trunk/dports/audio/portaudio/files/patch-configure
trunk/dports/audio/portaudio/files/patch-src__hostapi__coreaudio__pa_mac_core.c
Added Paths:
-----------
trunk/dports/audio/portaudio/files/
Modified: trunk/dports/audio/portaudio/Portfile
===================================================================
--- trunk/dports/audio/portaudio/Portfile 2011-05-11 22:35:00 UTC (rev 78553)
+++ trunk/dports/audio/portaudio/Portfile 2011-05-11 22:55:56 UTC (rev 78554)
@@ -5,6 +5,7 @@
name portaudio
version 19.20110326
+revision 1
categories audio devel
platforms macosx
maintainers nomaintainer
@@ -36,6 +37,15 @@
worksrcdir ${name}
+patchfiles patch-configure \
+ patch-src__common__pa_types.h
+
+configure.args --disable-mac-universal
+
+platform darwin 10 {
+ patchfiles-append patch-src__hostapi__coreaudio__pa_mac_core.c
+}
+
use_parallel_build yes
post-destroot {
Modified: trunk/dports/audio/portaudio/files/patch-configure
===================================================================
--- trunk/dports/audio/portaudio/files/patch-configure 2011-05-01 23:13:14 UTC (rev 78301)
+++ trunk/dports/audio/portaudio/files/patch-configure 2011-05-11 22:55:56 UTC (rev 78554)
@@ -1,26 +1,19 @@
---- configure.orig 2007-11-13 13:22:56.000000000 -0800
-+++ configure 2009-07-16 12:34:11.000000000 -0700
-@@ -20452,7 +20452,6 @@
- echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
- echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+--- configure.orig 2011-03-25 11:59:27.000000000 -0500
++++ configure 2011-05-11 17:50:26.000000000 -0500
+@@ -11213,7 +11213,6 @@
+
+
cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
-@@ -20665,13 +20664,8 @@
- #define PA_USE_COREAUDIO 1
- _ACEOF
+@@ -11322,7 +11321,7 @@
+ $as_echo "#define PA_USE_COREAUDIO 1" >>confdefs.h
-- if [ -d /Developer/SDKs/MacOSX10.5.sdk ] ; then
-- SHARED_FLAGS="-Werror -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3";
-- CFLAGS="-Werror $CFLAGS -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3";
-- else
-- SHARED_FLAGS="-Werror -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3";
-- CFLAGS="-Werror $CFLAGS -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3";
-- fi
-+ SHARED_FLAGS="-Werror -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib";
-+ CFLAGS="-Werror -Wno-deprecated-declarations $CFLAGS";
- OTHER_OBJS="src/os/mac_osx/pa_mac_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";
- LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon";
- PADLL="libportaudio.dylib";
+
+- CFLAGS="$CFLAGS -Werror"
++ CFLAGS="$CFLAGS -Werror -Wno-deprecated-declarations";
+ LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
+
+ if test "x$enable_mac_universal" = "xyes" ; then
Modified: trunk/dports/audio/portaudio/files/patch-src__hostapi__coreaudio__pa_mac_core.c
===================================================================
--- trunk/dports/audio/portaudio/files/patch-src__hostapi__coreaudio__pa_mac_core.c 2011-05-01 23:13:14 UTC (rev 78301)
+++ trunk/dports/audio/portaudio/files/patch-src__hostapi__coreaudio__pa_mac_core.c 2011-05-11 22:55:56 UTC (rev 78554)
@@ -1,6 +1,6 @@
---- src/hostapi/coreaudio/pa_mac_core.c.orig 2007-11-13 13:22:56.000000000 -0800
-+++ src/hostapi/coreaudio/pa_mac_core.c 2009-07-16 13:05:49.000000000 -0700
-@@ -801,8 +801,8 @@
+--- src/hostapi/coreaudio/pa_mac_core.c.orig 2011-02-28 17:56:48.000000000 -0600
++++ src/hostapi/coreaudio/pa_mac_core.c 2011-05-11 17:01:06.000000000 -0500
+@@ -880,8 +880,8 @@
const double sampleRate,
void *refCon )
{
@@ -11,7 +11,7 @@
/*An Apple TN suggests using CAStreamBasicDescription, but that is C++*/
AudioStreamBasicDescription desiredFormat;
OSStatus result = noErr;
-@@ -873,7 +873,7 @@
+@@ -952,7 +952,7 @@
desc.componentFlags = 0;
desc.componentFlagsMask = 0;
/* -- find the component -- */
@@ -20,7 +20,7 @@
if( !comp )
{
DBUG( ( "AUHAL component not found." ) );
-@@ -882,7 +882,7 @@
+@@ -961,7 +961,7 @@
return paUnanticipatedHostError;
}
/* -- open it -- */
@@ -29,7 +29,7 @@
if( result )
{
DBUG( ( "Failed to open AUHAL component." ) );
-@@ -1224,7 +1224,7 @@
+@@ -1308,7 +1308,7 @@
#undef ERR_WRAP
error:
@@ -38,8 +38,8 @@
*audioUnit = NULL;
if( result )
return PaMacCore_SetError( result, line, 1 );
-@@ -2146,13 +2146,13 @@
- xrunCallback );
+@@ -2293,13 +2293,13 @@
+ }
if( stream->outputUnit && stream->outputUnit != stream->inputUnit ) {
AudioUnitUninitialize( stream->outputUnit );
- CloseComponent( stream->outputUnit );
@@ -54,7 +54,7 @@
stream->inputUnit = NULL;
}
if( stream->inputRingBuffer.buffer )
-@@ -2211,12 +2211,12 @@
+@@ -2359,12 +2359,12 @@
// it's not clear from appl's docs that this really waits
// until all data is flushed.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110511/84859291/attachment.html>
More information about the macports-changes
mailing list