[90524] trunk/dports/audio/csound

jmr at macports.org jmr at macports.org
Wed Mar 7 21:06:29 PST 2012


Revision: 90524
          http://trac.macports.org/changeset/90524
Author:   jmr at macports.org
Date:     2012-03-07 21:06:29 -0800 (Wed, 07 Mar 2012)
Log Message:
-----------
csound: fix case of CoreMIDI

Modified Paths:
--------------
    trunk/dports/audio/csound/Portfile
    trunk/dports/audio/csound/files/SConstruct.patch
    trunk/dports/audio/csound/files/pluginSDK_SConstruct.patch

Added Paths:
-----------
    trunk/dports/audio/csound/files/CoreMIDI_case.patch

Modified: trunk/dports/audio/csound/Portfile
===================================================================
--- trunk/dports/audio/csound/Portfile	2012-03-08 05:04:28 UTC (rev 90523)
+++ trunk/dports/audio/csound/Portfile	2012-03-08 05:06:29 UTC (rev 90524)
@@ -32,7 +32,7 @@
 supported_archs i386 ppc
 
 patchfiles     SConstruct.patch pluginSDK_SConstruct.patch \
-               custom-osx.py.patch InOut_widgets.cpp.patch
+               custom-osx.py.patch InOut_widgets.cpp.patch CoreMIDI_case.patch
 post-patch {
     reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/custom-osx.py
     reinplace "s|__CFLAGS__|${configure.cflags}|" ${worksrcpath}/custom-osx.py

Added: trunk/dports/audio/csound/files/CoreMIDI_case.patch
===================================================================
--- trunk/dports/audio/csound/files/CoreMIDI_case.patch	                        (rev 0)
+++ trunk/dports/audio/csound/files/CoreMIDI_case.patch	2012-03-08 05:06:29 UTC (rev 90524)
@@ -0,0 +1,22 @@
+--- InOut/cmidi.c.orig	2012-02-13 18:17:02.000000000 +1100
++++ InOut/cmidi.c	2012-03-08 16:00:12.000000000 +1100
+@@ -24,7 +24,7 @@
+ /* Realtime MIDI using coremidi */
+ 
+ 
+-#include <CoreMidi/CoreMidi.h>
++#include <CoreMIDI/CoreMIDI.h>
+ #include <CoreAudio/HostTime.h>
+ #include <CoreFoundation/CoreFoundation.h>
+ #include "csdl.h"                               /*      CMIDI.C         */
+--- InOut/rtauhal.c.orig	2012-02-13 18:17:02.000000000 +1100
++++ InOut/rtauhal.c	2012-03-08 16:01:16.000000000 +1100
+@@ -21,7 +21,7 @@
+   02111-1307 USA
+ */
+ 
+-#include <CoreMidi/CoreMidi.h>
++#include <CoreMIDI/CoreMIDI.h>
+ #include <AudioUnit/AudioUnit.h>
+ #include <CoreAudio/AudioHardware.h>
+ #include <CoreFoundation/CoreFoundation.h>

Modified: trunk/dports/audio/csound/files/SConstruct.patch
===================================================================
--- trunk/dports/audio/csound/files/SConstruct.patch	2012-03-08 05:04:28 UTC (rev 90523)
+++ trunk/dports/audio/csound/files/SConstruct.patch	2012-03-08 05:06:29 UTC (rev 90524)
@@ -1,5 +1,5 @@
 --- SConstruct.orig	2012-02-13 18:17:02.000000000 +1100
-+++ SConstruct	2012-03-08 11:36:17.000000000 +1100
++++ SConstruct	2012-03-08 15:57:06.000000000 +1100
 @@ -353,6 +353,7 @@
  fileOptions.Add('customLIBS')
  fileOptions.Add('customLIBPATH')
@@ -115,7 +115,7 @@
 -        -framework CoreMidi -framework CoreFoundation -framework CoreServices -framework CoreAudio
 -    '''))
 +    # Append is behaving like AppendUnique and eating "duplicate" -framework args for some reason...
-+    for f in ['CoreMidi', 'CoreFoundation', 'CoreServices', 'CoreAudio']:
++    for f in ['CoreMIDI', 'CoreFoundation', 'CoreServices', 'CoreAudio']:
 +        pluginEnvironment.Append(FRAMEWORKS = [f])
      # pluginEnvironment.Append(LINKFLAGS = ['-dynamiclib'])
      pluginEnvironment['SHLIBSUFFIX'] = '.dylib'
@@ -142,7 +142,7 @@
      guiProgramEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
      if getPlatform() == 'darwin':
 -        csoundProgramEnvironment.Append(LINKFLAGS = Split('''-framework Carbon -framework CoreAudio -framework CoreMidi'''))
-+        for f in ['Carbon', 'CoreAudio', 'CoreMidi']:
++        for f in ['Carbon', 'CoreAudio', 'CoreMIDI']:
 +            csoundProgramEnvironment.Append(FRAMEWORKS = [f])
  
  if (not (commonEnvironment['useFLTK'] == '1' and fltkFound)):
@@ -164,3 +164,12 @@
          luaEnvironment.Append(CPPFLAGS = '-fopenmp')
      luaOpcodes = makePlugin(luaEnvironment, 'LuaCsound',
                                 ['Opcodes/LuaCsound.cpp'])
+@@ -2753,7 +2763,7 @@
+         csWinEnvironment.Append(CXXFLAGS = ['-fno-rtti'])
+         csWinEnvironment.Append(LIBS = ['fltk', 'stdc++', 'pthread', 'm'])
+         csWinEnvironment.Append(LINKFLAGS = Split('''
+-            -framework Carbon -framework CoreAudio -framework CoreMidi
++            -framework Carbon -framework CoreAudio -framework CoreMIDI
+             -framework ApplicationServices
+         '''))
+         appDir = 'frontends/winsound/Winsound.app/Contents/MacOS'

Modified: trunk/dports/audio/csound/files/pluginSDK_SConstruct.patch
===================================================================
--- trunk/dports/audio/csound/files/pluginSDK_SConstruct.patch	2012-03-08 05:04:28 UTC (rev 90523)
+++ trunk/dports/audio/csound/files/pluginSDK_SConstruct.patch	2012-03-08 05:06:29 UTC (rev 90524)
@@ -1,5 +1,5 @@
 --- pluginSDK/SConstruct.orig	2012-02-13 18:17:02.000000000 +1100
-+++ pluginSDK/SConstruct	2012-03-08 11:34:58.000000000 +1100
++++ pluginSDK/SConstruct	2012-03-08 15:57:17.000000000 +1100
 @@ -87,6 +87,7 @@
  opts.Add('customLIBS')
  opts.Add('customLIBPATH')
@@ -41,7 +41,7 @@
 -    pluginEnvironment.Append(LINKFLAGS = Split('''
 -        -framework CoreMidi -framework CoreFoundation -framework CoreAudio
 -    '''))
-+    for f in ['CoreMidi', 'CoreFoundation', 'CoreAudio']:
++    for f in ['CoreMIDI', 'CoreFoundation', 'CoreAudio']:
 +        pluginEnvironment.Append(FRAMEWORKS = [f])
      # pluginEnvironment.Append(LINKFLAGS = ['-dynamiclib'])
      pluginEnvironment['SHLIBSUFFIX'] = '.dylib'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120307/838784fb/attachment-0001.html>


More information about the macports-changes mailing list