[54834] trunk/dports/audio/hydrogen

ryandesign at macports.org ryandesign at macports.org
Sun Aug 2 15:40:19 PDT 2009


Revision: 54834
          http://trac.macports.org/changeset/54834
Author:   ryandesign at macports.org
Date:     2009-08-02 15:40:16 -0700 (Sun, 02 Aug 2009)
Log Message:
-----------
hydrogen: update to 0.9.4-rc1-1; see #20353

Modified Paths:
--------------
    trunk/dports/audio/hydrogen/Portfile

Added Paths:
-----------
    trunk/dports/audio/hydrogen/files/
    trunk/dports/audio/hydrogen/files/Info.plist
    trunk/dports/audio/hydrogen/files/patch-Sconstruct.diff
    trunk/dports/audio/hydrogen/files/patch-qt4.py.diff

Modified: trunk/dports/audio/hydrogen/Portfile
===================================================================
--- trunk/dports/audio/hydrogen/Portfile	2009-08-02 21:53:31 UTC (rev 54833)
+++ trunk/dports/audio/hydrogen/Portfile	2009-08-02 22:40:16 UTC (rev 54834)
@@ -4,12 +4,12 @@
 PortSystem       1.0
 
 name             hydrogen
-version          0.9.3.79
-revision         1
+version          0.9.4-rc1-1
 categories       audio
 platforms        macosx
 maintainers      nomaintainer
 homepage         http://www.hydrogen-music.org/
+master_sites     sourceforge
 
 description      Hydrogen is an advanced drum machine.
 long_description \
@@ -17,32 +17,51 @@
     Its main goal is to provide professional yet simple and intuitive \
     pattern-based drum programming.
 
-fetch.type      svn
-svn.url         http://svn.assembla.com/svn/hydrogen/trunk
-svn.tag         79
-worksrcdir      trunk
+checksums           md5     88f036f32153843997837a95c46ecbc5 \
+                    sha1    33e5691cb16defec282f17226778a477cde2d3d7 \
+                    rmd160  c575b81f8a82177c63e36be7a10fa27e0d830e79
 
-depends_lib     lib:libqt.4:qt4-mac \
+depends_build       port:scons
+
+depends_lib     port:qt4-mac \
                 port:flac \
                 port:libsndfile \
                 port:libtar
 
+patchfiles          patch-Sconstruct.diff \
+                    patch-qt4.py.diff
+
 post-patch {
-    reinplace "s|/opt/local|${prefix}|g" \
-        ${worksrcpath}/extra/hydrogenPlayer/hydrogenPlayer.pro \
-        ${worksrcpath}/extra/hydrogenSynth/hydrogenSynth.pro \
-        ${worksrcpath}/gui/gui.pro \
-        ${worksrcpath}/libs/hydrogen/hydrogen.pro
+    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Sconstruct
+    reinplace "s|@LDFLAGS@|${configure.ldflags}|g" ${worksrcpath}/Sconstruct
 }
 
-configure.pre_args
-configure.env       prefix=${prefix} QTDIR=${prefix}/libexec/qt4-mac
+use_configure       no
 
-build.target        first
+use_parallel_build  yes
 
-destroot.destdir    INSTALL_ROOT="${destroot}"
-post-destroot {
-    xinstall -d ${destroot}/Applications/MacPorts
-    move ${destroot}${prefix}/bin/hydrogen.app ${destroot}/Applications/MacPorts
+build.cmd           scons
+build.target
+build.args          DESTDIR=${destroot} \
+                    prefix=${prefix} \
+                    alsa=0 \
+                    coreaudio=1 \
+                    flac=1 \
+                    jack=0 \
+                    lash=0 \
+                    libarchive=0 \
+                    lrdf=0 \
+                    oss=0 \
+                    portaudio=0 \
+                    portmidi=0
+build.env           QTDIR=${prefix}/libexec/qt4-mac
+
+destroot {
+    set hydrogen_app ${destroot}${applications_dir}/Hydrogen.app
+    xinstall -d ${hydrogen_app}/Contents/MacOS ${hydrogen_app}/Contents/Resources
+    xinstall -m 755 ${worksrcpath}/hydrogen ${hydrogen_app}/Contents/MacOS/Hydrogen
+    copy ${worksrcpath}/data ${worksrcpath}/macos/Hydrogen.icns ${hydrogen_app}/Contents/Resources
+    copy ${filespath}/Info.plist ${hydrogen_app}/Contents
+    reinplace "s|@VERSION@|${version}|g" ${hydrogen_app}/Contents/Info.plist
 }
 

Added: trunk/dports/audio/hydrogen/files/Info.plist
===================================================================
--- trunk/dports/audio/hydrogen/files/Info.plist	                        (rev 0)
+++ trunk/dports/audio/hydrogen/files/Info.plist	2009-08-02 22:40:16 UTC (rev 54834)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>Hydrogen</string>
+	<key>CFBundleGetInfoString</key>
+	<string>@VERSION@</string>
+	<key>CFBundleIconFile</key>
+	<string>Hydrogen.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.hydrogen-music.hydrogen</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Hydrogen</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@VERSION@</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>@VERSION@</string>
+</dict>
+</plist>

Added: trunk/dports/audio/hydrogen/files/patch-Sconstruct.diff
===================================================================
--- trunk/dports/audio/hydrogen/files/patch-Sconstruct.diff	                        (rev 0)
+++ trunk/dports/audio/hydrogen/files/patch-Sconstruct.diff	2009-08-02 22:40:16 UTC (rev 54834)
@@ -0,0 +1,62 @@
+--- Sconstruct.orig	2009-04-14 12:12:32.000000000 -0500
++++ Sconstruct	2009-08-02 12:34:47.000000000 -0500
+@@ -41,9 +41,9 @@
+ 
+ 
+ def get_platform_flags( opts ):
+-	includes = []
++	includes = [ '@PREFIX@/include' ]
+ 	cppflags = []
+-	ldflags = []
++	ldflags = [ '@LDFLAGS@' ]
+ 
+ 	env = Environment( options = opts )
+ 
+@@ -84,16 +84,12 @@
+ 	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' )
+ 		includes.append( '3rdparty\libarchive\include' )
+ 		includes.append( 'windows\timeFix' )
+-	else:
++	elif sys.platform != 'darwin':
+ 		raise Exception( "Platform '%s' not supported" % sys.platform )
+ 
+ 	return (includes, cppflags, ldflags)
+@@ -216,7 +212,6 @@
+ 
+ 	includes.append( "libs/hydrogen/include" )
+ 	includes.append( "gui/src/UI" )
+-	includes.append( "/usr/include/lash-1.0")
+ 
+ 	#location of qt4.py
+ 	qt4ToolLocation="."
+@@ -271,9 +266,6 @@
+ 
+ 
+ 
+-	env.Append( LIBPATH = '3rdparty\libsndfile-1_0_17' )
+-	env.Append( LIBPATH = 'build\pthreads\lib' )
+-
+ 	app = env.Program(target = 'hydrogen', source = src )
+ 
+ 	env.Alias('programs', app)
+@@ -374,9 +366,9 @@
+ 
+ platform = sys.platform
+ 
+-#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()
+ 
+ 

Added: trunk/dports/audio/hydrogen/files/patch-qt4.py.diff
===================================================================
--- trunk/dports/audio/hydrogen/files/patch-qt4.py.diff	                        (rev 0)
+++ trunk/dports/audio/hydrogen/files/patch-qt4.py.diff	2009-08-02 22:40:16 UTC (rev 54834)
@@ -0,0 +1,24 @@
+--- 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/20090802/f1204ce6/attachment.html>


More information about the macports-changes mailing list