summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/csound5/Makefile15
-rw-r--r--audio/csound5/PLIST47
-rw-r--r--audio/csound5/distinfo35
-rw-r--r--audio/csound5/patches/patch-ac321
-rw-r--r--audio/csound5/patches/patch-ad28
-rw-r--r--audio/csound5/patches/patch-ae10
-rw-r--r--audio/csound5/patches/patch-af31
-rw-r--r--audio/csound5/patches/patch-ag13
-rw-r--r--audio/csound5/patches/patch-ah12
-rw-r--r--audio/csound5/patches/patch-ai62
-rw-r--r--audio/csound5/patches/patch-aj12
-rw-r--r--audio/csound5/patches/patch-al27
-rw-r--r--audio/csound5/patches/patch-am61
-rw-r--r--audio/csound5/patches/patch-an20
-rw-r--r--audio/csound5/patches/patch-ao18
-rw-r--r--audio/csound5/patches/patch-ap14
-rw-r--r--audio/csound5/patches/patch-install.py36
17 files changed, 374 insertions, 388 deletions
diff --git a/audio/csound5/Makefile b/audio/csound5/Makefile
index cb3ed3fc002..5b12b47061c 100644
--- a/audio/csound5/Makefile
+++ b/audio/csound5/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2014/01/25 10:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2014/02/13 10:10:06 mrg Exp $
-DISTNAME= Csound${CSOUND_VERSION}_src
+DISTNAME= Csound${CSOUND_VERSION}
PKGNAME= csound5-${CSOUND_VERSION}
-PKGREVISION= 18
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=csound/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=csound/csound5/Csound5.19/}
WRKSRC= ${WRKDIR}/Csound${CSOUND_VERSION}
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -12,12 +11,10 @@ HOMEPAGE= http://sourceforge.net/projects/csound/
COMMENT= Software synthesizer and sequencer
LICENSE= gnu-lgpl-v2.1 # or later
-CSOUND_VERSION= 5.01
+CSOUND_VERSION= 5.19.01
USE_LANGUAGES= c c++
CFLAGS+= -g -D__PKGSRC_PREFIX__=${PREFIX}/ -DBETA
BUILD_DEPENDS+= scons>=0.96:../../devel/scons
-# Severe LP64 problems
-#NOT_FOR_PLATFORM= ${LP64PLATFORMS}
SCONS= ${PREFIX}/bin/scons
SCONS_ARGS= -C ${WRKSRC} prefix=${PREFIX}
SCONS_ARGS+= buildDSSI=0 buildLoris=0 buildRelease=1
@@ -25,6 +22,9 @@ SCONS_ARGS+= useALSA=0 useJack=0 useOSC=0 usePortMIDI=0
SCONS_ARGS+= usePortAudio=0
SCONS_ARGS+= buildInterfaces=0
+# Has long files our tar doesn't understand.
+EXTRACT_USING= gtar
+
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 5.01
INSTALLATION_DIRS= bin
@@ -39,6 +39,7 @@ SUBST_SED.strip= -e 's/--strip-unneeded//g'
.endif
do-build:
+ cd ${WRKSRC} && if [ ! -f custom.py ]; then cp custom.py.mkg custom.py; fi
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS}
do-install:
diff --git a/audio/csound5/PLIST b/audio/csound5/PLIST
index c79c6431c4b..cc40f079224 100644
--- a/audio/csound5/PLIST
+++ b/audio/csound5/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2012/02/04 07:00:11 sbd Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/02/13 10:10:06 mrg Exp $
bin/csound5
include/csound5/CppSound.hpp
include/csound5/CsoundFile.hpp
include/csound5/OpcodeBase.hpp
include/csound5/cfgvar.h
+include/csound5/csPerfThread.hpp
include/csound5/cscore.h
include/csound5/csdl.h
include/csound5/csound.h
@@ -11,6 +12,8 @@ include/csound5/csound.hpp
include/csound5/csoundCore.h
include/csound5/cwindow.h
include/csound5/filebuilding.h
+include/csound5/float-version-double.h
+include/csound5/float-version.h
include/csound5/msg_attr.h
include/csound5/pstream.h
include/csound5/pvfileio.h
@@ -18,8 +21,10 @@ include/csound5/soundio.h
include/csound5/sysdep.h
include/csound5/text.h
include/csound5/version.h
+lib/csound5/atsa
lib/csound5/cs
lib/csound5/csb64enc
+lib/csound5/csbeats
lib/csound5/csound
lib/csound5/cvanal
lib/csound5/dnoise
@@ -35,26 +40,28 @@ lib/csound5/lpc_export
lib/csound5/lpc_import
lib/csound5/makecsd
lib/csound5/mixer
-lib/csound5/plugins/libbabo.so
-lib/csound5/plugins/libbarmodel.so
+lib/csound5/plugins/libampmidid.so
+lib/csound5/plugins/libcellular.so
lib/csound5/plugins/libcontrol.so
+lib/csound5/plugins/libcs_date.so
+lib/csound5/plugins/libcsladspa.so
+lib/csound5/plugins/libdoppler.so
+lib/csound5/plugins/libfareygen.so
lib/csound5/plugins/libfluidOpcodes.so
-lib/csound5/plugins/libftest.so
-lib/csound5/plugins/libgrain4.so
-lib/csound5/plugins/libhrtferX.so
-lib/csound5/plugins/libminmax.so
+lib/csound5/plugins/libfractalnoise.so
+lib/csound5/plugins/libimage.so
lib/csound5/plugins/libmixer.so
-lib/csound5/plugins/libmodal4.so
-lib/csound5/plugins/libphisem.so
-lib/csound5/plugins/libphysmod.so
-lib/csound5/plugins/libpitch.so
+lib/csound5/plugins/libplaterev.so
lib/csound5/plugins/libscansyn.so
-lib/csound5/plugins/libsfont.so
-lib/csound5/plugins/libstdopcod.so
+lib/csound5/plugins/libserial.so
+lib/csound5/plugins/libsignalflowgraph.so
lib/csound5/plugins/libstdutil.so
-lib/csound5/plugins/libvbap.so
+lib/csound5/plugins/libsystem_call.so
+lib/csound5/plugins/libudprecv.so
+lib/csound5/plugins/libudpsend.so
lib/csound5/plugins/libwidgets.so
-lib/csound5/plugins/opcodes.dir
+lib/csound5/pv_export
+lib/csound5/pv_import
lib/csound5/pvanal
lib/csound5/pvlook
lib/csound5/scale
@@ -62,10 +69,14 @@ lib/csound5/scot
lib/csound5/scsort
lib/csound5/sndinfo
lib/csound5/srconv
-share/csound/xmg/American.xmg
-share/csound/xmg/English.xmg
-share/csound/xmg/csound.xmg
share/doc/csound/COPYING
share/doc/csound/ChangeLog
share/doc/csound/INSTALL
share/doc/csound/readme-csound5.txt
+share/locale/de/LC_MESSAGES/csound5.mo
+share/locale/en_GB/LC_MESSAGES/csound5.mo
+share/locale/en_US/LC_MESSAGES/csound5.mo
+share/locale/es_CO/LC_MESSAGES/csound5.mo
+share/locale/fr/LC_MESSAGES/csound5.mo
+share/locale/it/LC_MESSAGES/csound5.mo
+share/locale/ro/LC_MESSAGES/csound5.mo
diff --git a/audio/csound5/distinfo b/audio/csound5/distinfo
index 6659ca2e3f2..e09d6c23d27 100644
--- a/audio/csound5/distinfo
+++ b/audio/csound5/distinfo
@@ -1,21 +1,20 @@
-$NetBSD: distinfo,v 1.10 2014/01/09 16:55:16 jperkin Exp $
+$NetBSD: distinfo,v 1.11 2014/02/13 10:10:06 mrg Exp $
-SHA1 (Csound5.01_src.tar.gz) = b387da9b6c24961397e89ddcedd1229cdfebffe7
-RMD160 (Csound5.01_src.tar.gz) = 24652f8f650464d886f6d537ae991654f475ad4a
-Size (Csound5.01_src.tar.gz) = 2031426 bytes
+SHA1 (Csound5.19.01.tar.gz) = eeeb3591745c5b352b9040a2dfa3805f22f5fbda
+RMD160 (Csound5.19.01.tar.gz) = ceb9952d562c57b09143a47a4d51081753f1b694
+Size (Csound5.19.01.tar.gz) = 9302526 bytes
+SHA1 (patch-Opcodes_cpumeter.c) = 45cf1eafa0fbf7d430c5f4a39a193c63e0259d5a
SHA1 (patch-Opcodes_wavegde.h) = e1a6d742b28dd9b6b129a993102baf7218efa57c
-SHA1 (patch-ac) = 4a5a361744b659986fb4acdbc41b6a1c1e86a17f
-SHA1 (patch-ad) = 343b5767584cf4ddfbc7664e3234577fe22ff03a
-SHA1 (patch-ae) = 705d56ce7a03cd10763542a9ec71b393474c0595
-SHA1 (patch-af) = 4444b8efe47a401e01718c21197c2b6e19ec548c
-SHA1 (patch-ag) = 2771fdce6a054d96e51dd70df1264fe2cfdcdf58
-SHA1 (patch-ah) = e9978da3a14140f072ca12ca25b4c9a67ea4ede4
-SHA1 (patch-ai) = b7e079331053e555ce39df425e092715a6232d56
-SHA1 (patch-aj) = c22d25d55387c232187259690a43512457e18c54
+SHA1 (patch-ac) = 6079e0715edd55215f7f53a2d390d0fb290de1a4
+SHA1 (patch-ad) = 30aa452d35dbcd6ba4fe2c9a7680fe028368aae4
+SHA1 (patch-ae) = cba2fb017f4b940debbf7f8fd482c73c3fe19587
+SHA1 (patch-ah) = 229fc00e122288ea16ebf07f081869965cab9365
+SHA1 (patch-ai) = f5dee772f6569d4356be17045282666e159ce2dc
+SHA1 (patch-aj) = 6721ccfeeeb196d2f1430e1fd497e23226b42c80
SHA1 (patch-ak) = 1f3a7ec113a5185a81fe219d99061afb025bc13b
-SHA1 (patch-al) = 7da1e82a280b6803e2f0f75b8fb1eafbc3206636
-SHA1 (patch-am) = 9770973e54770b9eebcf66c17f90f459e71a71c6
-SHA1 (patch-an) = 7dfbd38a4eca8c7767a53c2b93bb4967344c0f0e
-SHA1 (patch-ao) = 64ee0a2a70dd317c992088212bc3f241f6296113
-SHA1 (patch-ap) = 9229c0166b37fb6991da5557c475d754715df711
-SHA1 (patch-install.py) = 8150b01843b5875558cbbf0bd621d8cf7b021905
+SHA1 (patch-al) = fe4e28b474f8a40f5b9bfada32abdb2aa37a2d0f
+SHA1 (patch-am) = 4df76fa93f26455d559acadb8389a6d7174c43ed
+SHA1 (patch-an) = edaddf39179bf686e46591c2353b16917a9ae8f0
+SHA1 (patch-ao) = 83a028f92ef743072728376cf4ddc79ef3d46381
+SHA1 (patch-custom.py.mkg) = ef45464105e7d7bc8ad2401d1b19f521e12333ca
+SHA1 (patch-install.py) = 8a02d553440bf921761a189af7b96fdd9657e870
diff --git a/audio/csound5/patches/patch-ac b/audio/csound5/patches/patch-ac
index f863d048d91..b916d953a1d 100644
--- a/audio/csound5/patches/patch-ac
+++ b/audio/csound5/patches/patch-ac
@@ -1,128 +1,142 @@
-$NetBSD: patch-ac,v 1.7 2014/01/09 16:55:16 jperkin Exp $
+$NetBSD: patch-ac,v 1.8 2014/02/13 10:10:06 mrg Exp $
---- SConstruct.orig 2006-03-15 15:22:43.000000000 +0000
-+++ SConstruct
-@@ -50,6 +50,12 @@ def today():
- def getPlatform():
- if sys.platform[:5] == 'linux':
- return 'linux'
+--- SConstruct.orig 2013-01-07 04:49:34.000000000 -0800
++++ SConstruct 2014-02-12 23:01:25.000000000 -0800
+@@ -60,6 +60,10 @@
+ return 'darwin'
+ elif sys.platform[:5] == 'sunos':
+ return 'sunos'
+ elif sys.platform[:6] == 'netbsd':
+ return 'netbsd'
+ elif sys.platform[:9] == 'dragonfly':
+ return 'dragonfly'
-+ elif sys.platform[:6] == 'sunos5':
-+ return 'sunos5'
- elif sys.platform[:3] == 'win':
- return 'mingw'
- elif sys.platform[:6] == 'darwin':
-@@ -207,7 +213,7 @@ opts.Add('buildOSXGUI',
- # This section also sets up customized options for third-party libraries, which
- # should take priority over default options.
-
--commonEnvironment = Environment(options = opts, ENV = {'PATH' : os.environ['PATH']})
-+commonEnvironment = Environment(options = opts, ENV = os.environ)
+ else:
+ return 'unsupported'
- customCPPPATH = commonEnvironment['customCPPPATH']
- commonEnvironment.Prepend(CPPPATH = customCPPPATH)
-@@ -285,11 +291,11 @@ if commonEnvironment['MSVC'] == '0':
+@@ -408,6 +412,8 @@
+ commonEnvironment.Append(LIBS=['intl'])
+ if getPlatform() == 'haiku':
+ commonEnvironment.Append(LIBS=['intl'])
++ if getPlatform() == 'netbsd':
++ commonEnvironment.Append(LIBS=['intl'])
+ else:
+ print "CONFIGURATION DECISION: No localisation"
+@@ -505,17 +511,17 @@
if getPlatform() == 'linux':
- commonEnvironment.Append(CCFLAGS = "-DLINUX")
+ commonEnvironment.Append(CCFLAGS = ["-DLINUX"])
+ commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS'])
+- commonEnvironment.Append(CPPPATH = ['/usr/local/include'])
+- commonEnvironment.Append(CPPPATH = ['/usr/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() == 'sunos':
+ commonEnvironment.Append(CCFLAGS = "-D_SOLARIS")
- 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(CPPPATH = '/usr/jdk/instances/jdk1.5.0/include')
+ 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 +341,15 @@ elif getPlatform() == 'mingw':
- pythonLinkFlags = []
- pythonLibraryPath = []
- pythonLibs = ['python%s' % commonEnvironment['pythonVersion'].replace('.', '')]
+ if compilerGNU():
+ commonEnvironment.Append(CCFLAGS = "-DPIPES")
+ commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
+@@ -570,6 +576,11 @@
+ if compilerIntel():
+ print 'Generating code optimized for Intel Core 2 Duo and Pentium 4 that will run on other processors also.'
+ commonEnvironment.Append(CCFLAGS = Split('/O3 /QaxTP'))
+elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly' or getPlatform() == 'sunos5':
+ commonEnvironment.Append(CCFLAGS = Split(os.environ['CFLAGS']))
+ commonEnvironment.Append(CXXFLAGS = Split(os.environ['CXXFLAGS']))
+ commonEnvironment.Append(LINKFLAGS = Split(os.environ['LDFLAGS']))
-+ pythonIncludePath = []
-+ pythonLinkFlags = []
-+ pythonLibraryPath = []
-+ pythonLibs = []
+ SConsignFile("unused-consign-file")
- # Check for prerequisites.
- # We check only for headers; checking for libs may fail
-@@ -485,7 +500,7 @@ def buildzip(env, target, source):
- # library version is CS_VERSION.CS_APIVERSION
- csoundLibraryVersion = '5.1'
- csoundLibraryName = 'csound'
--if getPlatform() == 'linux' and commonEnvironment['useDouble'] != '0':
-+if (getPlatform() == 'linux' or getPlatform() == 'netbsd' or getPlatform() == 'dragonfly' or getPlatform() == 'sunos5') and commonEnvironment['useDouble'] != '0':
- csoundLibraryName += '64'
- # flags for linking with the Csound library
- libCsoundLinkFlags = []
-@@ -526,6 +541,12 @@ if commonEnvironment['buildRelease'] !=
+ if getPlatform() == 'linux':
+ path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
+@@ -942,6 +953,13 @@
tmp += '64'
s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
csoundLibraryEnvironment.Append(CPPFLAGS = [s])
-+ if getPlatform() == 'netbsd' or getPlatform() == 'dragonfly' or getPlatform() == 'sunos5':
++ if getPlatform() == 'netbsd' or getPlatform() == 'dragonfly' or getPlatform() == 'sunos':
+ tmp = '%s/lib/csound5/plugins' % commonEnvironment['prefix']
+ if commonEnvironment['useDouble'] != '0':
+ tmp += '64'
+ s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
+ csoundLibraryEnvironment.Append(CPPFLAGS = [s])
- csoundDynamicLibraryEnvironment = csoundLibraryEnvironment.Copy()
++
+ csoundDynamicLibraryEnvironment = csoundLibraryEnvironment.Clone()
csoundDynamicLibraryEnvironment.Append(LIBS = ['sndfile'])
- if getPlatform() == 'mingw':
-@@ -550,6 +571,11 @@ if getPlatform() == 'mingw':
- csoundDynamicLibraryEnvironment['ENV']['PATH'] = os.environ['PATH']
- elif getPlatform() == 'linux':
+ if getPlatform() == 'win32':
+@@ -999,6 +1017,11 @@
+ csoundDynamicLibraryEnvironment.Append(SHLINKFLAGS = ['-module'])
+ elif getPlatform() == 'linux' or getPlatform() == 'sunos' or getPlatform() == 'darwin':
csoundDynamicLibraryEnvironment.Append(LIBS = ['dl', 'm', 'pthread'])
+elif getPlatform() == 'netbsd':
+ csoundDynamicLibraryEnvironment.Append(LIBS = ['m', 'pthread'])
+elif getPlatform() == 'dragonfly':
+ csoundDynamicLibraryEnvironment.Append(LINKFLAGS = ['-pthread'])
+ csoundDynamicLibraryEnvironment.Append(LIBS = ['m'])
- csoundInterfacesEnvironment = csoundDynamicLibraryEnvironment.Copy()
+ csoundInterfacesEnvironment = csoundDynamicLibraryEnvironment.Clone()
if buildOSXFramework:
-@@ -776,9 +802,17 @@ else:
- csoundProgramEnvironment.Append(LIBS = ['dl'])
- vstEnvironment.Append(LIBS = ['dl'])
- guiProgramEnvironment.Append(LIBS = ['dl'])
-- csoundProgramEnvironment.Append(LIBS = ['pthread', 'm'])
+@@ -1289,7 +1312,7 @@
+ csoundLibraryEnvironment.Append(CCFLAGS='-fPIC')
+ csoundLibrary = csoundLibraryEnvironment.Library(
+ csoundLibraryName, libCsoundSources)
+-if getPlatform() == 'linux' or getPlatform() == 'sunos' or getPlatform() == 'haiku':
++if getPlatform() == 'linux' or getPlatform() == 'sunos' or getPlatform() == 'haiku' or getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
+ # We need the library before sndfile in case we are building a static
+ # libcsound and passing -Wl,-as-needed
+ libCsoundLibs.insert(0,csoundLibrary)
+@@ -1691,7 +1714,7 @@
+ makePlugin(pluginEnvironment, 'fractalnoise', ['Opcodes/tl/fractalnoise.cpp'])
+
+ # platform-specific
+-if (getPlatform() == 'linux' or getPlatform() == 'darwin'):
++if getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'netbsd' or getPlatform() == 'dragonfly' or getPlatform() == 'sunos':
+ makePlugin(pluginEnvironment, 'control', ['Opcodes/control.c'])
+ # makePlugin(pluginEnvironment, 'cpumeter', ['Opcodes/cpumeter.c'])
+ if getPlatform() == 'linux':
+@@ -1738,8 +1761,10 @@
+ print "CONFIGURATION DECISION: Building OSC plugin."
+ oscEnvironment = pluginEnvironment.Clone()
+ oscEnvironment.Append(LIBS = ['lo'])
+- if getPlatform() != 'haiku':
+- oscEnvironment.Append(LIBS = ['pthread'])
++ if getPlatform() == 'dragonfly':
++ oscEnvironment.Append(LINKFLAGS = ['-pthread'])
++ elif getPlatform() != 'haiku':
++ oscEnvironment.Append(LIBS = ['pthread'])
+ if getPlatform() == 'win32':
+ oscEnvironment.Append(LIBS = csoundWindowsLibraries)
+ if compilerGNU():
+@@ -1842,8 +1867,15 @@
+ WiiEnvironment.Append(LIBS = ['wiiuse', 'bluetooth'])
+ if p5gfound :
+ P5GEnvironment.Append(LIBS = ['p5glove'])
- vstEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
- guiProgramEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
+ if getPlatform() == 'dragonfly':
-+ csoundProgramEnvironment.Append(LIBS = ['m'])
-+ csoundProgramEnvironment.Append(LINKFLAGS = ['-pthread'])
++ csoundProgramEnvironment.Append(LINKFLAGS = ['-pthread'])
+ vstEnvironment.Append(LIBS = ['stdc++', 'm'])
+ vstEnvironment.Append(LINKFLAGS = ['-pthread'])
+ guiProgramEnvironment.Append(LIBS = ['stdc++', 'm'])
+ guiProgramEnvironment.Append(LINKFLAGS = ['-pthread'])
+ else:
-+ csoundProgramEnvironment.Append(LIBS = ['pthread', 'm'])
+ vstEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
+ guiProgramEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
if getPlatform() == 'darwin':
- csoundProgramEnvironment.Append(LINKFLAGS = Split('''
- -framework Carbon -framework CoreAudio -framework CoreMidi
-@@ -989,7 +1023,7 @@ makePlugin(pluginEnvironment, 'stdopcod'
- pluginLibraries.append('opcodes.dir')
- MacOSX_InstallPlugin('opcodes.dir')
+ csoundProgramEnvironment.Append(LINKFLAGS = Split('''-framework Carbon -framework CoreAudio -framework CoreMIDI'''))
--if getPlatform() == 'linux' or getPlatform() == 'darwin':
-+if getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'netbsd' or getPlatform() == 'dragonfly' or getPlatform() == 'sunos5':
- makePlugin(pluginEnvironment, 'control', ['Opcodes/control.c'])
- makePlugin(pluginEnvironment, 'ftest', ['Opcodes/ftest.c'])
- makePlugin(pluginEnvironment, 'mixer', ['Opcodes/mixer.cpp'])
-@@ -1042,6 +1076,13 @@ else:
- -framework Carbon -framework CoreAudio -framework CoreMidi
- -framework ApplicationServices
- '''))
+@@ -1872,6 +1904,13 @@
+ widgetsEnvironment.Append(LIBS = csoundWindowsLibraries)
+ elif getPlatform() == 'darwin':
+ widgetsEnvironment.ParseConfig('fltk-config --use-images --cflags --cxxflags --ldflags')
+ elif getPlatform() == 'netbsd':
+ widgetsEnvironment.ParseConfig('fltk-config --use-images --cflags --cxxflags --ldflags')
+ widgetsEnvironment.Append(LIBS = ['stdc++', 'pthread', 'm'])
@@ -133,10 +147,10 @@ $NetBSD: patch-ac,v 1.7 2014/01/09 16:55:16 jperkin Exp $
makePlugin(widgetsEnvironment, 'widgets',
['InOut/FL_graph.cpp', 'InOut/winFLTK.c', 'InOut/widgets.cpp'])
-@@ -1060,7 +1101,11 @@ if not (commonEnvironment['useALSA'] ==
+@@ -1909,7 +1948,11 @@
else:
print "CONFIGURATION DECISION: Building ALSA plugin."
- alsaEnvironment = pluginEnvironment.Copy()
+ alsaEnvironment = pluginEnvironment.Clone()
- alsaEnvironment.Append(LIBS = ['asound', 'pthread'])
+ if getPlatform() == 'dragonfly':
+ alsaEnvironment.Append(LIBS = ['asound'])
@@ -145,87 +159,76 @@ $NetBSD: patch-ac,v 1.7 2014/01/09 16:55:16 jperkin Exp $
+ alsaEnvironment.Append(LIBS = ['asound', 'pthread'])
makePlugin(alsaEnvironment, 'rtalsa', ['InOut/rtalsa.c'])
- if getPlatform() == 'mingw':
-@@ -1082,6 +1127,8 @@ else:
- elif getPlatform() == 'mingw':
+ if pulseaudioFound and (getPlatform() == 'linux' or getPlatform() == 'sunos'):
+@@ -1942,6 +1985,9 @@
portaudioEnvironment.Append(LIBS = ['winmm', 'dsound'])
portaudioEnvironment.Append(LIBS = csoundWindowsLibraries)
+ makePlugin(portaudioEnvironment, 'rtpa', ['InOut/rtpa.cpp'])
+ elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly' or getPlatform() == 'sunos5':
+ portaudioEnvironment.ParseConfig('pkg-config --cflags --libs portaudio-2.0')
- makePlugin(portaudioEnvironment, 'rtpa', ['InOut/rtpa.c'])
++ makePlugin(portaudioEnvironment, 'rtpa', ['InOut/rtpa.c'])
+ else:
+ makePlugin(portaudioEnvironment, 'rtpa', ['InOut/rtpa.c'])
- if not (commonEnvironment['useJack'] == '1' and jackFound):
-@@ -1091,6 +1138,9 @@ else:
- jackEnvironment = pluginEnvironment.Copy()
- if getPlatform() == 'linux':
+@@ -1954,6 +2000,9 @@
jackEnvironment.Append(LIBS = ['jack', 'asound', 'pthread'])
+ elif getPlatform() == 'win32':
+ jackEnvironment.Append(LIBS = ['jackdmp'])
+ elif getPlatform() == 'dragonfly':
+ jackEnvironment.Append(LIBS = ['jack'])
+ jackEnvironment.Append(LINKFLAGS = ['-pthread'])
else:
- jackEnvironment.Append(LIBS = ['jack', 'pthread'])
+ jackEnvironment.Append(LIBS = ['pthread', 'jack'])
makePlugin(jackEnvironment, 'rtjack', ['InOut/rtjack.c'])
-@@ -1100,7 +1150,11 @@ if not (commonEnvironment['useOSC'] == '
- else:
- print "CONFIGURATION DECISION: Building OSC plugin."
- oscEnvironment = pluginEnvironment.Copy()
-- oscEnvironment.Append(LIBS = ['lo', 'pthread'])
-+ if getPlatform() == 'dragonfly':
-+ oscEnvironment.Append(LIBS = ['lo'])
-+ oscEnvironment.Append(LINKFLAGS = ['-pthread'])
-+ else:
-+ oscEnvironment.Append(LIBS = ['lo', 'pthread'])
- if getPlatform() == 'mingw':
- oscEnvironment.Append(LIBS = csoundWindowsLibraries)
- oscEnvironment.Append(SHLINKFLAGS = ['-Wl,--enable-stdcall-fixup'])
-@@ -1118,8 +1172,10 @@ else:
- fluidEnvironment.Append(CPPFLAGS = ['-DFLUIDSYNTH_NOT_A_DLL'])
- fluidEnvironment.Append(LIBS = ['winmm', 'dsound'])
- fluidEnvironment.Append(LIBS = csoundWindowsLibraries)
-- elif getPlatform() == 'linux' or getPlatform() == 'darwin':
-+ elif getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'netbsd':
- fluidEnvironment.Append(LIBS = ['pthread'])
-+ elif getPlatform() == 'dragonfly':
-+ fluidEnvironment.Append(LINKFLAGS = ['-pthread'])
- makePlugin(fluidEnvironment, 'fluidOpcodes',
- ['Opcodes/fluidOpcodes/fluidOpcodes.c'])
+@@ -2016,6 +2065,12 @@
+ fluidEnvironment.Append(LIBS = ['pthread'])
+ elif getPlatform() == 'haiku':
+ fluidEnvironment.Append(LIBS = ['fluidsynth'])
++ elif getPlatform() == 'netbsd':
++ fluidEnvironment.Append(LIBS = ['fluidsynth'])
++ fluidEnvironment.Append(LIBS = ['pthread'])
++ elif getPlatform() == 'dragonfly':
++ fluidEnvironment.Append(LIBS = ['fluidsynth'])
++ fluidEnvironment.Append(LINKFLAGS = ['-pthread'])
+ makePlugin(fluidEnvironment, 'fluidOpcodes',
+ ['Opcodes/fluidOpcodes/fluidOpcodes.cpp'])
-@@ -1237,6 +1293,13 @@ else:
- guiProgramEnvironment.Prepend(LINKFLAGS = ['-mwindows'])
- vstEnvironment.Append(LIBS = ['fltk_images', 'fltk'])
- guiProgramEnvironment.Append(LINKFLAGS = '-mwindows')
-+ elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
-+ vstEnvironment.Append(LIBS = ['m'])
-+ vstEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
-+ vstEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
-+ guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
-+ os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_CsoundVST.so'])
-+ os.symlink('lib_CsoundVST.so', '_CsoundVST.so')
- guiProgramEnvironment.Prepend(LIBS = ['_CsoundVST'])
- for option in vstEnvironment['CCFLAGS']:
- if string.find(option, '-D') == 0:
-@@ -1420,8 +1483,10 @@ else:
+@@ -2178,8 +2233,10 @@
stkEnvironment.Append(LIBS = ['stdc++'])
- if getPlatform() == 'mingw':
+ if getPlatform() == 'win32':
stkEnvironment.Append(LIBS = csoundWindowsLibraries)
-- elif getPlatform() == 'linux' or getPlatform() == 'darwin':
-+ elif getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'netbsd':
+- elif getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'sunos':
++ elif getPlatform() == 'linux' or getPlatform() == 'darwin' or getPlatform() == 'sunos' or getPlatform() == 'netbsd':
stkEnvironment.Append(LIBS = ['pthread'])
+ elif getPlatform() == 'dragonfly':
+ stkEnvironment.Append(LINKFLAGS = ['-pthread'])
# This is the one that actually defines the opcodes.
# They are straight wrappers, as simple as possible.
stk = makePlugin(stkEnvironment, 'stk', ['Opcodes/stk/stkOpcodes.cpp'])
-@@ -1443,6 +1508,8 @@ else:
- elif getPlatform() == 'mingw':
+@@ -2206,6 +2263,8 @@
+ pyEnvironment.Append(LIBS = ['dl', 'm'])
+ elif getPlatform() == 'win32':
pyEnvironment['ENV']['PATH'] = os.environ['PATH']
- pyEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
+ elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
+ pyEnvironment.Append(LIBS = ['m'])
pythonOpcodes = makePlugin(pyEnvironment, 'py',
['Opcodes/py/pythonopcodes.c'])
- if getPlatform() == 'mingw' and pythonLibs[0] < 'python24':
-@@ -1461,7 +1528,7 @@ if commonEnvironment['buildPDClass']=='1
+ if getPlatform() == 'win32' and pythonLibs[0] < 'python24':
+@@ -2606,6 +2665,13 @@
+ vstEnvironment.Append(LIBS = Split('fltk fltk_images fltk_png fltk_jpeg fltk_z'))
+ else:
+ vstEnvironment.Append(LIBS = Split('csound64 csnd fltk fltkimages fltkpng fltkjpeg fltkz'))
++ elif getPlatform() == 'netbsd' or getPlatform() == 'dragonfly':
++ vstEnvironment.Append(LIBS = ['m'])
++ vstEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
++ vstEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
++ guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
++ os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_CsoundVST.so'])
++ os.symlink('lib_CsoundVST.so', '_CsoundVST.so')
+ print 'PATH =', commonEnvironment['ENV']['PATH']
+ csoundVstSources = Split('''
+ frontends/CsoundVST/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.cpp
+@@ -2653,7 +2719,7 @@
pdClass = pdClassEnvironment.Program(
'csoundapi~.pd_darwin',
'frontends/csoundapi_tilde/csoundapi_tilde.c')
@@ -234,40 +237,46 @@ $NetBSD: patch-ac,v 1.7 2014/01/09 16:55:16 jperkin Exp $
pdClass = pdClassEnvironment.SharedLibrary(
'csoundapi~.pd_linux',
'frontends/csoundapi_tilde/csoundapi_tilde.c',
-@@ -1493,6 +1560,11 @@ if commonEnvironment['buildTclcsound'] =
- '''))
- elif getPlatform() == 'linux':
- csTclEnvironment.Append(LIBS = ['tcl8.4', 'tk8.4', 'dl', 'pthread'])
+@@ -2694,6 +2760,15 @@
+ lib2 = 'tk%s' % commonEnvironment['tclversion']
+ csTclEnvironment.Append(LIBS = [lib1, lib2])
+ csTclEnvironment.Append(LIBS = csoundWindowsLibraries)
+ elif getPlatform() == 'netbsd':
-+ csTclEnvironment.Append(LIBS = ['tcl8.4', 'tk8.4', 'pthread'])
++ lib1 = 'tcl%s' % commonEnvironment['tclversion']
++ lib2 = 'tk%s' % commonEnvironment['tclversion']
++ csTclEnvironment.Append(LIBS = [lib1, lib2, 'pthread'])
+ elif getPlatform() == 'dragonfly':
-+ csTclEnvironment.Append(LIBS = ['tcl8.4', 'tk8.4'])
++ lib1 = 'tcl%s' % commonEnvironment['tclversion']
++ lib2 = 'tk%s' % commonEnvironment['tclversion']
++ csTclEnvironment.Append(LIBS = [lib1, lib2])
+ csTclEnvironment.Append(LINKFLAGS = ['-pthread'])
- elif getPlatform() == 'mingw':
- csTclEnvironment.Append(LIBS = ['tcl84', 'tk84'])
- csTclEnvironment.Append(LIBS = csoundWindowsLibraries)
-@@ -1591,18 +1663,18 @@ else:
+ csTclCmdObj = csTclEnvironment.SharedObject(
+ 'frontends/tclcsound/commands.c')
+ csTcl = csTclEnvironment.Program(
+@@ -2887,11 +2962,15 @@
+ PREFIX = INSTDIR + commonEnvironment['prefix']
- PREFIX = commonEnvironment['prefix']
-
--BIN_DIR = PREFIX + "/bin"
--INCLUDE_DIR = PREFIX + "/include/csound"
+ BIN_DIR = PREFIX + "/bin"
+BIN_DIR = PREFIX + "/lib/csound5"
+ INCLUDE_DIR = PREFIX + "/include/csound"
+INCLUDE_DIR = PREFIX + "/include/csound5"
- if (commonEnvironment['Word64'] == '1'):
-- LIB_DIR = PREFIX + "/lib64"
+ if (commonEnvironment['Lib64'] == '1'):
+ LIB_DIR = PREFIX + "/lib64"
+ LIB_DIR = PREFIX + "/lib64/csound5"
+ PYTHON_DIR = '%s/lib64' % sys.prefix
++ PYTHON_DIR = '%s/lib64/csount5' % sys.prefix
else:
-- LIB_DIR = PREFIX + "/lib"
-+ LIB_DIR = PREFIX + "/lib/csound5"
+ LIB_DIR = PREFIX + "/lib"
+ PYTHON_DIR = '%s/lib' % sys.prefix
+@@ -2903,8 +2982,10 @@
if commonEnvironment['useDouble'] == '0':
-- PLUGIN_DIR = LIB_DIR + "/csound/plugins"
+ PLUGIN_DIR = LIB_DIR + "/csound/plugins"
+ PLUGIN_DIR = LIB_DIR + "/plugins"
else:
-- PLUGIN_DIR = LIB_DIR + "/csound/plugins64"
-+ PLUGIN_DIR = LIB_DIR + "/plugins"
+ PLUGIN_DIR = LIB_DIR + "/csound/plugins64"
++ PLUGIN_DIR = LIB_DIR + "/plugins64"
if commonEnvironment['install'] == '1':
installExecutables = Alias('install-executables',
diff --git a/audio/csound5/patches/patch-ad b/audio/csound5/patches/patch-ad
index 2544cd2be3a..d645159a624 100644
--- a/audio/csound5/patches/patch-ad
+++ b/audio/csound5/patches/patch-ad
@@ -1,13 +1,23 @@
-$NetBSD: patch-ad,v 1.2 2006/05/29 19:44:24 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2014/02/13 10:10:06 mrg Exp $
---- Top/csound.c.orig 2006-03-10 08:37:48.000000000 -0800
-+++ Top/csound.c
-@@ -613,7 +613,7 @@ static const CSOUND cenviron_ = {
- csound_free_string_database();
- }
+--- Top/csound.c.orig 2013-01-07 04:49:34.000000000 -0800
++++ Top/csound.c 2014-02-12 20:35:00.000000000 -0800
+@@ -765,7 +765,8 @@
--#if !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(__MACH__)
-+#if !defined(__NetBSD__) && !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(__MACH__) && !defined(__DragonFly__)
+ #if defined(ANDROID) || (!defined(LINUX) && !defined(SGI) && \
+ !defined(__HAIKU__) && !defined(__BEOS__) && \
+- !defined(__MACH__))
++ !defined(__MACH__) && !defined(__NetBSD__) && \
++ !defined(__DragonFly__))
static char *signal_to_string(int sig)
{
- switch(sig) {
+ switch (sig) {
+@@ -918,7 +919,7 @@
+ }
+
+ static const int sigs[] = {
+-#if defined(LINUX) || defined(SGI) || defined(sol) || defined(__MACH__)
++#if defined(LINUX) || defined(SGI) || defined(sol) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
+ SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGTRAP, SIGABRT, SIGIOT, SIGBUS,
+ SIGFPE, SIGSEGV, SIGPIPE, SIGTERM, SIGXCPU, SIGXFSZ,
+ #elif defined(WIN32)
diff --git a/audio/csound5/patches/patch-ae b/audio/csound5/patches/patch-ae
index 2e93eebab64..7ab0cf2c394 100644
--- a/audio/csound5/patches/patch-ae
+++ b/audio/csound5/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2006/05/29 19:44:24 joerg Exp $
+$NetBSD: patch-ae,v 1.3 2014/02/13 10:10:06 mrg Exp $
---- Engine/linevent.c.orig 2005-12-06 14:58:54.000000000 -0800
-+++ Engine/linevent.c
-@@ -30,7 +30,7 @@
+--- Engine/linevent.c.orig 2013-01-07 04:49:34.000000000 -0800
++++ Engine/linevent.c 2014-02-12 20:37:17.000000000 -0800
+@@ -31,7 +31,7 @@
#include "linevent.h"
#ifdef PIPES
@@ -10,4 +10,4 @@ $NetBSD: patch-ae,v 1.2 2006/05/29 19:44:24 joerg Exp $
+# if defined(SGI) || defined(LINUX) || defined(NeXT) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
# define _popen popen
# define _pclose pclose
- # elif defined(__BEOS__) || defined(__MACH__)
+ # elif defined(__BEOS__) || defined(__HAIKU__) || defined(__MACH__)
diff --git a/audio/csound5/patches/patch-af b/audio/csound5/patches/patch-af
deleted file mode 100644
index e5c6cba76e7..00000000000
--- a/audio/csound5/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- Engine/namedins.c.orig 2006-03-11 08:30:35.000000000 -0800
-+++ Engine/namedins.c
-@@ -1342,7 +1342,7 @@ PUBLIC int csoundGetControlChannelParams
-
- int csoundCheckOpcodePluginFile(CSOUND *csound, const char *fname)
- {
--#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__))
-+#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__))
- char buf[512];
- size_t i;
- #endif
-@@ -1352,7 +1352,7 @@ int csoundCheckOpcodePluginFile(CSOUND *
-
- if (fname == NULL || fname[0] == (char) 0)
- return 0;
--#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__))
-+#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__))
- /* on some platforms, file names are case insensitive */
- i = (size_t) 0;
- do {
-@@ -1502,7 +1502,7 @@ int csoundLoadOpcodeDB(CSOUND *csound, c
- }
- opcodeCnt++;
- }
--#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__))
-+#if !(defined(LINUX) || defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__))
- else {
- size_t j;
- /* on some platforms, file names are case insensitive */
diff --git a/audio/csound5/patches/patch-ag b/audio/csound5/patches/patch-ag
deleted file mode 100644
index da5c2e30e92..00000000000
--- a/audio/csound5/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2006/05/29 19:44:24 joerg Exp $
-
---- frontends/CsoundVST/System.cpp.orig 2005-12-22 09:06:21.000000000 -0800
-+++ frontends/CsoundVST/System.cpp
-@@ -468,7 +468,7 @@ namespace csound
- Beep(880, 1000);
- }
-
--#elif defined(LINUX) || defined(MACOSX)
-+#elif defined(LINUX) || defined(MACOSX) || defined(__NetBSD__) || defined(__DragonFly__)
-
- #include <dlfcn.h>
- #include <dirent.h>
diff --git a/audio/csound5/patches/patch-ah b/audio/csound5/patches/patch-ah
index d1374132e59..92fb54d48d3 100644
--- a/audio/csound5/patches/patch-ah
+++ b/audio/csound5/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.2 2006/05/29 19:44:24 joerg Exp $
+$NetBSD: patch-ah,v 1.3 2014/02/13 10:10:06 mrg Exp $
---- frontends/CsoundVST/CsoundVSTMain.cpp.orig 2005-09-02 07:30:33.000000000 -0700
-+++ frontends/CsoundVST/CsoundVSTMain.cpp
-@@ -36,7 +36,7 @@ bool oome = false;
++++ frontends/CsoundVST/ScoreGeneratorVstMain.cpp.orig 2013-01-07 04:49:35.000000000 -0800
+--- frontends/CsoundVST/ScoreGeneratorVstMain.cpp 2014-02-12 20:42:30.000000000 -0800
+@@ -42,7 +42,7 @@
#if defined(__GNUC__) && defined(WIN32)
#define main main_plugin
extern "C" __declspec(dllexport) AEffect *main_plugin (audioMasterCallback audioMaster)
-#elif defined(LINUX) || defined(MACOSX)
+#elif defined(LINUX) || defined(MACOSX) || defined(__NetBSD__) || defined(__DragonFly__)
- AEffect *main_plugin (audioMasterCallback audioMaster)
+ AEffect *main_plugin (audioMasterCallback audioMaster)
#else
- AEffect *main(audioMasterCallback audioMaster)
+ AEffect *main(audioMasterCallback audioMaster)
diff --git a/audio/csound5/patches/patch-ai b/audio/csound5/patches/patch-ai
index dfaf7b58bac..0d8fcf61b23 100644
--- a/audio/csound5/patches/patch-ai
+++ b/audio/csound5/patches/patch-ai
@@ -1,40 +1,32 @@
-$NetBSD: patch-ai,v 1.3 2009/08/03 13:28:22 joerg Exp $
+$NetBSD: patch-ai,v 1.4 2014/02/13 10:10:06 mrg Exp $
---- InOut/widgets.cpp.orig 2006-02-15 19:25:55.000000000 +0100
-+++ InOut/widgets.cpp
-@@ -29,7 +29,7 @@
- # include <windows.h>
- #endif /* defined(WIN32) */
+--- InOut/widgets.cpp.orig 2013-01-07 04:49:34.000000000 -0800
++++ InOut/widgets.cpp 2014-02-12 20:48:11.000000000 -0800
+@@ -2019,7 +2019,7 @@
--#if defined(LINUX)
-+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
- # include <pthread.h>
- # include <sched.h>
- # include <sys/time.h>
-@@ -1722,7 +1722,7 @@ static uintptr_t fltkRun(void *userdata)
-
- p = (widgetsGlobals_t*) csound->QueryGlobalVariable(csound,
- "_widgets_globals");
+ p = (widgetsGlobals_t*) csound->QueryGlobalVariable(csound,
+ "_widgets_globals");
-#ifdef LINUX
+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
- {
- struct sched_param sp;
- // IV - Aug 27 2002: widget thread is always run with normal priority
-@@ -2579,7 +2579,7 @@ extern "C" int fl_setTextType(CSOUND *cs
- return OK;
- }
+ {
+ struct sched_param sp;
+ // IV - Aug 27 2002: widget thread is always run with normal priority
+@@ -2039,7 +2039,7 @@
+ #ifdef WIN32
+ HWND xid = fl_xid(ST(fl_windows)[panelNum].panel);
+ ST(VSTplugEditors)[k]->SetEditWindow(xid);
+-#elif defined (LINUX) || defined(MACOSX)
++#elif defined (LINUX) || defined(MACOSX) || defined(__NetBSD__) || defined(__DragonFly__)
+ // put some appropriate alternative code here
+ Fl_Window * xid = fl_find(fl_xid(ST(fl_windows)[panelNum].panel));
+ ST(VSTplugEditors)[k]->SetEditWindow(xid);
+@@ -2166,8 +2166,7 @@
+ CSOUND *csound = p->csound;
+ char *command = (char *)csound->Malloc(csound, strlen(p->commandString) + 1);
+
+-#if defined(LINUX) || defined (MACOSX)
+-
++#if defined(LINUX) || defined (MACOSX) || defined(__NetBSD__) || defined(__DragonFly__)
--extern "C" int fl_box(CSOUND *csound, FL_BOX *p)
-+extern "C" int my_fl_box(CSOUND *csound, FL_BOX *p)
- {
- char *text = GetString(csound, p->itext, p->XSTRCODE);
- Fl_Box *o = new Fl_Box((int)*p->ix, (int)*p->iy,
-@@ -3612,7 +3612,7 @@ static OENTRY localops[] = {
- { "FLsetAlign", S(FL_TALIGN), 1, "", "ii",
- (SUBR) fl_align, (SUBR) NULL, (SUBR) NULL },
- { "FLbox", S(FL_BOX), 1, "i", "Tiiiiiii",
-- (SUBR) fl_box, (SUBR) NULL, (SUBR) NULL },
-+ (SUBR) my_fl_box, (SUBR) NULL, (SUBR) NULL },
- { "FLvalue", S(FLVALUE), 1, "i", "Tjjjj",
- (SUBR) fl_value, (SUBR) NULL, (SUBR) NULL },
- { "FLpanel", S(FLPANEL), 1, "", "Tjjooo",
+ pid_t pId = vfork();
+ if (pId == 0) {
diff --git a/audio/csound5/patches/patch-aj b/audio/csound5/patches/patch-aj
index 99bd6bdda8b..96c447ef339 100644
--- a/audio/csound5/patches/patch-aj
+++ b/audio/csound5/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.2 2006/05/29 19:44:24 joerg Exp $
+$NetBSD: patch-aj,v 1.3 2014/02/13 10:10:06 mrg Exp $
---- InOut/libsnd.c.orig 2006-02-13 09:05:46.000000000 -0800
-+++ InOut/libsnd.c
-@@ -47,7 +47,7 @@ typedef struct {
+--- InOut/libsnd.c.orig 2013-01-07 04:49:34.000000000 -0800
++++ InOut/libsnd.c 2014-02-12 20:49:21.000000000 -0800
+@@ -51,7 +51,7 @@
#ifdef PIPES
# if defined(SGI) || defined(LINUX) || defined(__BEOS__) || defined(NeXT) || \
-- defined(__MACH__)
-+ defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
+- defined(__MACH__) || defined(__HAIKU__)
++ defined(__MACH__) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__)
# define _popen popen
# define _pclose pclose
# endif
diff --git a/audio/csound5/patches/patch-al b/audio/csound5/patches/patch-al
index 672aabf7ac8..f5ab8362a52 100644
--- a/audio/csound5/patches/patch-al
+++ b/audio/csound5/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.2 2006/05/29 19:44:24 joerg Exp $
+$NetBSD: patch-al,v 1.3 2014/02/13 10:10:06 mrg Exp $
---- InOut/winFLTK.c.orig 2005-12-30 07:21:18.000000000 -0800
-+++ InOut/winFLTK.c
+--- InOut/winFLTK.c.orig 2013-01-07 04:49:34.000000000 -0800
++++ InOut/winFLTK.c 2014-02-12 20:51:49.000000000 -0800
@@ -29,7 +29,7 @@
#include <stdio.h>
#include "cwindow.h"
@@ -11,12 +11,21 @@ $NetBSD: patch-al,v 1.2 2006/05/29 19:44:24 joerg Exp $
#include <X11/Xlib.h>
#endif
-@@ -54,7 +54,7 @@ static void KillGraph_FLTK(CSOUND *csoun
+@@ -81,7 +81,7 @@
+ fltkFlags = getFLTKFlagsPtr(csound);
+ if (((*fltkFlags) & 2) == 0 &&
+ !(csound->oparms->graphsoff || csound->oparms->postscript)) {
+-#ifdef LINUX
++#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
+ Display *dpy = XOpenDisplay(NULL);
+ if (dpy != NULL) {
+ XCloseDisplay(dpy);
+@@ -105,7 +105,7 @@
+ csound->Message(csound, "graph init \n");
- void set_display_callbacks(CSOUND *csound)
- {
+ }
-#ifdef LINUX
+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
- Display *dpy = XOpenDisplay(NULL);
- if (dpy == NULL)
- return;
+ }
+ #endif
+ }
diff --git a/audio/csound5/patches/patch-am b/audio/csound5/patches/patch-am
index abc3fdf3966..6d6051e2e8e 100644
--- a/audio/csound5/patches/patch-am
+++ b/audio/csound5/patches/patch-am
@@ -1,26 +1,26 @@
-$NetBSD: patch-am,v 1.2 2006/05/29 19:44:24 joerg Exp $
+$NetBSD: patch-am,v 1.3 2014/02/13 10:10:06 mrg Exp $
---- Top/csmodule.c.orig 2006-03-08 15:13:15.000000000 -0800
-+++ Top/csmodule.c
-@@ -78,7 +78,7 @@
- #include "csoundCore.h"
- #include "csmodule.h"
+--- Top/csmodule.c.orig 2013-01-07 04:49:34.000000000 -0800
++++ Top/csmodule.c 2014-02-12 20:53:40.000000000 -0800
+@@ -90,7 +90,7 @@
+ #endif
+ #endif
--#if defined(LINUX)
-+#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
+-#if defined(LINUX) || defined(NEW_MACH_CODE) || defined(__HAIKU__)
++#if defined(LINUX) || defined(NEW_MACH_CODE) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__)
#include <dlfcn.h>
#elif defined(WIN32)
#include <windows.h>
-@@ -121,7 +121,7 @@ static const char *plugindir_envva
- static const char *plugindir64_envvar = "OPCODEDIR64";
-
- /* default directory to load plugins from if environment variable is not set */
--#if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__)))
-+#if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)))
+@@ -143,7 +143,7 @@
+ # define CS_DEFAULT_PLUGINDIR "/boot/common/lib/csound/plugins64"
+ # endif
+ # endif
+-#elif !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__)))
++#elif !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)))
# define ENABLE_OPCODEDIR_WARNINGS 1
# ifdef CS_DEFAULT_PLUGINDIR
# undef CS_DEFAULT_PLUGINDIR
-@@ -131,9 +131,9 @@ static const char *plugindir64_env
+@@ -153,9 +153,9 @@
# define ENABLE_OPCODEDIR_WARNINGS 0
# ifndef CS_DEFAULT_PLUGINDIR
# ifndef USE_DOUBLE
@@ -32,21 +32,30 @@ $NetBSD: patch-am,v 1.2 2006/05/29 19:44:24 joerg Exp $
# endif
# endif
#endif
-@@ -225,7 +225,7 @@ static CS_NOINLINE int csoundLoadExterna
- /* load library */
+@@ -258,7 +258,7 @@
err = csound->OpenLibrary(&h, libraryPath);
- if (err) {
--#if defined(BETA) && defined(LINUX)
-+#if defined(BETA) && (defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__))
- csound->Warning(csound, "%s", dlerror());
- #endif
- csound->Warning(csound, Str("could not open library '%s' (%d)"),
-@@ -591,7 +591,7 @@ PUBLIC void *csoundGetLibrarySymbol(void
+ if (UNLIKELY(err)) {
+ char ERRSTR[256];
+- #if defined(LINUX) || defined(__HAIKU__)
++ #if defined(LINUX) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__)
+ sprintf(ERRSTR, Str("could not open library '%s' (%s)"),
+ libraryPath, dlerror());
+ #else
+@@ -964,7 +964,7 @@
return (void*) GetProcAddress((HMODULE) library, procedureName);
}
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
+-#elif defined(LINUX) || defined (NEW_MACH_CODE) || defined(__HAIKU__)
++#elif defined(LINUX) || defined (NEW_MACH_CODE) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__)
PUBLIC int csoundOpenLibrary(void **library, const char *libraryPath)
{
+@@ -1358,7 +1358,7 @@
+ fareyseq_localops_init, hrtfearly_localops_init,
+ hrtfreverb_localops_init, minmax_localops_init,
+ vaops_localops_init,
+-#if defined(__MACH__) || defined(LINUX) || defined(__HAIKU__)
++#if defined(__MACH__) || defined(LINUX) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__)
+ cpumeter_localops_init,
+ #endif
+ mp3in_localops_init, gendy_localops_init,
diff --git a/audio/csound5/patches/patch-an b/audio/csound5/patches/patch-an
index 3c9a5dfd78d..74ece4b8837 100644
--- a/audio/csound5/patches/patch-an
+++ b/audio/csound5/patches/patch-an
@@ -1,17 +1,17 @@
-$NetBSD: patch-an,v 1.2 2006/05/29 19:44:24 joerg Exp $
+$NetBSD: patch-an,v 1.3 2014/02/13 10:10:06 mrg Exp $
---- Top/one_file.c.orig 2006-01-11 03:47:55.000000000 -0800
-+++ Top/one_file.c
-@@ -24,7 +24,7 @@
- #include "csoundCore.h"
- #include <ctype.h>
- #include <errno.h>
+--- Top/one_file.c.orig 2013-01-07 04:49:34.000000000 -0800
++++ Top/one_file.c 2014-02-12 20:55:08.000000000 -0800
+@@ -29,7 +29,7 @@
+ #include <stdlib.h>
+ #include "corfile.h"
+
-#if defined(LINUX) || defined(__MACH__) || defined(WIN32)
+#if defined(LINUX) || defined(__MACH__) || defined(WIN32) || defined(__NetBSD__) || defined(__DragonFly__)
# include <sys/types.h>
# include <sys/stat.h>
#endif
-@@ -66,7 +66,7 @@ CS_NOINLINE char *csoundTmpFileName(CSOU
+@@ -99,7 +99,7 @@
buf = csound->Malloc(csound, nBytes);
}
{
@@ -20,7 +20,7 @@ $NetBSD: patch-an,v 1.2 2006/05/29 19:44:24 joerg Exp $
struct stat tmp;
do {
#elif defined(WIN32)
-@@ -89,7 +89,7 @@ CS_NOINLINE char *csoundTmpFileName(CSOU
+@@ -134,7 +134,7 @@
}
#endif
if (ext != NULL && ext[0] != (char) 0) {
@@ -29,7 +29,7 @@ $NetBSD: patch-an,v 1.2 2006/05/29 19:44:24 joerg Exp $
char *p;
/* remove original extension (does not work on OS X */
/* and may be a bad idea) */
-@@ -109,7 +109,7 @@ CS_NOINLINE char *csoundTmpFileName(CSOU
+@@ -154,7 +154,7 @@
} while (buf[i] != (char) 0);
}
#endif
diff --git a/audio/csound5/patches/patch-ao b/audio/csound5/patches/patch-ao
index d7202647818..5ac52b48d3a 100644
--- a/audio/csound5/patches/patch-ao
+++ b/audio/csound5/patches/patch-ao
@@ -1,13 +1,13 @@
-$NetBSD: patch-ao,v 1.2 2006/05/29 19:44:24 joerg Exp $
+$NetBSD: patch-ao,v 1.3 2014/02/13 10:10:06 mrg Exp $
---- Top/threads.c.orig 2005-12-26 09:27:07.000000000 -0800
-+++ Top/threads.c
-@@ -109,7 +109,7 @@ PUBLIC void csoundSleep(size_t milliseco
- Sleep((DWORD) milliseconds);
- }
+--- Top/threads.c.orig 2013-01-07 04:49:34.000000000 -0800
++++ Top/threads.c 2014-02-12 20:56:20.000000000 -0800
+@@ -168,7 +168,7 @@
--#elif defined(LINUX) || defined(__MACH__)
-+#elif defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
+
+-#if defined(LINUX) || defined(__MACH__) || defined(WIN32)
++#if defined(LINUX) || defined(__MACH__) || defined(WIN32) || defined(__NetBSD__) || defined(__DragonFly__)
+
+ #include <errno.h>
#include <pthread.h>
- #include <time.h>
diff --git a/audio/csound5/patches/patch-ap b/audio/csound5/patches/patch-ap
deleted file mode 100644
index a5c6ab7e8f3..00000000000
--- a/audio/csound5/patches/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/10/17 21:32:37 rillig Exp $
-
---- cleanup.sh.orig 2005-12-20 20:50:46.000000000 +0100
-+++ cleanup.sh 2006-10-17 23:28:47.000000000 +0200
-@@ -1,7 +1,7 @@
- #!/bin/sh
-
--if [ "$#" == "2" ] ; then
-- if [ "$1" == "remove" ] ; then
-+if [ "$#" = "2" ] ; then
-+ if [ "$1" = "remove" ] ; then
- if ( test -e "$2" ) ; then
- echo -e "Removing '$2'"
- rm -Rf "$2" ;
diff --git a/audio/csound5/patches/patch-install.py b/audio/csound5/patches/patch-install.py
index c596abdfc71..89448036921 100644
--- a/audio/csound5/patches/patch-install.py
+++ b/audio/csound5/patches/patch-install.py
@@ -1,11 +1,11 @@
-$NetBSD: patch-install.py,v 1.1 2011/09/07 12:42:02 obache Exp $
+$NetBSD: patch-install.py,v 1.2 2014/02/13 10:10:06 mrg Exp $
* adjust installation layout to same as SCons.
* kill uninstaller and md5sum for it.
* kill ldconfig
---- install.py.orig 2006-03-15 15:20:59.000000000 +0000
-+++ install.py
+--- install.py.orig 2013-01-07 04:49:35.000000000 -0800
++++ install.py 2014-02-12 21:10:18.000000000 -0800
@@ -3,7 +3,6 @@
import sys
import os
@@ -14,16 +14,15 @@ $NetBSD: patch-install.py,v 1.1 2011/09/07 12:42:02 obache Exp $
import time
# get Python version
-@@ -25,7 +24,7 @@ exeFiles1 = ['csound', 'CsoundVST', 'cst
- 'pvlook', 'scale', 'sndinfo', 'srconv',
+@@ -28,6 +27,7 @@
'scsort', 'extract', 'cs', 'csb64enc', 'makecsd', 'scot']
--exeFiles2 = ['brkpt', 'linseg', 'tabdes']
+ exeFiles2 = ['brkpt', 'linseg', 'tabdes']
+exeFiles2 = []
docFiles = ['COPYING', 'ChangeLog', 'INSTALL', 'readme-csound5.txt']
-@@ -88,15 +87,15 @@ def concatPath(lst):
+@@ -96,15 +96,15 @@
return s
# frontends
@@ -33,8 +32,8 @@ $NetBSD: patch-install.py,v 1.1 2011/09/07 12:42:02 obache Exp $
-includeDir = concatPath([prefix, '/include/csound'])
+includeDir = concatPath([prefix, '/include/csound5'])
# Csound API libraries
--libDir = concatPath([prefix, '/lib'])
-+libDir = concatPath([prefix, '/lib/csound5'])
+-libDir = concatPath([prefix, '/lib' + word64Suffix])
++libDir = concatPath([prefix, '/lib/csound5' + word64Suffix])
# single precision plugin libraries
-pluginDir32 = concatPath([libDir, '/csound/plugins'])
+pluginDir32 = concatPath([libDir, '/plugins'])
@@ -42,18 +41,22 @@ $NetBSD: patch-install.py,v 1.1 2011/09/07 12:42:02 obache Exp $
-pluginDir64 = concatPath([libDir, '/csound/plugins64'])
+pluginDir64 = concatPath([libDir, '/plugins64'])
# XMG files
- xmgDir = concatPath([prefix, '/share/csound/xmg'])
+ xmgDir = concatPath([prefix, '/share/locale'])
# documentation
-@@ -317,7 +316,7 @@ installErrors = installErrors or err
- print ' === Installing Tcl/Tk modules and scripts ==='
- if findFiles('.', 'tclcsound\\.so').__len__() > 0:
- err = installXFile('--strip-unneeded', 'tclcsound.so', tclDir)
+@@ -360,9 +360,9 @@
+ installErrors = installErrors or err
+ err = installFile('frontends/tclcsound/command_summary.txt', tclDir)
+ installErrors = installErrors or err
-err = installFile('nsliders.tk', tclDir)
+-installErrors = installErrors or err
+-err = installXFile('', 'matrix.tk', binDir)
+ err = installFile('nsliders.tk', tclDir)
++ installErrors = installErrors or err
++ err = installXFile('', 'matrix.tk', binDir)
installErrors = installErrors or err
# copy STK raw wave files
-@@ -375,42 +374,6 @@ if vimDir != '':
+@@ -420,43 +420,6 @@
'%s/%s' % (vimDir, 'syntax'))
installErrors = installErrors or err
@@ -93,10 +96,11 @@ $NetBSD: patch-install.py,v 1.1 2011/09/07 12:42:02 obache Exp $
- print ' *** Error installing MD5 checksums'
- installErrors = 1
-
+-
# -----------------------------------------------------------------------------
print ''
-@@ -437,8 +400,5 @@ else:
+@@ -483,8 +446,5 @@
print ' RAWWAVE_PATH=%s' % rawWaveDir
print 'Csound can be uninstalled by running %s/uninstall-csound5' % binDir
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 00:27:08 +0000