[69930] trunk/dports/audio/ardour2
devans at macports.org
devans at macports.org
Thu Jul 22 14:20:08 PDT 2010
Revision: 69930
http://trac.macports.org/changeset/69930
Author: devans at macports.org
Date: 2010-07-22 14:20:04 -0700 (Thu, 22 Jul 2010)
Log Message:
-----------
ardour2: update to version 2.8.11, add license info and compile error warning on SL. Currently builds on Leopard and Tiger only.
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-main.cc.diff
Modified: trunk/dports/audio/ardour2/Portfile
===================================================================
--- trunk/dports/audio/ardour2/Portfile 2010-07-22 16:02:24 UTC (rev 69929)
+++ trunk/dports/audio/ardour2/Portfile 2010-07-22 21:20:04 UTC (rev 69930)
@@ -4,9 +4,10 @@
PortSystem 1.0
name ardour2
-version 2.8.2
+version 2.8.11
distname ardour-${version}
maintainers devans
+license GPLv2
categories audio x11
platforms darwin
homepage http://ardour.org/
@@ -29,9 +30,9 @@
master_sites macports:ardour2
-checksums md5 054640c746e806be81857754fc72c02e \
- sha1 ac3c589b2355211b8ea12f1fba656e66b3007bb4 \
- rmd160 6dcb714f8e0a7d4fba497f96918a61fb67318bc7
+checksums md5 f451a8d0abc133a1700c3932e07a5612 \
+ sha1 e04f0d9aacd929565386f8027807d881bdf8fca6 \
+ rmd160 e3567d1f5b8d0eb230b86951b7b8653b4344bff8
depends_build port:pkgconfig \
port:scons
@@ -51,6 +52,7 @@
patch-libs-pbd-mountpoint.cc.diff \
patch-libs-pbd-pathscanner.cc.diff \
patch-gtk2_ardour-SConscript.diff \
+ patch-gtk2_ardour-main.cc.diff \
patch-gtk2_ardour-nag.cc.diff
post-patch {
@@ -93,6 +95,13 @@
default_variants +gcc44
}
+platform darwin 10 {
+ # Broken on SL due to lack of support in scons configuration script.
+ pre-fetch {
+ return -code error "Ardour currently does not compile on Snow Leopard due to lack of support in configuration. Use Leopard or Tiger and watch for further developments."
+ }
+}
+
livecheck.type regex
livecheck.url ${homepage}
livecheck.regex "current release: ardour (\\d+(?:\\.\\d+)*)"
Modified: trunk/dports/audio/ardour2/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/audio/ardour2/files/patch-SConstruct.diff 2010-07-22 16:02:24 UTC (rev 69929)
+++ trunk/dports/audio/ardour2/files/patch-SConstruct.diff 2010-07-22 21:20:04 UTC (rev 69930)
@@ -1,6 +1,6 @@
---- SConstruct.orig 2009-07-20 08:55:10.000000000 -0700
-+++ SConstruct 2009-07-28 22:36:05.000000000 -0700
-@@ -528,7 +528,7 @@
+--- SConstruct.orig 2010-06-16 08:40:25.000000000 -0700
++++ SConstruct 2010-06-22 15:08:14.000000000 -0700
+@@ -530,7 +530,7 @@
print ('Ardour cannot be compiled without the curl headers, which do not seem to be installed')
sys.exit (1)
else:
@@ -9,7 +9,7 @@
conf.Finish()
else:
print 'FREESOUND support is not enabled. Build with \'scons FREESOUND=1\' to enable.'
-@@ -538,7 +538,7 @@
+@@ -540,7 +540,7 @@
if conf.CheckPKGVersion('slv2', '0.6.1'):
libraries['slv2'] = LibraryInfo()
@@ -18,7 +18,7 @@
env.Append (CCFLAGS="-DHAVE_LV2")
else:
print 'LV2 support is not enabled (SLV2 not found or older than 0.6.0)'
-@@ -866,7 +866,7 @@
+@@ -879,7 +879,7 @@
conf = Configure (env)
@@ -27,17 +27,8 @@
env['RUBBERBAND'] = True
libraries['rubberband'] = LibraryInfo (LIBS='rubberband',
LIBPATH='#libs/rubberband',
-@@ -923,7 +923,7 @@
+@@ -940,7 +940,7 @@
- libraries['flac'] = LibraryInfo ()
- prep_libcheck(env, libraries['flac'])
--libraries['flac'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib")
-+libraries['flac'].Append(CPPPATH="@MP_PREFIX@/include", LIBPATH="@MP_PREFIX@/lib")
-
- #
- # june 1st 2007: look for a function that is in FLAC 1.1.2 and not in later versions
-@@ -947,7 +947,7 @@
-
libraries['boost'] = LibraryInfo ()
prep_libcheck(env, libraries['boost'])
-libraries['boost'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib")
@@ -45,7 +36,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."
-@@ -961,6 +961,7 @@
+@@ -954,6 +954,7 @@
if env['LIBLO']:
libraries['lo'] = LibraryInfo ()
prep_libcheck(env, libraries['lo'])
@@ -53,7 +44,7 @@
conf = Configure (libraries['lo'])
if conf.CheckLib ('lo', 'lo_server_new') == False:
-@@ -1062,21 +1063,21 @@
+@@ -1055,30 +1056,30 @@
env = conf.Finish()
libraries['sigc2'] = LibraryInfo()
@@ -81,11 +72,6 @@
- libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6')
+ libraries['libgnomecanvasmm'].ParseConfig('@MP_PREFIX@/bin/pkg-config --cflags --libs libgnomecanvasmm-2.6')
- #
- # cannot use system one for the time being
-@@ -1087,13 +1088,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')
@@ -100,7 +86,7 @@
libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
LIBPATH='#libs/appleutility',
-@@ -1296,7 +1297,7 @@
+@@ -1276,7 +1277,7 @@
else:
print "Found msgmerge"
Added: trunk/dports/audio/ardour2/files/patch-gtk2_ardour-main.cc.diff
===================================================================
--- trunk/dports/audio/ardour2/files/patch-gtk2_ardour-main.cc.diff (rev 0)
+++ trunk/dports/audio/ardour2/files/patch-gtk2_ardour-main.cc.diff 2010-07-22 21:20:04 UTC (rev 69930)
@@ -0,0 +1,20 @@
+--- gtk2_ardour/main.cc.orig 2010-07-21 23:36:34.000000000 -0700
++++ gtk2_ardour/main.cc 2010-07-21 23:38:09.000000000 -0700
+@@ -62,7 +62,7 @@
+ static ARDOUR_UI *ui = 0;
+ static const char* localedir = LOCALEDIR;
+
+-#ifdef __APPLE__
++#ifdef GTKOSX
+
+ #include <mach-o/dyld.h>
+ #include <sys/param.h>
+@@ -313,7 +313,7 @@
+ {
+ vector<Glib::ustring> null_file_list;
+
+-#ifdef __APPLE__
++#ifdef GTKOSX
+ fixup_bundle_environment ();
+ #endif
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100722/5f235f41/attachment.html>
More information about the macports-changes
mailing list