<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a53352e74756ee902814c6f1cc8c312e1f0d3a63">https://github.com/macports/macports-ports/commit/a53352e74756ee902814c6f1cc8c312e1f0d3a63</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 a53352e7475 csound: update to 6.18.1
</span>a53352e7475 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a53352e74756ee902814c6f1cc8c312e1f0d3a63
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jul 29 05:28:31 2023 +1000
<span style='display:block; white-space:pre;color:#404040;'> csound: update to 6.18.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/45560
</span>---
audio/csound/Portfile | 93 ++++++--------
audio/csound/files/CoreMIDI_case.patch | 22 ----
audio/csound/files/InOut_widgets.cpp.patch | 11 --
audio/csound/files/MAC_OS_X_VERSION.patch | 22 ++++
audio/csound/files/SConstruct.patch | 175 --------------------------
audio/csound/files/custom-osx.py.patch | 31 -----
audio/csound/files/pluginSDK_SConstruct.patch | 48 -------
7 files changed, 58 insertions(+), 344 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/csound/Portfile b/audio/csound/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 97aec76a8c1..4d66e2d8912 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/csound/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/csound/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name csound
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch 5.16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version ${branch}.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup csound csound 6.18.1
</span> categories audio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license LGPL-2.1+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,62 +18,42 @@ long_description Csound is a computer programming language for dealing with \
</span> based on an earlier language called Music360.
homepage http://www.csounds.com/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/csound/csound5/csound${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname Csound${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# no bz2 for 5.16.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 bfca0a5e521781e253fe8ae457bbb9c3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 28bbf5d34ee5bb11dc1d50fb122b5a706d317c33 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 49f3f7af3cfca6e129750564822698f4d2433329
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3702ec791eb5f98f807aed6ec3de7f4eb9deab77 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b84be8237fa9258ef60fdddf36fae27b20c11665811bf5ed12540da9a9a4414e
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:scons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:bin/fltk-config:fltk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span> port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsndfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bison
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fltk is 32-bit only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs i386 ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles SConstruct.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pluginSDK_SConstruct.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- custom-osx.py.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- InOut_widgets.cpp.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CoreMIDI_case.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:liblo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsndfile
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/custom-osx.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__CFLAGS__|${configure.cflags}|" ${worksrcpath}/custom-osx.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__CXXFLAGS__|${configure.cxxflags}|" ${worksrcpath}/custom-osx.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__ARCHFLAGS__|'[join ${configure.cc_archflags} "', '"]'|" ${worksrcpath}/custom-osx.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__FRAMEWORKS_DIR__|${frameworks_dir}|g" ${worksrcpath}/SConstruct
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/custom-osx.py ${worksrcpath}/custom.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles MAC_OS_X_VERSION.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DFAIL_MISSING=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_DSSI_OPCODES=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_JAVA_INTERFACE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_LUA_INTERFACE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCS_FRAMEWORK_DEST=${frameworks_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_ALSA=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_JACK=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_PORTAUDIO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_PORTMIDI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_PULSEAUDIO=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description "Build tests" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:cunit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DBUILD_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_TESTS=ON
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ${prefix}/bin/scons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usePortAudio=0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usePortMIDI=0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- useJack=0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- useFLTK=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buildCsound5GUI=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buildRelease=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dynamicCsoundLibrary=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- instdir=${destroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.post_args install=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args ${build.args}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target install=1 install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/frontends/fltk_gui/Csound5GUI.app \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: fltk functionality has moved to a separate 'plugins' repo upstream.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Ports could be created for some or all of those plugins if desired.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/csound/files/CoreMIDI_case.patch b/audio/csound/files/CoreMIDI_case.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a13c0abca96..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/csound/files/CoreMIDI_case.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- InOut/cmidi.c.orig 2012-02-13 18:17:02.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ InOut/cmidi.c 2012-03-08 16:00:12.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Realtime MIDI using coremidi */
</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;'>--#include <CoreMidi/CoreMidi.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreMIDI/CoreMIDI.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreAudio/HostTime.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "csdl.h" /* CMIDI.C */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- InOut/rtauhal.c.orig 2012-02-13 18:17:02.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ InOut/rtauhal.c 2012-03-08 16:01:16.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 02111-1307 USA
</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;'>--#include <CoreMidi/CoreMidi.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreMIDI/CoreMIDI.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AudioUnit/AudioUnit.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreAudio/AudioHardware.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/csound/files/InOut_widgets.cpp.patch b/audio/csound/files/InOut_widgets.cpp.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 38622b89e15..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/csound/files/InOut_widgets.cpp.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- InOut/widgets.cpp.orig 2012-02-13 18:17:02.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ InOut/widgets.cpp 2012-03-08 08:52:23.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <FL/Fl_Output.H>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "widglobals.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* this macro breaks carbon headers */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef DP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <FL/x.H>
</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;color:#808080;'>diff --git a/audio/csound/files/MAC_OS_X_VERSION.patch b/audio/csound/files/MAC_OS_X_VERSION.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fb3fed50777
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/csound/files/MAC_OS_X_VERSION.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Top/threads.c.orig 2022-11-24 06:53:55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Top/threads.c 2023-07-29 05:20:35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1058,7 +1058,7 @@ int csoundSpinLockInit(spin_lock_t *spinlock) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(MACOSX) // MacOS native locks
</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 >= MAC_OS_X_VERSION_10_12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // New spinlock interface
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void csoundSpinLock(spin_lock_t *spinlock){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/sysdep.h.orig 2022-11-24 06:53:55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/sysdep.h 2023-07-29 05:22:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -535,7 +535,7 @@ typedef int32_t spin_lock_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SPINLOCK_INIT 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(MACOSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <os/lock.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct os_unfair_lock_s spin_lock_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SPINLOCK_INIT {0}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/csound/files/SConstruct.patch b/audio/csound/files/SConstruct.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5b0a18af7ac..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/csound/files/SConstruct.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,175 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- SConstruct.orig 2012-02-13 18:17:02.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ SConstruct 2012-03-08 15:57:06.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -353,6 +353,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fileOptions.Add('customLIBS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fileOptions.Add('customLIBPATH')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fileOptions.Add('customSHLINKFLAGS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fileOptions.Add('customLINKFLAGS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fileOptions.Add('customSWIGFLAGS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fileOptions.Update(commonEnvironment)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -368,6 +369,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Prepend(LIBPATH = customLIBPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- customSHLINKFLAGS = commonEnvironment['customSHLINKFLAGS']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Prepend(SHLINKFLAGS = customSHLINKFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+customLINKFLAGS = commonEnvironment['customLINKFLAGS']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+commonEnvironment.Prepend(LINKFLAGS = customLINKFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- customSWIGFLAGS = commonEnvironment['customSWIGFLAGS']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Prepend(SWIGFLAGS = customSWIGFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -475,7 +478,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if commonEnvironment['Word64'] == '1':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if compilerSun():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -510,7 +513,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif getPlatform() == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Append(CCFLAGS = "-DMACOSX")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- commonEnvironment.Append(CPPPATH = '/usr/local/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Append(CCFLAGS = "-DPIPES")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if commonEnvironment['useAltivec'] == '1':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print 'CONFIGURATION DECISION: Using Altivec optimisation'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -929,7 +931,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csoundLibraryEnvironment.Append(CPPFLAGS = [s])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif buildOSXFramework != 0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tmp = '/Library/Frameworks/%s' % OSXFrameworkCurrentVersion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp = '__FRAMEWORKS_DIR__/%s' % OSXFrameworkCurrentVersion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmp += '/Resources/Opcodes'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if commonEnvironment['useDouble'] != '0':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmp += '64'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1026,7 +1028,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.symlink(i[1], '%s/%s' % (OSXFrameworkBaseDir, i[0]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def MacOSX_InstallHeader(headerName):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if not buildOSXFramework:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not buildOSXFramework or commonEnvironment['install'] != '1':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- baseName = headerName[(headerName.rfind('/') + 1):]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- targetName = '%s/Headers/%s' % (OSXFrameworkCurrentVersion, baseName)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1038,8 +1040,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csoundFrameworkEnvironment.Command(targetName, headerName, cmd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def MacOSX_InstallPlugin(fileName):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if buildOSXFramework:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- print "COPYINNG plugin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if buildOSXFramework and commonEnvironment['install'] == '1':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print "COPYING plugin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pluginDir = '%s/Resources/Opcodes' % OSXFrameworkCurrentVersion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if commonEnvironment['useDouble'] != '0':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pluginDir += '64'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1227,6 +1229,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libCsoundSources += newParserSources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csoundLibraryEnvironment.Append(CCFLAGS='-fPIC')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+append_csoundLibrary_to_libs = True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if commonEnvironment['dynamicCsoundLibrary'] == '1':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print 'CONFIGURATION DECISION: Building dynamic Csound library'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if getPlatform() == 'linux' or getPlatform() == 'sunos':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1256,7 +1259,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Xlinker -current_version -Xlinker %s
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ''' % libVersion))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csoundFrameworkEnvironment.Append(SHLINKFLAGS = Split('''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -install_name /Library/Frameworks/%s/%s
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -install_name __FRAMEWORKS_DIR__/%s/%s
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ''' % (OSXFrameworkCurrentVersion, libName)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csoundLibraryFile = csoundFrameworkEnvironment.SharedLibrary(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libName, libCsoundSources, SHLIBPREFIX = '', SHLIBSUFFIX = '')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1266,10 +1269,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'cp -f %s %s/' % (libName, OSXFrameworkCurrentVersion))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for i in headers:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MacOSX_InstallHeader(i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CsoundLib_install_path = '%s__FRAMEWORKS_DIR__/%s' % (commonEnvironment['instdir'], OSXFrameworkBaseDir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if commonEnvironment['install'] == '1':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CsoundLib_install_cmd = 'rm -r CsoundLib_install_path; cp -R %s %s__FRAMEWORKS_DIR__/' % (OSXFrameworkBaseDir, commonEnvironment['instdir'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CsoundLib_install_cmd = 'true'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csoundLibrary = csoundFrameworkEnvironment.Command(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'CsoundLib_install',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'CsoundLib.framework',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libName,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'rm -r /Library/Frameworks/%s; cp -R %s /Library/Frameworks/' % (OSXFrameworkBaseDir, OSXFrameworkBaseDir))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CsoundLib_install_cmd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ append_csoundLibrary_to_libs = False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libCsoundLinkFlags += ['-F.', '-framework', libName, '-lsndfile']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libCsoundLibs = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif getPlatform() == 'win32':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1290,15 +1299,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libCsoundLibs.insert(0,csoundLibrary)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif getPlatform() == 'win32' or (getPlatform() == 'darwin' and commonEnvironment['dynamicCsoundLibrary']=='0'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libCsoundLibs.append(csoundLibraryName)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libs.append(csoundLibrary)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if append_csoundLibrary_to_libs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ libs.append(csoundLibrary)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pluginEnvironment = commonEnvironment.Clone()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pluginEnvironment.Append(LIBS = Split('sndfile'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if getPlatform() == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pluginEnvironment.Append(LINKFLAGS = Split('''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -framework CoreMidi -framework CoreFoundation -framework CoreServices -framework CoreAudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '''))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Append is behaving like AppendUnique and eating "duplicate" -framework args for some reason...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for f in ['CoreMIDI', 'CoreFoundation', 'CoreServices', 'CoreAudio']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pluginEnvironment.Append(FRAMEWORKS = [f])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # pluginEnvironment.Append(LINKFLAGS = ['-dynamiclib'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pluginEnvironment['SHLIBSUFFIX'] = '.dylib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # pluginEnvironment.Prepend(CXXFLAGS = "-fno-rtti")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1402,14 +1412,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csoundInterfacesEnvironment.Append(SHLINKFLAGS = Split(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '''-Xlinker -current_version -Xlinker %s''' % ilibVersion))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmp = '''-install_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /Library/Frameworks/%s/%s'''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __FRAMEWORKS_DIR__/%s/%s'''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csoundInterfacesEnvironment.Append(SHLINKFLAGS = Split(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmp % (OSXFrameworkCurrentVersion,ilibName)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csnd = csoundInterfacesEnvironment.SharedLibrary(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '_csnd', csoundInterfacesSources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try: os.symlink('lib_csnd.dylib', 'libcsnd.dylib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except: pass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- csoundInterfacesEnvironment.Command('interfaces install', csnd, "cp lib_csnd.dylib /Library/Frameworks/%s/lib_csnd.dylib" % (OSXFrameworkCurrentVersion))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ csoundInterfacesEnvironment.Command('interfaces install', csnd, "cp lib_csnd.dylib __FRAMEWORKS_DIR__/%s/lib_csnd.dylib" % (OSXFrameworkCurrentVersion))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csnd = csoundInterfacesEnvironment.Library('csnd', csoundInterfacesSources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif getPlatform() == 'linux':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1826,7 +1836,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vstEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- guiProgramEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if getPlatform() == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- csoundProgramEnvironment.Append(LINKFLAGS = Split('''-framework Carbon -framework CoreAudio -framework CoreMidi'''))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for f in ['Carbon', 'CoreAudio', 'CoreMIDI']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ csoundProgramEnvironment.Append(FRAMEWORKS = [f])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (not (commonEnvironment['useFLTK'] == '1' and fltkFound)):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print 'CONFIGURATION DECISION: Not building with FLTK graphs and widgets.'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2009,7 +2020,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vst4Environment = vstEnvironment.Clone()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vst4Environment.Append(LIBS = ['fltk'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vst4Environment.Append(LIBS = ['stdc++'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vst4Environment.Append(LINKFLAGS=['-framework', 'carbon', '-framework',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vst4Environment.Append(LINKFLAGS=['-framework', 'Carbon', '-framework',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'ApplicationServices'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vst4Environment.Append(CPPPATH = ['frontends/CsoundVST'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vst4Environment.Append(CPPFLAGS = ['-DCS_VSTHOST'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2193,7 +2204,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- luaEnvironment['ENV']['PATH'] = os.environ['PATH']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif getPlatform() == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- luaEnvironment.Append(LIBS = 'luajit-51')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- luaEnvironment.Append(CPPPATH = '/usr/local/include/luajit-2.0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- luaEnvironment.Append(CPPFLAGS = '-fopenmp')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- luaOpcodes = makePlugin(luaEnvironment, 'LuaCsound',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ['Opcodes/LuaCsound.cpp'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2753,7 +2763,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csWinEnvironment.Append(CXXFLAGS = ['-fno-rtti'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csWinEnvironment.Append(LIBS = ['fltk', 'stdc++', 'pthread', 'm'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- csWinEnvironment.Append(LINKFLAGS = Split('''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -framework Carbon -framework CoreAudio -framework CoreMidi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -framework Carbon -framework CoreAudio -framework CoreMIDI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -framework ApplicationServices
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '''))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- appDir = 'frontends/winsound/Winsound.app/Contents/MacOS'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/csound/files/custom-osx.py.patch b/audio/csound/files/custom-osx.py.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fdda1f655c9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/csound/files/custom-osx.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- custom-osx.py.orig 2012-02-13 18:17:02.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ custom-osx.py 2012-03-08 08:39:20.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,13 +7,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--customCPPPATH = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--customCCFLAGS = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+customCPPPATH = ['__PREFIX__/include']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+customCCFLAGS = ['__CFLAGS__', __ARCHFLAGS__]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- customCCPFLAGS = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--customCXXFLAGS = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+customCXXFLAGS = ['__CXXFLAGS__', __ARCHFLAGS__]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- customLIBS = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--customLIBPATH = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+customLIBPATH = ['__PREFIX__/lib']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- customSHLINKFLAGS = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+customLINKFLAGS = [__ARCHFLAGS__]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- customSWIGFLAGS = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## This seems to do nothing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,9 +27,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- customCCFLAGS.append('-I/usr/local/include/libcwiimote-0.4.0/libcwiimote')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform = 'darwin'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- customCPPPATH.append('/usr/include/malloc')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- customCPPPATH.append('/opt/local/include/boost-1_32/')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- customCPPPATH.append('/usr/include/python2.3')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- customCXXFLAGS.append('-fabi-version=0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif sys.platform[:3] == 'win':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For the basic build you need MinGW, MSys, and libsndfile.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/csound/files/pluginSDK_SConstruct.patch b/audio/csound/files/pluginSDK_SConstruct.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5c110b87242..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/csound/files/pluginSDK_SConstruct.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pluginSDK/SConstruct.orig 2012-02-13 18:17:02.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pluginSDK/SConstruct 2012-03-08 15:57:17.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,6 +87,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opts.Add('customLIBS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opts.Add('customLIBPATH')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opts.Add('customSHLINKFLAGS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+opts.Add('customLINKFLAGS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opts.Add('customSWIGFLAGS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opts.Add('useDouble',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'Set to 1 to use double-precision floating point for audio samples.',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,6 +136,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Prepend(LIBPATH = customLIBPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- customSHLINKFLAGS = commonEnvironment['customSHLINKFLAGS']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Prepend(SHLINKFLAGS = customSHLINKFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+customLINKFLAGS = commonEnvironment['customLINKFLAGS']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+commonEnvironment.Prepend(LINKFLAGS = customLINKFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- customSWIGFLAGS = commonEnvironment['customSWIGFLAGS']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Prepend(SWIGFLAGS = customSWIGFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -192,7 +195,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Append(CCFLAGS = ['-fPIC'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ commonEnvironment.Prepend(LIBPATH = ['.', '#.'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if commonEnvironment['useDouble'] == '0':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print 'CONFIGURATION DECISION: Using single-precision floating point for audio samples.'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -214,7 +217,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif getPlatform() == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Append(CCFLAGS = "-DMACOSX")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- commonEnvironment.Append(CPPPATH = '/usr/local/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commonEnvironment.Append(CCFLAGS = "-DPIPES")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if commonEnvironment['useAltivec'] == '1':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print 'CONFIGURATION DECISION using Altivec optmisation'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -278,9 +280,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pluginEnvironment.Append(LIBS = ['sndfile'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if getPlatform() == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pluginEnvironment.Append(LINKFLAGS = Split('''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -framework CoreMidi -framework CoreFoundation -framework CoreAudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '''))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for f in ['CoreMIDI', 'CoreFoundation', 'CoreAudio']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pluginEnvironment.Append(FRAMEWORKS = [f])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # pluginEnvironment.Append(LINKFLAGS = ['-dynamiclib'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pluginEnvironment['SHLIBSUFFIX'] = '.dylib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pluginEnvironment.Prepend(CXXFLAGS = "-fno-rtti")
</span></pre><pre style='margin:0'>
</pre>