audio/ardour6: Update to 6.9.0

Fix MP3 audio export. It was unavailable due to missing ffmpeg_harvid and
ffprobe_harvid in $PATH.

Add dependencies on harfbuzz and fftw3 libraries, which were implicitly linked.

While here, pet linters.

PR:	260766
Reported by:	dev@submerge.ch

5 files changed, 37 insertions, 19 deletions

diff --git a/audio/ardour6/Makefile b/audio/ardour6/Makefile
index 28e4d67c73c9..1284df57f623 100644
--- a/audio/ardour6/Makefile
+++ b/audio/ardour6/Makefile
@@ -1,10 +1,10 @@
 # Created by: Michael Beer <beerml@sigma6audio.de>
 
 PORTNAME=	ardour6
-PORTVERSION=	6.8.0
-PORTREVISION=	1
+PORTVERSION=	6.9.0
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/nc/mirror/ \
+		https://community.ardour.org/srctar/ \
 		https://misc.neelc.org/mirror/
 # The original master side points to the latest release only:
 # MASTER_SITES=	https://community.ardour.org/srctar/
@@ -32,11 +32,13 @@ LIB_DEPENDS=	libserd-0.so:devel/serd \
 		libjack.so:audio/jack \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
 		libboost_date_time.so:devel/boost-libs \
 		libvamp-hostsdk.so:audio/vamp-plugin-sdk \
 		libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile \
 		libtag.so:audio/taglib \
+		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libcurl.so:ftp/curl \
 		libogg.so:audio/libogg \
@@ -48,12 +50,9 @@ USES=		compiler:c++11-lang desktop-file-utils gettext gnome \
 		libarchive pkgconfig python:3.7,build readline tar:bzip2 \
 		waf xorg
 USE_CXXSTD=	c++11
-USE_XORG=	x11
 USE_GNOME=	atk cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 pango
 USE_LDCONFIG=	yes
-BINARY_ALIAS+=	gas=${CC}
-
-PLIST_SUB=	ARDOURVERSION=${PORTVERSION}
+USE_XORG=	x11
 
 CONFIGURE_ARGS=	--optimize --ptformat --freedesktop --no-phone-home \
 		--with-backends=jack,dummy --internal-shared-libs --no-vst3 \
@@ -64,6 +63,10 @@ CONFIGURE_ARGS_i386=	--arch='-msse -mfpmath=sse -march=i686 -DARCH_X86' --dist-t
 
 LDFLAGS_powerpc=	-Wl,-z,notext
 
+BINARY_ALIAS+=	gas=${CC}
+
+PLIST_SUB=	ARDOURVERSION=${PORTVERSION}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's/obj\.use            = '\''libsmf libpbd'\''/obj\.use            = '\''libsmf_internal libpbd'\''/g' ${WRKSRC}/libs/evoral/wscript
 	@${REINPLACE_CMD} -e 's/libsmf\.name         = '\''libsmf'\''/libsmf\.name         = '\''libsmf_internal'\''/g' ${WRKSRC}/libs/evoral/wscript
@@ -107,5 +110,7 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ardour-${PORTVERSION}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/hardour-${PORTVERSION}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/luasession
+	@${LN} -sf ffmpeg ${STAGEDIR}${PREFIX}/bin/ffmpeg_harvid
+	@${LN} -sf ffprobe ${STAGEDIR}${PREFIX}/bin/ffprobe_harvid
 
 .include <bsd.port.mk>
diff --git a/audio/ardour6/distinfo b/audio/ardour6/distinfo
index 56bec8654554..2dab16a50fba 100644
--- a/audio/ardour6/distinfo
+++ b/audio/ardour6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627155605
-SHA256 (Ardour-6.8.0.tar.bz2) = bb5b48b7204c7dbfdc3b690a50e07cd651e82e0e6f8c2aefeb3d4b4289f4002d
-SIZE (Ardour-6.8.0.tar.bz2) = 12152361
+TIMESTAMP = 1640539358
+SHA256 (Ardour-6.9.0.tar.bz2) = dcb68215822e3f826c9fc0826c7f9f98c9b6d39a4cb9ab67432c85eb5c636732
+SIZE (Ardour-6.9.0.tar.bz2) = 12297369
diff --git a/audio/ardour6/files/patch-libs_ardour_plugin__manager.cc b/audio/ardour6/files/patch-libs_ardour_plugin__manager.cc
new file mode 100644
index 000000000000..64b2507b3393
--- /dev/null
+++ b/audio/ardour6/files/patch-libs_ardour_plugin__manager.cc
@@ -0,0 +1,18 @@
+--- libs/ardour/plugin_manager.cc.orig	2021-08-13 16:20:07 UTC
++++ libs/ardour/plugin_manager.cc
+@@ -87,6 +87,7 @@
+ #include "ardour/search_paths.h"
+ 
+ #if (defined WINDOWS_VST_SUPPORT || defined MACVST_SUPPORT || defined LXVST_SUPPORT)
++#include "ardour/system_exec.h"
+ #include "ardour/vst2_scan.h"
+ #endif
+ 
+@@ -113,6 +114,7 @@
+ 
+ #include "ardour/audio_unit.h"
+ #include "ardour/auv2_scan.h"
++#include "ardour/system_exec.h"
+ #include <Carbon/Carbon.h>
+ #endif
+ 
diff --git a/audio/ardour6/files/patch-libs_fst_wscript b/audio/ardour6/files/patch-libs_fst_wscript
deleted file mode 100644
index 9c70d438c589..000000000000
--- a/audio/ardour6/files/patch-libs_fst_wscript
+++ /dev/null
@@ -1,10 +0,0 @@
---- libs/fst/wscript.orig	2020-10-27 11:30:54 UTC
-+++ libs/fst/wscript
-@@ -80,7 +80,6 @@ def build(bld):
- 
-     obj.includes  = [ '../pbd/', '../ardour/', '.' ]
-     obj.defines = [
--        '_POSIX_SOURCE',
-         'USE_WS_PREFIX',
-         'VST_SCANNER_APP',
-         'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"',
diff --git a/audio/ardour6/pkg-plist b/audio/ardour6/pkg-plist
index 211f6b0e8a43..eb4f40b079df 100644
--- a/audio/ardour6/pkg-plist
+++ b/audio/ardour6/pkg-plist
@@ -5,6 +5,8 @@ bin/ardour6-fix_bbtppq
 bin/ardour6-lua
 bin/ardour6-new_empty_session
 bin/ardour6-new_session
+bin/ffmpeg_harvid
+bin/ffprobe_harvid
 %%ETCDIR%%/ardour.keys
 %%ETCDIR%%/ardour.menus
 %%ETCDIR%%/clearlooks.ardoursans.rc
@@ -262,6 +264,9 @@ share/applications/ardour6.desktop
 %%DATADIR%%/mcp/nucleus.device
 %%DATADIR%%/mcp/qcon+qex.device
 %%DATADIR%%/mcp/qcon.device
+%%DATADIR%%/mcp/qcon_g2+g2ex.device
+%%DATADIR%%/mcp/qcon_g2.device
+%%DATADIR%%/mcp/qcon_g2ex+g2.device
 %%DATADIR%%/mcp/qex+qcon.device
 %%DATADIR%%/mcp/ruco.device
 %%DATADIR%%/mcp/user.profile