head 1.6; access; symbols pkgsrc-2013Q4:1.5.0.8 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.6 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.4 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.2 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.4.0.2 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.3.0.4 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.2 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.2.0.2 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.1.0.6 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.4 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.2 pkgsrc-2011Q2-base:1.1; locks; strict; comment @# @; 1.6 date 2014.03.06.10.16.15; author mrg; state dead; branches; next 1.5; commitid 2e1SYzCqrbBWLCrx; 1.5 date 2013.01.11.13.23.33; author joerg; state Exp; branches; next 1.4; 1.4 date 2012.11.13.23.26.23; author mrg; state Exp; branches; next 1.3; 1.3 date 2012.06.28.07.32.37; author sbd; state Exp; branches; next 1.2; 1.2 date 2012.03.26.13.59.40; author joerg; state Exp; branches; next 1.1; 1.1 date 2011.04.28.10.27.39; author mrg; state Exp; branches; next ; desc @@ 1.6 log @update to hydrogen 0.9.6-beta3. changes include: Bugfixes: - Major fixes for the pattern handling in the soundlibrary - A memory leak was fixed which appeared when using note-off notes - A note-off related segmentation fault was fixed - The path of instrumens is now set correctly if a song gets saved (solves the abs. vs. rel. path problem) - lots of smaller fixes.. New features: - New midi action: SELECT_NEXT_PATTERN_RELATIVE - Show a layers velocity informations in a tooltip - Added a description field for patterns - Jack session support - Jack midi out - Undo history - Tabbed interface (aimed at netbooks) - CMake for build @ text @$NetBSD: patch-aa,v 1.5 2013/01/11 13:23:33 joerg Exp $ --- Sconstruct.orig 2012-02-19 21:54:05.000000000 +0000 +++ Sconstruct @@@@ -47,7 +47,7 @@@@ def get_platform_flags( opts ): env = Environment( options = opts ) - if sys.platform == "linux2" or sys.platform == "linux3" or sys.platform == "darwin": + if sys.platform == "linux2" or sys.platform == "linux3" or sys.platform == "darwin" or sys.platform[:6] == "netbsd": if str(env['debug']) == "1": cppflags += ['-Wall', '-g2', '-ggdb', '-O0'] for flag in env["optflags"].split(" "): @@@@ -75,6 +75,12 @@@@ def get_platform_flags( opts ): if str(env['bundle']) == "1": cppflags.append('-DBUNDLE_SUPPORT') cppflags.append('-DLADSPA_SUPPORT') + + includes.append( env['prefix'] + "/include" ) + ldflags.append( "-L" + env['prefix'] + "/lib" ) + ldflags.append( "-Wl,-R," + env['prefix'] + "/lib" ) + # XXX: this should go in py4.py but i'm not sure where + ldflags.append( "-Wl,-R," + env['prefix'] + "/qt4/lib" ) if str(env['gui']) == "0": cppflags.append('-DNO_GUI_SUPPORT') @@@@ -96,6 +102,10 @@@@ def get_platform_flags( opts ): ldflags.append('-lasound') # ldflags.append('-lrubberband') + elif sys.platform[:6] == 'netbsd': + cppflags.append('-pthread') + ldflags.append('-lossaudio') + elif sys.platform == "win32": includes.append( '3rdparty\libsndfile-1_0_17' ) includes.append( 'build\pthreads\include' ) @@@@ -283,6 +293,9 @@@@ def get_hydrogen_gui( lib_hydrogen , opt env.Append( LIBS = ["z"] ) env.Append( LIBS = ["pthread"] ) + if sys.platform[:6] == "netbsd": + env.Append( LIBS = ["z"] ) + if sys.platform == "darwin" and str(env['coreaudio']) == "1": env.Append( LINKFLAGS = ['-framework','ApplicationServices']) env.Append( LINKFLAGS = ['-framework','AudioUnit']) @@@@ -302,7 +315,7 @@@@ def get_hydrogen_gui( lib_hydrogen , opt env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img")) #add every img in ./data/img to the install list. - os.path.walk("./data/img/",install_images,env) + #os.path.walk("./data/img/",install_images,env) env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/drumkits")) @@@@ -380,7 +393,7 @@@@ else: includes, a , b = get_platform_flags( opts ) -env = Environment(options = opts, CPPPATH = includes) +env = Environment(options = opts, ENV=os.environ, CPPPATH = includes) Help(opts.GenerateHelpText(env)) @ 1.5 log @Fix build with newer scons and update PLIST. Bump revision. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2012/11/13 23:26:23 mrg Exp $ @ 1.4 log @update to hydrogen 0.9.5.1. slightly clean up the netbsd port. 2011-02-19 the hydrogen team * Release 0.9.5.1 * Compatible with linux 3.0 kernels * Compiles now with gcc 4.7 * Added greek translation * Updated czech translation * Few small bugfixes 2011-03-15 the hydrogen team * Release 0.9.5 * load playlists at startup * midi-learn works now with shift-click on some gui elements * multi-track export * LADI support * maximum number of bars is now configurable * added czech translation * fixed serveral export song failures * added ogg, flac, aiff export support * added some new commandline parameter for no_gui version * added rubberband-cli support * several improvements on sample editor * added NO_GUI_SUPPORT to build a version of hydrogen without a gui * added support for app bundles on OSX * non destructive sample editor * piano roll editor * instrument midi out * destructive midi recording * support for midi "note off" messages * virtual patterns * time line to change song tempo and add tags * director * and at least several small changes * Xml handling is now done by QtXml instead of TinyXML * improved support for non-ascii filenames / strings * remove direct dependencies to libflac @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- Sconstruct.orig 2012-02-19 13:54:05.000000000 -0800 +++ Sconstruct 2012-11-13 13:39:48.000000000 -0800 @@@@ -47,7 +47,7 @@@@ d14 1 a14 1 @@@@ -75,6 +75,12 @@@@ d27 1 a27 1 @@@@ -96,6 +102,10 @@@@ d38 1 a38 1 @@@@ -283,6 +293,9 @@@@ d48 10 a57 1 @@@@ -380,7 +393,7 @@@@ @ 1.3 log @Linux build fixes: * On Linux only pull in alsa-lib buildlink and enable alsa support. * In the Sconstruct file move the line setting the include path and ldflags based on the prefix from the netbsd section to the linux, darwin and netbsd section. * When adding to an if/elif/else block _elif_ should be used. Bump PKGREVISION (because of the earlier libarchive additions). @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2012/03/26 13:59:40 joerg Exp $ d3 3 a5 4 diff -ru Sconstruct.orig Sconstruct --- Sconstruct.orig 2010-09-19 15:36:25.000000000 +0000 +++ Sconstruct @@@@ -47,7 +47,7 @@@@ def get_platform_flags( opts ): d9 2 a10 2 - if sys.platform == "linux2" or sys.platform == "darwin": + if sys.platform == "linux2" or sys.platform == "darwin" or sys.platform[:6] == "netbsd": d14 2 a15 1 @@@@ -73,6 +73,11 @@@@ def get_platform_flags( opts ): d18 1 a18 1 d24 1 d26 2 a27 4 if str(env['libarchive']) == "1": cppflags.append('-DLIBARCHIVE_SUPPORT') @@@@ -87,6 +92,9 @@@@ def get_platform_flags( opts ): if sys.platform == 'linux2': d29 1 d32 1 d38 1 a38 6 @@@@ -269,7 +277,7 @@@@ def get_hydrogen_gui( lib_hydrogen , opt if str(env['lash']) == "1": env.ParseConfig('pkg-config --cflags --libs lash-1.0') - if sys.platform == "darwin" or sys.platform == "linux2": + if sys.platform == "darwin" or sys.platform == "linux2" or sys.platform[:6] == "netbsd": d40 1 d42 3 d46 11 @ 1.2 log @Accept all NetBSD versions. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2011/04/28 10:27:39 mrg Exp $ d4 3 a6 3 --- Sconstruct.orig 2010-09-19 08:36:25.000000000 -0700 +++ Sconstruct 2011-03-04 17:40:28.000000000 -0800 @@@@ -47,7 +47,7 @@@@ d15 1 a15 3 @@@@ -87,6 +87,14 @@@@ if sys.platform == 'linux2': ldflags.append('-lasound') d17 2 a18 1 + if sys.platform[:6] == 'netbsd': a19 1 + ldflags.append('-lossaudio') d24 9 d37 1 a37 1 @@@@ -269,7 +277,7 @@@@ @ 1.1 log @update to hydrogen 0.9.4.2. changes include: - more jack support (not enabled) - qt3 -> qt4 update (including a major UI update) - support for more instruments - better midi support - many bug fixes - multi-layer instrument support - multiple concurrent patterns - FLAC support - autosave support - drumkit manager - much better pattern support/ui/editing thanks to wiz@@ for help getting this right. @ text @d1 1 a1 1 $NetBSD$ d11 1 a11 1 + if sys.platform == "linux2" or sys.platform == "darwin" or sys.platform == "netbsd5": d19 1 a19 1 + if sys.platform == 'netbsd5': d35 1 a35 1 + if sys.platform == "darwin" or sys.platform == "linux2" or sys.platform == "netbsd5": @