Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Feb 2018 05:20:29 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r461552 - head/audio/ardour
Message-ID:  <201802120520.w1C5KTjr097201@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Mon Feb 12 05:20:29 2018
New Revision: 461552
URL: https://svnweb.freebsd.org/changeset/ports/461552

Log:
  - Add `multimedia/v4l_compat' to BUILD_DEPENDS to make sure that
    Powermate code always gets built and there are no pkg-plist issues
  - For some reason, in certain circumstances the compiler could not
    properly resolve `bind()' calls even when "using namespace sigc";
    work this around by explicitly calling `sigc::bind()' instead
  - Fix remaining bugs revealed by strict (C++14) compiler (Clang 6)

Modified:
  head/audio/ardour/Makefile
  head/audio/ardour/pkg-plist

Modified: head/audio/ardour/Makefile
==============================================================================
--- head/audio/ardour/Makefile	Mon Feb 12 04:54:25 2018	(r461551)
+++ head/audio/ardour/Makefile	Mon Feb 12 05:20:29 2018	(r461552)
@@ -13,6 +13,7 @@ COMMENT=	Multichannel digital audio workstation
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
 LIB_DEPENDS=	liblo.so:audio/liblo \
 		liblrdf.so:textproc/liblrdf \
 		libjack.so:audio/jack \
@@ -80,6 +81,34 @@ post-patch:
 		${WRKSRC}/libs/ardour/session.cc \
 		${WRKSRC}/libs/ardour/session_transport.cc \
 		${WRKSRC}/libs/ardour/track.cc
+	@${REINPLACE_CMD} -e '/missing_source = /s,;, != NULL;,' \
+		${WRKSRC}/gtk2_ardour/editor_region_list.cc
+	@${REINPLACE_CMD} -E 's,(graph_gc|layout) == 0,!&,' \
+		${WRKSRC}/gtk2_ardour/fft_graph.cc \
+		${WRKSRC}/gtk2_ardour/panner2d.cc
+	@${REINPLACE_CMD} -e 's,( *bind,(sigc::bind,' \
+		${WRKSRC}/libs/gtkmm2ext/gtk_ui.cc \
+		${WRKSRC}/gtk2_ardour/ardour_ui2.cc \
+		${WRKSRC}/gtk2_ardour/ardour_ui_ed.cc \
+		${WRKSRC}/gtk2_ardour/audio_clock.cc \
+		${WRKSRC}/gtk2_ardour/audio_region_editor.cc \
+		${WRKSRC}/gtk2_ardour/crossfade_edit.cc \
+		${WRKSRC}/gtk2_ardour/editor.cc \
+		${WRKSRC}/gtk2_ardour/editor_audio_import.cc \
+		${WRKSRC}/gtk2_ardour/editor_canvas.cc \
+		${WRKSRC}/gtk2_ardour/editor_markers.cc \
+		${WRKSRC}/gtk2_ardour/editor_ops.cc \
+		${WRKSRC}/gtk2_ardour/editor_selection.cc \
+		${WRKSRC}/gtk2_ardour/editor_tempodisplay.cc \
+		${WRKSRC}/gtk2_ardour/generic_pluginui.cc \
+		${WRKSRC}/gtk2_ardour/io_selector.cc \
+		${WRKSRC}/gtk2_ardour/level_meter.cc \
+		${WRKSRC}/gtk2_ardour/mixer_strip.cc \
+		${WRKSRC}/gtk2_ardour/mixer_ui.cc \
+		${WRKSRC}/gtk2_ardour/option_editor.cc \
+		${WRKSRC}/gtk2_ardour/plugin_ui.cc \
+		${WRKSRC}/gtk2_ardour/route_time_axis.cc \
+		${WRKSRC}/gtk2_ardour/time_axis_view_item.cc
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/ardour2/templates

Modified: head/audio/ardour/pkg-plist
==============================================================================
--- head/audio/ardour/pkg-plist	Mon Feb 12 04:54:25 2018	(r461551)
+++ head/audio/ardour/pkg-plist	Mon Feb 12 05:20:29 2018	(r461552)
@@ -28,6 +28,7 @@ lib/ardour2/libvamphostsdk.so
 lib/ardour2/libvampsdk.so
 lib/ardour2/surfaces/libardour_genericmidi.so
 lib/ardour2/surfaces/libardour_mackie.so
+lib/ardour2/surfaces/libardour_powermate.so
 lib/ardour2/surfaces/libardour_tranzport.so
 lib/ardour2/vamp/libardourvampplugins.so
 share/ardour2/icons/application-x-ardour_16px.png



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802120520.w1C5KTjr097201>