[67370] trunk/dports/audio/hydrogen
ryandesign at macports.org
ryandesign at macports.org
Thu May 6 14:16:46 PDT 2010
Revision: 67370
http://trac.macports.org/changeset/67370
Author: ryandesign at macports.org
Date: 2010-05-06 14:16:41 -0700 (Thu, 06 May 2010)
Log Message:
-----------
hydrogen: update to 0.9.4; see #21538
Modified Paths:
--------------
trunk/dports/audio/hydrogen/Portfile
trunk/dports/audio/hydrogen/files/patch-Sconstruct.diff
Removed Paths:
-------------
trunk/dports/audio/hydrogen/files/patch-qt4.py.diff
Modified: trunk/dports/audio/hydrogen/Portfile
===================================================================
--- trunk/dports/audio/hydrogen/Portfile 2010-05-06 20:48:00 UTC (rev 67369)
+++ trunk/dports/audio/hydrogen/Portfile 2010-05-06 21:16:41 UTC (rev 67370)
@@ -4,7 +4,8 @@
PortSystem 1.0
name hydrogen
-version 0.9.4-rc1-1
+epoch 1
+version 0.9.4
categories audio
platforms macosx
maintainers xenith.org:xenith
@@ -16,9 +17,9 @@
Its main goal is to provide professional yet simple and \
intuitive pattern-based drum programming.
-checksums md5 88f036f32153843997837a95c46ecbc5 \
- sha1 33e5691cb16defec282f17226778a477cde2d3d7 \
- rmd160 c575b81f8a82177c63e36be7a10fa27e0d830e79
+checksums md5 69b0e35a5bba8151347c5e6ec9e8e4f3 \
+ sha1 e988710f82af858c0c688cb1d1e19d789fca49ef \
+ rmd160 9f1514462eaa756fe0a3e8fed3ff647a32ad033d
depends_build port:scons
@@ -27,8 +28,7 @@
port:libsndfile \
port:libtar
-patchfiles patch-Sconstruct.diff \
- patch-qt4.py.diff
+patchfiles patch-Sconstruct.diff
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Sconstruct
@@ -45,6 +45,7 @@
prefix=${prefix} \
alsa=0 \
coreaudio=1 \
+ coremidi=0 \
flac=1 \
jack=0 \
lash=0 \
@@ -64,3 +65,14 @@
reinplace "s|@VERSION@|${version}|g" ${hydrogen_app}/Contents/Info.plist
}
+variant jack description {Compile with JACK support} {
+ depends_lib-append port:jack
+ build.args-delete jack=0
+ build.args-append jack=1
+}
+
+variant lrdf description {Compile with LRDF support} {
+ depends_lib-append port:liblrdf
+ build.args-delete lrdf=0
+ build.args-append lrdf=1
+}
Modified: trunk/dports/audio/hydrogen/files/patch-Sconstruct.diff
===================================================================
--- trunk/dports/audio/hydrogen/files/patch-Sconstruct.diff 2010-05-06 20:48:00 UTC (rev 67369)
+++ trunk/dports/audio/hydrogen/files/patch-Sconstruct.diff 2010-05-06 21:16:41 UTC (rev 67370)
@@ -1,5 +1,5 @@
---- Sconstruct.orig 2009-04-14 12:12:32.000000000 -0500
-+++ Sconstruct 2009-08-02 12:34:47.000000000 -0500
+--- Sconstruct.orig 2009-09-07 16:31:13.000000000 -0500
++++ Sconstruct 2010-05-06 15:56:51.000000000 -0500
@@ -41,9 +41,9 @@
@@ -12,51 +12,89 @@
env = Environment( options = opts )
-@@ -84,16 +84,12 @@
+@@ -70,6 +70,7 @@
+ if str(env['flac']) == "1": cppflags.append('-DFLAC_SUPPORT')
+
+ if sys.platform == "darwin" and str(env['coreaudio']) == "1": cppflags.append('-DCOREAUDIO_SUPPORT')
++ if sys.platform == "darwin" and str(env['coremidi']) == "1": cppflags.append('-DCOREMIDI_SUPPORT')
+
+ cppflags.append('-DLADSPA_SUPPORT')
+
+@@ -81,9 +82,6 @@
+ includes.append( 'gui/src/' )
+ includes.append( '3rdparty/install/include' )
+
+- if sys.platform == "darwin":
+- ldflags.append( '-L/opt/local/lib' )
+-
if sys.platform == 'linux2':
ldflags.append('-lasound')
-- elif sys.platform == 'darwin':
-- includes.append( [ '/sw/include', '/usr/local/include' ] )
-- ldflags.append( [ '-L/sw/lib', '-F/sw/lib', '-F/sw/lib/qt4-mac/lib', '-L/usr/local/lib' ] )
--
- elif sys.platform == "win32":
- includes.append( '3rdparty\libsndfile-1_0_17' )
- includes.append( 'build\pthreads\include' )
+@@ -93,7 +91,7 @@
includes.append( '3rdparty\libarchive\include' )
includes.append( 'windows\timeFix' )
+ includes.append( 'C:\Program Files\GnuWin32\include' )
- else:
+ elif sys.platform != 'darwin':
raise Exception( "Platform '%s' not supported" % sys.platform )
return (includes, cppflags, ldflags)
-@@ -216,7 +212,6 @@
+@@ -275,8 +273,10 @@
+ if sys.platform == "darwin" and str(env['coreaudio']) == "1":
+ env.Append( LINKFLAGS = ['-framework','ApplicationServices'])
+ env.Append( LINKFLAGS = ['-framework','AudioUnit'])
+- env.Append( LINKFLAGS = ['-framework','Coreaudio'])
++ env.Append( LINKFLAGS = ['-framework','CoreAudio'])
- includes.append( "libs/hydrogen/include" )
- includes.append( "gui/src/UI" )
-- includes.append( "/usr/include/lash-1.0")
++ if sys.platform == "darwin" and str(env['coremidi']) == "1":
++ env.Append( LINKFLAGS = ['-framework','CoreMIDI'])
- #location of qt4.py
- qt4ToolLocation="."
-@@ -271,9 +266,6 @@
+ app = env.Program(target = 'hydrogen', source = src )
+@@ -318,7 +318,7 @@
+ rv = "-DJACK_NO_BBT_OFFSET"
+ xenv.MergeFlags(rv)
+-opts = Options('scache.conf')
++opts = Variables('scache.conf')
-- env.Append( LIBPATH = '3rdparty\libsndfile-1_0_17' )
-- env.Append( LIBPATH = 'build\pthreads\lib' )
--
- app = env.Program(target = 'hydrogen', source = src )
+ #platform independent settings
+ opts.Add('debug', 'Set to 1 to build with debug informations', 0)
+@@ -329,9 +329,18 @@
- env.Alias('programs', app)
-@@ -374,9 +366,9 @@
+ #platform dependent settings
+ if sys.platform == "darwin":
+- opts.Add('coreaudio', 'Set to 1 to enable Coreaudio',1)
++ opts.Add('coreaudio', 'Set to 1 to enable CoreAudio',1)
++ opts.Add('coremidi', 'Set to 1 to enable CoreMIDI',1)
++ opts.Add('portmidi', 'Set to 1 to enable portmidi',0)
++ opts.Add('portaudio', 'Set to 1 to enable portaudio',0)
++ opts.Add('oss', 'Set to 1 to enable oss',0)
++ opts.Add('alsa', 'Set to 1 to enable alsa',0)
++ opts.Add('jack', 'Set to 1 to enable jack',0)
++ opts.Add('flac', 'Set to 1 to enable flac',1)
++ opts.Add('lash', 'Set to 1 to enable lash',0)
++ opts.Add('lrdf', 'Set to 1 to enable lrdf',0)
- platform = sys.platform
+-if sys.platform != "win32":
++elif sys.platform != "win32":
+ opts.Add('oss', 'Set to 1 to enable oss',1)
--#just download 3rd party libs if we're *not* running linux.
-+#just download 3rd party libs if we're running Windows.
- #We trust in our package managment system!
--if platform == "darwin" or platform == "win32":
-+if platform == "win32":
- download_3rdparty_libs()
+ opts.Add('portmidi', 'Set to 1 to enable portmidi',0)
+@@ -474,7 +483,7 @@
+ print " lash: " + printStatus( env["lash"] )
+-print " oss: " + printStatus( env["oss"] )
++print " oss: " + printStatus( env["oss"] )
+ print " alsa: " + printStatus( env["alsa"] )
+ print " jack: " + printStatus( env["jack"] )
+ print "libarchive: " + printStatus( env["libarchive"] )
+@@ -482,6 +491,7 @@
+ print " portmidi: " + printStatus( env["portmidi"] )
+ if sys.platform == "darwin":
+ print " coreaudio: " + printStatus( env["coreaudio"] )
++ print " coremidi: " + printStatus( env["coremidi"] )
+
+ print "\n================================================================="
+ print ""
Deleted: trunk/dports/audio/hydrogen/files/patch-qt4.py.diff
===================================================================
--- trunk/dports/audio/hydrogen/files/patch-qt4.py.diff 2010-05-06 20:48:00 UTC (rev 67369)
+++ trunk/dports/audio/hydrogen/files/patch-qt4.py.diff 2010-05-06 21:16:41 UTC (rev 67370)
@@ -1,24 +0,0 @@
---- qt4.py.orig 2009-04-14 12:12:32.000000000 -0500
-+++ qt4.py 2009-08-02 12:26:22.000000000 -0500
-@@ -495,18 +495,13 @@
- self.AppendUnique(LINKFLAGS="-L$QTDIR/lib") #TODO clean!
- if debug : debugSuffix = 'd'
- for module in modules :
--# self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include")])
--# self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include",module)])
--# port qt4-mac:
-- self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include", "qt4")])
-- self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include", "qt4", module)])
-+ self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include")])
-+ self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include",module)])
- if module in staticModules :
- self.AppendUnique(LIBS=[module+debugSuffix]) # TODO: Add the debug suffix
- self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")])
- else :
--# self.Append(LINKFLAGS=['-framework', module])
--# port qt4-mac:
-- self.Append(LIBS=module)
-+ self.Append(LINKFLAGS=['-framework', module])
- if 'QtOpenGL' in modules:
- self.AppendUnique(LINKFLAGS="-F/System/Library/Frameworks")
- self.Append(LINKFLAGS=['-framework', 'AGL']) #TODO ughly kludge to avoid quotes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100506/93e6612d/attachment.html>
More information about the macports-changes
mailing list