it builds!

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..b8f99f5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+work

diff --git a/Makefile b/Makefile
index 1af92dcd008f33e22fc0ec1feec75aacfdbcbf45..6298399ca198e5e3746b9d10ae1642828f96ff92 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
 SCONS_ENV=     ${CONFIGURE_ENV} ${MAKE_ENV}
 SCONS_ARGS=    PREFIX=${PREFIX:Q}
 
 SCONS_ENV=     ${CONFIGURE_ENV} ${MAKE_ENV}
 SCONS_ARGS=    PREFIX=${PREFIX:Q}
 

+.include "../../mk/bsd.prefs.mk"

 .if defined(DESTDIR)
 SCONS_ARGS+=   DESTDIR=${DESTDIR:Q}
 .endif
 .if defined(DESTDIR)
 SCONS_ARGS+=   DESTDIR=${DESTDIR:Q}
 .endif


@@ -43,6 +44,7 @@ do-install:
 
 BUILD_DEPENDS+=        scons>=0.96:../../devel/scons
 .include "../../audio/alsa-lib/buildlink3.mk"
 
 BUILD_DEPENDS+=        scons>=0.96:../../devel/scons
 .include "../../audio/alsa-lib/buildlink3.mk"

+.include "../../wip/aubio/buildlink3.mk"

 .include "../../audio/jack/buildlink3.mk"
 .include "../../wip/liblo/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/jack/buildlink3.mk"
 .include "../../wip/liblo/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"


@@ -50,11 +52,14 @@ BUILD_DEPENDS+=     scons>=0.96:../../devel/scons
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"

 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../math/fftwf/buildlink3.mk"
 .include "../../textproc/liblrdf/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../math/fftwf/buildlink3.mk"
 .include "../../textproc/liblrdf/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"

+.include "../../textproc/libxslt/buildlink3.mk"

 .include "../../textproc/raptor/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../textproc/raptor/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"

diff --git a/PLIST b/PLIST
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3f2e65cd8ac27537d0e805424b4d86660a497c9a 100644 (file)
--- a/PLIST
+++ b/PLIST
@@ -0,0 +1,159 @@
+@comment $NetBSD$
+bin/ardour2
+etc/ardour2/SAE-de-keypad.bindings
+etc/ardour2/SAE-de-nokeypad.bindings
+etc/ardour2/SAE-us-keypad.bindings
+etc/ardour2/SAE-us-nokeypad.bindings
+etc/ardour2/ardour-sae.menus
+etc/ardour2/ardour.menus
+etc/ardour2/ardour2_ui_dark.rc
+etc/ardour2/ardour2_ui_dark_sae.rc
+etc/ardour2/ardour2_ui_default.conf
+etc/ardour2/ardour2_ui_light.rc
+etc/ardour2/ardour2_ui_light_sae.rc
+etc/ardour2/ardour_system.rc
+etc/ardour2/ergonomic-us.bindings
+etc/ardour2/mnemonic-us.bindings
+lib/ardour2/${PKGNAME}
+lib/ardour2/engines/libclearlooks.so
+lib/ardour2/libardour.so
+lib/ardour2/libardour_cp.so
+lib/ardour2/libatkmm.so
+lib/ardour2/libgdkmm2.so
+lib/ardour2/libglibmm2.so
+lib/ardour2/libgnomecanvasmm.so
+lib/ardour2/libgtkmm2.so
+lib/ardour2/libgtkmm2ext.so
+lib/ardour2/libmidi++.so
+lib/ardour2/libpangomm.so
+lib/ardour2/libpbd.so
+lib/ardour2/librubberband.so
+lib/ardour2/libsigc++2.so
+lib/ardour2/libsoundtouch.so
+lib/ardour2/libvamphostsdk.so
+lib/ardour2/libvampsdk.so
+lib/ardour2/surfaces/libardour_genericmidi.so
+lib/ardour2/surfaces/libardour_mackie.so
+lib/ardour2/vamp/libardourvampplugins.so
+share/ardour2/icons/application-x-ardour_16px.png
+share/ardour2/icons/application-x-ardour_22px.png
+share/ardour2/icons/application-x-ardour_32px.png
+share/ardour2/icons/application-x-ardour_48px.png
+share/ardour2/icons/ardour_icon_16px.png
+share/ardour2/icons/ardour_icon_22px.png
+share/ardour2/icons/ardour_icon_32px.png
+share/ardour2/icons/ardour_icon_48px.png
+share/ardour2/icons/computer_keyboard.png
+share/ardour2/icons/computer_keyboard_active.png
+share/ardour2/icons/crossfade-in-S1.png
+share/ardour2/icons/crossfade-in-S2.png
+share/ardour2/icons/crossfade-in-constant-power.png
+share/ardour2/icons/crossfade-in-fast-cut.png
+share/ardour2/icons/crossfade-in-linear.png
+share/ardour2/icons/crossfade-in-long-cut.png
+share/ardour2/icons/crossfade-in-short-cut.png
+share/ardour2/icons/crossfade-in-slow-cut.png
+share/ardour2/icons/crossfade-out-S1.png
+share/ardour2/icons/crossfade-out-S2.png
+share/ardour2/icons/crossfade-out-constant-power.png
+share/ardour2/icons/crossfade-out-fast-cut.png
+share/ardour2/icons/crossfade-out-linear.png
+share/ardour2/icons/crossfade-out-long-cut.png
+share/ardour2/icons/crossfade-out-short-cut.png
+share/ardour2/icons/crossfade-out-slow-cut.png
+share/ardour2/icons/fader_belt.png
+share/ardour2/icons/fader_belt_h.png
+share/ardour2/icons/ferret_02.png
+share/ardour2/icons/grabber_edit_point.png
+share/ardour2/icons/hide.png
+share/ardour2/icons/nudge_left.png
+share/ardour2/icons/nudge_right.png
+share/ardour2/icons/record_normal_red.png
+share/ardour2/icons/record_tape_red.png
+share/ardour2/icons/sae.png
+share/ardour2/icons/saelogo.png
+share/ardour2/icons/strip_width.png
+share/ardour2/icons/tool_audition.png
+share/ardour2/icons/tool_gain.png
+share/ardour2/icons/tool_object.png
+share/ardour2/icons/tool_stretch.png
+share/ardour2/icons/tool_zoom.png
+share/ardour2/icons/transport_end.png
+share/ardour2/icons/transport_loop.png
+share/ardour2/icons/transport_play.png
+share/ardour2/icons/transport_range.png
+share/ardour2/icons/transport_record.png
+share/ardour2/icons/transport_start.png
+share/ardour2/icons/transport_stop.png
+share/ardour2/icons/zoom_full.png
+share/ardour2/icons/zoom_in.png
+share/ardour2/icons/zoom_out.png
+share/ardour2/pixmaps/forwardblarrow.xpm
+share/ardour2/pixmaps/hiin.xpm
+share/ardour2/pixmaps/hiout.xpm
+share/ardour2/pixmaps/hslider00.xpm
+share/ardour2/pixmaps/hslider01.xpm
+share/ardour2/pixmaps/left_arrow.xpm
+share/ardour2/pixmaps/linin.xpm
+share/ardour2/pixmaps/linout.xpm
+share/ardour2/pixmaps/loin.xpm
+share/ardour2/pixmaps/loop.xpm
+share/ardour2/pixmaps/loout.xpm
+share/ardour2/pixmaps/lr.xpm
+share/ardour2/pixmaps/regin.xpm
+share/ardour2/pixmaps/regin2.xpm
+share/ardour2/pixmaps/regout.xpm
+share/ardour2/pixmaps/regout2.xpm
+share/ardour2/pixmaps/revdblarrow.xpm
+share/ardour2/pixmaps/right_arrow.xpm
+share/ardour2/pixmaps/set-next-button.xpm
+share/ardour2/pixmaps/small-round-button-01.xpm
+share/ardour2/pixmaps/small_x.xpm
+share/ardour2/pixmaps/toggle-button-00.xpm
+share/ardour2/pixmaps/toggle-button-01.xpm
+share/ardour2/pixmaps/tool_audition.xpm
+share/ardour2/pixmaps/tool_gain.xpm
+share/ardour2/pixmaps/tool_object.xpm
+share/ardour2/pixmaps/tool_range.xpm
+share/ardour2/pixmaps/tool_stretch.xpm
+share/ardour2/pixmaps/tool_zoom.xpm
+share/ardour2/pixmaps/vslider00.xpm
+share/ardour2/pixmaps/vslider01.xpm
+share/ardour2/pixmaps/vslider02_rail.xpm
+share/ardour2/pixmaps/vslider02_slider.xpm
+share/ardour2/pixmaps/vslider_slider_16wide.xpm
+share/ardour2/pixmaps/zoom_full.xpm
+share/ardour2/pixmaps/zoom_in.xpm
+share/ardour2/pixmaps/zoom_out.xpm
+share/ardour2/splash.png
+share/ardour2/templates/16 Tracks.template
+share/ardour2/templates/2 Track.template
+share/ardour2/templates/32 Tracks.template
+share/ardour2/templates/4 Tracks.template
+share/ardour2/templates/8 Tracks.template
+share/locale/cs/LC_MESSAGES/gtk2_ardour.mo
+share/locale/de/LC_MESSAGES/gtk2_ardour.mo
+share/locale/el/LC_MESSAGES/gtk2_ardour.mo
+share/locale/el/LC_MESSAGES/libardour2.mo
+share/locale/el/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/es/LC_MESSAGES/gtk2_ardour.mo
+share/locale/es/LC_MESSAGES/libardour2.mo
+share/locale/es/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/fr/LC_MESSAGES/gtk2_ardour.mo
+share/locale/fr/LC_MESSAGES/libardour2.mo
+share/locale/it/LC_MESSAGES/gtk2_ardour.mo
+share/locale/it/LC_MESSAGES/libardour2.mo
+share/locale/nn/LC_MESSAGES/gtk2_ardour.mo
+share/locale/nn/LC_MESSAGES/libardour2.mo
+share/locale/nn/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pl/LC_MESSAGES/gtk2_ardour.mo
+share/locale/pl/LC_MESSAGES/libardour2.mo
+share/locale/pl/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pt/LC_MESSAGES/gtk2_ardour.mo
+share/locale/pt/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pt_PT/LC_MESSAGES/gtk2_ardour.mo
+share/locale/ru/LC_MESSAGES/gtk2_ardour.mo
+share/locale/ru/LC_MESSAGES/libardour2.mo
+share/locale/ru/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/sv/LC_MESSAGES/gtk2_ardour.mo
+share/locale/sv/LC_MESSAGES/libardour2.mo

diff --git a/distinfo b/distinfo
index bb2fa0c4367c24129235353dbeb13439b2951016..3ec41744ca832eb4cef8db01ad22357be3683d0c 100644 (file)
--- a/distinfo
+++ b/distinfo
@@ -3,6 +3,10 @@ $NetBSD$
 SHA1 (ardour-2.8.6.tar.bz2) = bf85e789868b5a5928dcada0623b735b582e9713
 RMD160 (ardour-2.8.6.tar.bz2) = 5bd173357603e2d01e2b6353100daee5bee71ee1
 Size (ardour-2.8.6.tar.bz2) = 3246297 bytes
 SHA1 (ardour-2.8.6.tar.bz2) = bf85e789868b5a5928dcada0623b735b582e9713
 RMD160 (ardour-2.8.6.tar.bz2) = 5bd173357603e2d01e2b6353100daee5bee71ee1
 Size (ardour-2.8.6.tar.bz2) = 3246297 bytes

-SHA1 (patch-aa) = d3cb48f54bcff31cc2640b043451e916cb101d3d
-SHA1 (patch-ab) = caab616cc4c69feddc8138fcb25dd97c6634e95e
-SHA1 (patch-ac) = 1263127dd9747ce19bb8cc176c51356eccd17ca5
+SHA1 (patch-aa) = cd66688e8b0ac40aa5bb8d14b81406f158107e2b
+SHA1 (patch-ab) = 8c1a5bb95193cd6b817655c23046af8eb3fe4260
+SHA1 (patch-ac) = 68dcaeef86736dd16dce6b1d43a6c4a08c72a2d8
+SHA1 (patch-ad) = 314343c5793f9027043b41aa5932ede08c78b1c3
+SHA1 (patch-ae) = 0bdfa32d4e784d8e2dccf37dea4253a90ad56328
+SHA1 (patch-af) = 60bed00e967648d36827984edae9b99a34e775d5
+SHA1 (patch-ag) = d429d5a4e26afd0ec01363e3c42477144cb1a010

diff --git a/patches/patch-aa b/patches/patch-aa
index c5a27894e4b55d896e388c59ef09d8444fda2167..147fce46df7db7212bf3554229f77cbb0bd4d661 100644 (file)
--- a/patches/patch-aa
+++ b/patches/patch-aa
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- libs/pbd/fpu.cc.orig       2010-01-27 04:49:19.000000000 +0000
+--- libs/pbd/fpu.cc.orig       2009-12-31 23:51:11.000000000 +0000

 +++ libs/pbd/fpu.cc
 @@ -1,4 +1,3 @@
 -#define _XOPEN_SOURCE 600
 +++ libs/pbd/fpu.cc
 @@ -1,4 +1,3 @@
 -#define _XOPEN_SOURCE 600

diff --git a/patches/patch-ab b/patches/patch-ab
index caf49ee6a5ef06193c62a6133df1bb150c703870..4f493a13f4e20da9178f2fb71944b88f267cb98d 100644 (file)
--- a/patches/patch-ab
+++ b/patches/patch-ab
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- libs/pbd/mountpoint.cc.orig        2010-01-27 05:09:59.000000000 +0000
+--- libs/pbd/mountpoint.cc.orig        2009-02-24 12:38:16.000000000 +0000

 +++ libs/pbd/mountpoint.cc
 @@ -99,7 +99,11 @@ mountpoint (string path)
  string
 +++ libs/pbd/mountpoint.cc
 @@ -99,7 +99,11 @@ mountpoint (string path)
  string

diff --git a/patches/patch-ac b/patches/patch-ac
index 4602badb0b79178594916305e54424da99f952d7..a54e90b24a07417037a282ba99a68196bb84ed8c 100644 (file)
--- a/patches/patch-ac
+++ b/patches/patch-ac
@@ -1,6 +1,6 @@
 $NetBSD$
 
 $NetBSD$
 

---- libs/ardour/session_state.cc.orig  2010-01-27 05:36:58.000000000 +0000
+--- libs/ardour/session_state.cc.orig  2009-12-07 19:40:19.000000000 +0000

 +++ libs/ardour/session_state.cc
 @@ -17,6 +17,9 @@
      
 +++ libs/ardour/session_state.cc
 @@ -17,6 +17,9 @@
      

diff --git a/patches/patch-ad b/patches/patch-ad
new file mode 100644 (file)
index 0000000..d0be8f9
--- /dev/null
+++ b/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- gtk2_ardour/ardour_ui.cc.orig      2010-01-27 07:55:03.000000000 +0000
++++ gtk2_ardour/ardour_ui.cc
+@@ -684,11 +684,15 @@ ARDOUR_UI::check_memory_locking ()
+               int64_t ram;
+               long pages, page_size;
+ 
++#if defined(_SC_PHYS_PAGES)
+               if ((page_size = sysconf (_SC_PAGESIZE)) < 0 ||(pages = sysconf (_SC_PHYS_PAGES)) < 0) {
+                       ram = 0;
+               } else {
+                       ram = (int64_t) pages * (int64_t) page_size;
+               }
++#else
++        ram = 0;
++#endif
+ 
+               if (getrlimit (RLIMIT_MEMLOCK, &limits)) {
+                       return;

diff --git a/patches/patch-ae b/patches/patch-ae
new file mode 100644 (file)
index 0000000..7d74e9c
--- /dev/null
+++ b/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- gtk2_ardour/new_session_dialog.cc.orig     2010-01-27 08:58:15.000000000 +0000
++++ gtk2_ardour/new_session_dialog.cc
+@@ -582,7 +582,7 @@ NewSessionDialog::set_session_folder(con
+       */
+ 
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__NetBSD__)
+ 
+       char buf[PATH_MAX];
+ 

diff --git a/patches/patch-af b/patches/patch-af
new file mode 100644 (file)
index 0000000..df88133
--- /dev/null
+++ b/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- gtk2_ardour/SConscript.orig        2010-01-27 09:12:39.000000000 +0000
++++ gtk2_ardour/SConscript
+@@ -47,6 +47,7 @@ gtkardour.Merge ([
+     libraries['midi++2'],
+     libraries['pangomm'],
+     libraries['pbd'],
++    libraries['raptor'],
+     libraries['samplerate'],
+     libraries['sigc2'],
+     libraries['sndfile'],
+@@ -82,6 +83,9 @@ if gtkardour['FREESOUND']:
+       gtkardour.Merge ([libraries['curl']])
+       gtkardour.Append(CCFLAGS='-DFREESOUND')
+ 
++if gtkardour['LIBLO']:
++        gtkardour.Merge([libraries['lo']])
++
+ if gtkardour['RUBBERBAND']:
+       gtkardour.Merge ([ libraries['rubberband'] ])
+ else:

diff --git a/patches/patch-ag b/patches/patch-ag
new file mode 100644 (file)
index 0000000..b69bdba
--- /dev/null
+++ b/patches/patch-ag
@@ -0,0 +1,19 @@
+$NetBSD$
+
+--- gtk2_ardour/nn.po.orig     2010-01-27 10:04:23.000000000 +0000
++++ gtk2_ardour/nn.po
+@@ -5,12 +5,12 @@
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: PACKAGE VERSION\n"
++"Project-Id-Version: ardour-gtk\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2010-01-27 18:57+0900\n"
+ "PO-Revision-Date: 2010-01-17 21:11+0100\n"
+ "Last-Translator: Eivind Ødegård <gingermig@yahoo.no>\n"
+-"Language-Team: LANGUAGE <LL@li.org>\n"
++"Language-Team: \n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"