[51938] trunk/dports/audio/ardour2
devans at macports.org
devans at macports.org
Sat Jun 6 17:56:32 PDT 2009
Revision: 51938
http://trac.macports.org/changeset/51938
Author: devans at macports.org
Date: 2009-06-06 17:56:32 -0700 (Sat, 06 Jun 2009)
Log Message:
-----------
ardour2: update to version 2.8, now needs gcc43 to compile properly. Closes #19878, 19879.
Modified Paths:
--------------
trunk/dports/audio/ardour2/Portfile
trunk/dports/audio/ardour2/files/patch-SConstruct.diff
Added Paths:
-----------
trunk/dports/audio/ardour2/files/patch-gtk2_ardour-nag.cc.diff
trunk/dports/audio/ardour2/files/patch-libs-pbd-mountpoint.cc.diff
trunk/dports/audio/ardour2/files/patch-libs-pbd-pathscanner.cc.diff
Modified: trunk/dports/audio/ardour2/Portfile
===================================================================
--- trunk/dports/audio/ardour2/Portfile 2009-06-07 00:54:01 UTC (rev 51937)
+++ trunk/dports/audio/ardour2/Portfile 2009-06-07 00:56:32 UTC (rev 51938)
@@ -4,8 +4,7 @@
PortSystem 1.0
name ardour2
-version 2.5
-revision 1
+version 2.8
distname ardour-${version}
maintainers devans
categories audio x11
@@ -27,25 +26,32 @@
universal_variant no
use_bzip2 yes
+
master_sites macports:ardour2
-checksums md5 88180d400e8c19ceea41aabadc098116 \
- sha1 6d3d563cc11772d4d6de6f89551dd89e43466f84 \
- rmd160 81961248b48f5a9cd1eed0f1010e02f3236da6dc
+checksums md5 24bd768dbe08f1f2724dc97704ee0518 \
+ sha1 8cdd68e4dc3b7fcabb9b1ea1f59791932ca6281c \
+ rmd160 1d3f8e0ad79f0945bb52ae1760cbf2d78d38cffc
-depends_build port:gettext \
+depends_build port:gcc43 \
port:pkgconfig \
port:scons
-depends_lib port:liblrdf \
+depends_lib port:jack \
+ port:gtk2 \
port:libgnomecanvas \
- port:liblo \
+ port:liblrdf \
port:boost \
+ port:fftw-3 \
port:fftw-3-single \
- port:aubio \
- port:jack
+ port:libusb \
+ port:liblo \
+ port:aubio
-patchfiles patch-SConstruct.diff
+patchfiles patch-SConstruct.diff \
+ patch-libs-pbd-mountpoint.cc.diff \
+ patch-libs-pbd-pathscanner.cc.diff \
+ patch-gtk2_ardour-nag.cc.diff
post-patch {
reinplace "s%@MP_PREFIX@%${prefix}%g" ${worksrcpath}/SConstruct
@@ -56,7 +62,11 @@
build.cmd scons
build.target
build.args PREFIX=${prefix} VST=0 AUBIO=1 FREESOUND=1 LV2=0
+build.env CC=gcc-mp-4.3 CXX=g++-mp-4.3
+destroot.cmd scons
+destroot.env CC=gcc-mp-4.3 CXX=g++-mp-4.3
+
variant lv2 description {Add support for LV2 plugins (currently broken)} {
build.args-delete LV2=0
build.args-append LV2=1
Modified: trunk/dports/audio/ardour2/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/audio/ardour2/files/patch-SConstruct.diff 2009-06-07 00:54:01 UTC (rev 51937)
+++ trunk/dports/audio/ardour2/files/patch-SConstruct.diff 2009-06-07 00:56:32 UTC (rev 51938)
@@ -1,8 +1,12 @@
---- SConstruct.orig 2008-07-07 08:29:40.000000000 -0700
-+++ SConstruct 2009-05-07 15:28:59.000000000 -0700
-@@ -508,27 +508,27 @@
- #libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')
+--- SConstruct.orig 2009-03-26 14:12:56.000000000 -0700
++++ SConstruct 2009-03-27 19:42:00.000000000 -0700
+@@ -485,30 +485,30 @@
+ libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
+ #libraries['sndfile'] = LibraryInfo()
+-#libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')
++#libraries['sndfile'].ParseConfig('@MP_PREFIX@/bin/pkg-config --cflags --libs sndfile')
+
libraries['lrdf'] = LibraryInfo()
-libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
+libraries['lrdf'].ParseConfig('@MP_PREFIX@/bin/pkg-config --cflags --libs lrdf')
@@ -31,10 +35,10 @@
libraries['aubio'] = LibraryInfo()
- libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
+ libraries['aubio'].ParseConfig('@MP_PREFIX@/bin/pkg-config --cflags --libs aubio')
-
- env = conf.Finish ()
-
-@@ -569,7 +569,7 @@
+ env['AUBIO'] = 1
+ else:
+ env['AUBIO'] = 0
+@@ -540,7 +540,7 @@
print ('Ardour cannot be compiled without the curl headers, which do not seem to be installed')
sys.exit (1)
else:
@@ -43,17 +47,17 @@
conf.Finish()
else:
print 'FREESOUND support is not enabled. Build with \'scons FREESOUND=1\' to enable.'
-@@ -579,7 +579,7 @@
+@@ -550,7 +550,7 @@
- if conf.CheckPKGExists ('\"slv2 >= 0.6.0\"'):
+ if conf.CheckPKGVersion('slv2', '0.6.1'):
libraries['slv2'] = LibraryInfo()
- libraries['slv2'].ParseConfig('pkg-config --cflags --libs slv2')
+ libraries['slv2'].ParseConfig('@MP_PREFIX@/bin/pkg-config --cflags --libs slv2')
env.Append (CCFLAGS="-DHAVE_LV2")
else:
- print 'Building Ardour with LV2 support requires SLV2 >= 0.6.0'
-@@ -592,31 +592,31 @@
- print 'LV2 support is not enabled. Build with \'scons LV2=1\' to enable.'
+ print 'LV2 support is not enabled (SLV2 not found or older than 0.6.0)'
+@@ -563,31 +563,31 @@
+ print 'WIIMOTE not enabled. Build with \'scons WIIMOTE=1\' to enable support.'
libraries['jack'] = LibraryInfo()
-libraries['jack'].ParseConfig('pkg-config --cflags --libs jack')
@@ -95,19 +99,8 @@
#libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
-@@ -846,8 +846,8 @@
- if topenv['GTKOSX']:
- libinfo.Append(CPPPATH="/opt/gtk/include", LIBPATH="/opt/gtk/lib")
- libinfo.Append(CXXFLAGS="-I/opt/gtk/include", LINKFLAGS="-L/opt/gtk/lib")
-- libinfo.Append(CPPPATH="/opt/local/include", LIBPATH="/opt/local/lib")
-- libinfo.Append(CXXFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib")
-+ libinfo.Append(CPPPATH="@MP_PREFIX@/include", LIBPATH="@MP_PREFIX@/lib")
-+ libinfo.Append(CXXFLAGS="-I at MP_PREFIX@/include", LINKFLAGS="-L at MP_PREFIX@/lib")
+@@ -869,7 +869,7 @@
- prep_libcheck(env, env)
-
-@@ -867,7 +867,7 @@
-
conf = Configure (env)
-if conf.CheckHeader ('fftw3.h'):
@@ -115,7 +108,7 @@
env['RUBBERBAND'] = True
libraries['rubberband'] = LibraryInfo (LIBS='rubberband',
LIBPATH='#libs/rubberband',
-@@ -910,7 +910,7 @@
+@@ -926,7 +926,7 @@
libraries['flac'] = LibraryInfo ()
prep_libcheck(env, libraries['flac'])
@@ -124,7 +117,7 @@
#
# june 1st 2007: look for a function that is in FLAC 1.1.2 and not in later versions
-@@ -934,7 +934,7 @@
+@@ -950,7 +950,7 @@
libraries['boost'] = LibraryInfo ()
prep_libcheck(env, libraries['boost'])
@@ -133,7 +126,7 @@
conf = Configure (libraries['boost'])
if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == False:
print "Boost header files do not appear to be installed. You also might be running a buggy version of scons. Try scons 0.97 if you can."
-@@ -948,6 +948,7 @@
+@@ -964,6 +964,7 @@
if env['LIBLO']:
libraries['lo'] = LibraryInfo ()
prep_libcheck(env, libraries['lo'])
@@ -141,7 +134,7 @@
conf = Configure (libraries['lo'])
if conf.CheckLib ('lo', 'lo_server_new') == False:
-@@ -1044,21 +1045,21 @@
+@@ -1065,21 +1066,21 @@
env = conf.Finish()
libraries['sigc2'] = LibraryInfo()
@@ -171,7 +164,24 @@
#
# cannot use system one for the time being
-@@ -1272,7 +1273,7 @@
+@@ -1090,13 +1091,13 @@
+ CPPPATH=['#libs/libsndfile/src'])
+
+ # libraries['libglademm'] = LibraryInfo()
+-# libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
++# libraries['libglademm'].ParseConfig('@MP_PREFIX@/bin/pkg-config --cflags --libs libglademm-2.4')
+
+ # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
+ libraries['soundtouch'] = LibraryInfo()
+- libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
++ libraries['soundtouch'].ParseConfig('@MP_PREFIX@/bin/pkg-config --cflags --libs soundtouch-1.0')
+ # Comment the previous line and uncomment this for old versions of Debian:
+- #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
++ #libraries['soundtouch'].ParseConfig('@MP_PREFIX@/bin/pkg-config --cflags --libs libSoundTouch')
+
+ libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
+ LIBPATH='#libs/appleutility',
+@@ -1299,7 +1300,7 @@
else:
print "Found msgmerge"
Added: trunk/dports/audio/ardour2/files/patch-gtk2_ardour-nag.cc.diff
===================================================================
--- trunk/dports/audio/ardour2/files/patch-gtk2_ardour-nag.cc.diff (rev 0)
+++ trunk/dports/audio/ardour2/files/patch-gtk2_ardour-nag.cc.diff 2009-06-07 00:56:32 UTC (rev 51938)
@@ -0,0 +1,22 @@
+--- gtk2_ardour/nag.cc.orig 2009-02-24 04:37:42.000000000 -0800
++++ gtk2_ardour/nag.cc 2009-06-06 15:02:31.000000000 -0700
+@@ -191,15 +191,15 @@
+ GError* err;
+ return gtk_open_uri (0, uri, GDK_CURRENT_TIME, &err);
+ #else
+-#ifndef __APPLE__
++#ifdef GTKOSX
++ extern bool cocoa_open_url (const char*);
++ return cocoa_open_url (uri);
++#else
+ std::string command = "xdg-open ";
+ command += uri;
+ spawn_command_line_async (command);
+
+ return true;
+-#else
+- extern bool cocoa_open_url (const char*);
+- return cocoa_open_url (uri);
+ #endif
+ #endif
+ }
Added: trunk/dports/audio/ardour2/files/patch-libs-pbd-mountpoint.cc.diff
===================================================================
--- trunk/dports/audio/ardour2/files/patch-libs-pbd-mountpoint.cc.diff (rev 0)
+++ trunk/dports/audio/ardour2/files/patch-libs-pbd-mountpoint.cc.diff 2009-06-07 00:56:32 UTC (rev 51938)
@@ -0,0 +1,13 @@
+--- libs/pbd/mountpoint.cc.orig 2009-06-06 10:26:24.000000000 -0700
++++ libs/pbd/mountpoint.cc 2009-06-06 11:15:08.000000000 -0700
+@@ -96,6 +96,10 @@
+ #include <sys/ucred.h>
+ #include <sys/mount.h>
+
++#if defined(__APPLE__)
++#include <stdlib.h>
++#endif
++
+ string
+ mountpoint (string path)
+ {
Added: trunk/dports/audio/ardour2/files/patch-libs-pbd-pathscanner.cc.diff
===================================================================
--- trunk/dports/audio/ardour2/files/patch-libs-pbd-pathscanner.cc.diff (rev 0)
+++ trunk/dports/audio/ardour2/files/patch-libs-pbd-pathscanner.cc.diff 2009-06-07 00:56:32 UTC (rev 51938)
@@ -0,0 +1,13 @@
+--- libs/pbd/pathscanner.cc.orig 2009-06-06 10:44:16.000000000 -0700
++++ libs/pbd/pathscanner.cc 2009-06-06 11:16:36.000000000 -0700
+@@ -30,6 +30,10 @@
+ #include <pbd/pathscanner.h>
+ #include <pbd/stl_delete.h>
+
++#if defined(__APPLE__) && !defined(PATH_MAX)
++#define PATH_MAX 1024
++#endif
++
+ using namespace PBD;
+
+ vector<string *> *
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090606/5451b84f/attachment.html>
More information about the macports-changes
mailing list