From owner-svn-ports-head@freebsd.org Mon Feb 12 05:20:30 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F651F19365; Mon, 12 Feb 2018 05:20:30 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 05D757F89F; Mon, 12 Feb 2018 05:20:30 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00CDF58B3; Mon, 12 Feb 2018 05:20:30 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1C5KTjT097203; Mon, 12 Feb 2018 05:20:29 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1C5KTjr097201; Mon, 12 Feb 2018 05:20:29 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201802120520.w1C5KTjr097201@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 12 Feb 2018 05:20:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461552 - head/audio/ardour X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/audio/ardour X-SVN-Commit-Revision: 461552 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Feb 2018 05:20:30 -0000 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