diff options
| author | sbd <sbd> | 2012-06-27 21:26:28 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2012-06-27 21:26:28 +0000 |
| commit | 2a9166ea0d663a0c0b7c595e8bdf05d30c20a8c4 (patch) | |
| tree | 624d5d31a6c586e34623b8df68e3b6fc6e96934f /audio/csound5 | |
| parent | 8163f82cfce89de8ff202d16a68f7770daca19d0 (diff) | |
| download | pkgsrc-2a9166ea0d663a0c0b7c595e8bdf05d30c20a8c4.tar.gz | |
On Linux use the pkgsrc supplied CFLAGS/CXXFLAGS/LDFLAGS.
Diffstat (limited to 'audio/csound5')
| -rw-r--r-- | audio/csound5/distinfo | 4 | ||||
| -rw-r--r-- | audio/csound5/patches/patch-ac | 21 |
2 files changed, 20 insertions, 5 deletions
diff --git a/audio/csound5/distinfo b/audio/csound5/distinfo index ec43de5c9ae..52d23327697 100644 --- a/audio/csound5/distinfo +++ b/audio/csound5/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.8 2012/02/07 21:17:49 sbd Exp $ +$NetBSD: distinfo,v 1.9 2012/06/27 21:26:28 sbd Exp $ SHA1 (Csound5.01_src.tar.gz) = b387da9b6c24961397e89ddcedd1229cdfebffe7 RMD160 (Csound5.01_src.tar.gz) = 24652f8f650464d886f6d537ae991654f475ad4a Size (Csound5.01_src.tar.gz) = 2031426 bytes -SHA1 (patch-ac) = 686530ade67f637ccbd0286fa689af920773cd13 +SHA1 (patch-ac) = fc7e0d3c32f7fc117c5ea40bda7b0a7e9f9def7b SHA1 (patch-ad) = 343b5767584cf4ddfbc7664e3234577fe22ff03a SHA1 (patch-ae) = 705d56ce7a03cd10763542a9ec71b393474c0595 SHA1 (patch-af) = 4444b8efe47a401e01718c21197c2b6e19ec548c diff --git a/audio/csound5/patches/patch-ac b/audio/csound5/patches/patch-ac index d33df92daaa..6ee4021578a 100644 --- a/audio/csound5/patches/patch-ac +++ b/audio/csound5/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.5 2012/02/07 21:17:49 sbd Exp $ +$NetBSD: patch-ac,v 1.6 2012/06/27 21:26:28 sbd Exp $ --- SConstruct.orig 2006-03-15 15:22:43.000000000 +0000 +++ SConstruct @@ -22,6 +22,21 @@ $NetBSD: patch-ac,v 1.5 2012/02/07 21:17:49 sbd Exp $ customCPPPATH = commonEnvironment['customCPPPATH'] commonEnvironment.Prepend(CPPPATH = customCPPPATH) +@@ -285,11 +289,11 @@ if commonEnvironment['MSVC'] == '0': + + if getPlatform() == 'linux': + commonEnvironment.Append(CCFLAGS = "-DLINUX") +- commonEnvironment.Append(CPPPATH = '/usr/local/include') +- commonEnvironment.Append(CPPPATH = '/usr/include') +- commonEnvironment.Append(CPPPATH = '/usr/X11R6/include') + commonEnvironment.Append(CCFLAGS = "-DPIPES") + commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic']) ++ commonEnvironment.Append(CCFLAGS = Split(os.environ['CFLAGS'])) ++ commonEnvironment.Append(CXXFLAGS = Split(os.environ['CXXFLAGS'])) ++ commonEnvironment.Append(LINKFLAGS = Split(os.environ['LDFLAGS'])) + elif getPlatform() == 'darwin': + commonEnvironment.Append(CCFLAGS = "-DMACOSX") + commonEnvironment.Append(CPPPATH = '/usr/local/include') @@ -335,6 +339,15 @@ elif getPlatform() == 'mingw': pythonLinkFlags = [] pythonLibraryPath = [] @@ -47,7 +62,7 @@ $NetBSD: patch-ac,v 1.5 2012/02/07 21:17:49 sbd Exp $ csoundLibraryName += '64' # flags for linking with the Csound library libCsoundLinkFlags = [] -@@ -526,6 +539,12 @@ if commonEnvironment['buildRelease'] != +@@ -526,6 +539,12 @@ if commonEnvironment['buildRelease'] != tmp += '64' s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp csoundLibraryEnvironment.Append(CPPFLAGS = [s]) @@ -116,7 +131,7 @@ $NetBSD: patch-ac,v 1.5 2012/02/07 21:17:49 sbd Exp $ makePlugin(widgetsEnvironment, 'widgets', ['InOut/FL_graph.cpp', 'InOut/winFLTK.c', 'InOut/widgets.cpp']) -@@ -1060,7 +1099,11 @@ if not (commonEnvironment['useALSA'] == +@@ -1060,7 +1099,11 @@ if not (commonEnvironment['useALSA'] == else: print "CONFIGURATION DECISION: Building ALSA plugin." alsaEnvironment = pluginEnvironment.Copy() |