Attachment #230559 for bug #260766




# Created by: Michael Beer <beerml@sigma6audio.de>

PORTNAME=	ardour6
PORTVERSION=	6.9.0
PORTREVISION=	1
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/

		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 \

	@${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>

Lines 1-3 Link Here

(-)b/audio/ardour6/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1627155605	1	TIMESTAMP = 1640539358
2	SHA256 (Ardour-6.8.0.tar.bz2) = bb5b48b7204c7dbfdc3b690a50e07cd651e82e0e6f8c2aefeb3d4b4289f4002d	2	SHA256 (Ardour-6.9.0.tar.bz2) = dcb68215822e3f826c9fc0826c7f9f98c9b6d39a4cb9ab67432c85eb5c636732
3	SIZE (Ardour-6.8.0.tar.bz2) = 12152361	3	SIZE (Ardour-6.9.0.tar.bz2) = 12297369




--- 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
 

Removed Link Here

(-)a/audio/ardour6/files/patch-libs_fst_wscript (-10 lines)
1	--- libs/fst/wscript.orig 2020-10-27 11:30:54 UTC
2	+++ libs/fst/wscript
3	@@ -80,7 +80,6 @@ def build(bld):
4
5	obj.includes = [ '../pbd/', '../ardour/', '.' ]
6	obj.defines = [
7	- '_POSIX_SOURCE',
8	'USE_WS_PREFIX',
9	'VST_SCANNER_APP',
10	'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"',

Lines 5-10 bin/ardour6-fix_bbtppq Link Here

(-)b/audio/ardour6/pkg-plist (-1 / +5 lines)
5	bin/ardour6-lua	5	bin/ardour6-lua
6	bin/ardour6-new_empty_session	6	bin/ardour6-new_empty_session
7	bin/ardour6-new_session	7	bin/ardour6-new_session
		8	bin/ffmpeg_harvid
		9	bin/ffprobe_harvid
8	%%ETCDIR%%/ardour.keys	10	%%ETCDIR%%/ardour.keys
9	%%ETCDIR%%/ardour.menus	11	%%ETCDIR%%/ardour.menus
10	%%ETCDIR%%/clearlooks.ardoursans.rc	12	%%ETCDIR%%/clearlooks.ardoursans.rc
Lines 262-267 share/applications/ardour6.desktop Link Here
262	%%DATADIR%%/mcp/nucleus.device	264	%%DATADIR%%/mcp/nucleus.device
263	%%DATADIR%%/mcp/qcon+qex.device	265	%%DATADIR%%/mcp/qcon+qex.device
264	%%DATADIR%%/mcp/qcon.device	266	%%DATADIR%%/mcp/qcon.device
		267	%%DATADIR%%/mcp/qcon_g2+g2ex.device
		268	%%DATADIR%%/mcp/qcon_g2.device
		269	%%DATADIR%%/mcp/qcon_g2ex+g2.device
265	%%DATADIR%%/mcp/qex+qcon.device	270	%%DATADIR%%/mcp/qex+qcon.device
266	%%DATADIR%%/mcp/ruco.device	271	%%DATADIR%%/mcp/ruco.device
267	%%DATADIR%%/mcp/user.profile	272	%%DATADIR%%/mcp/user.profile
268	-

Return to bug 260766

Lines 1-10 Link Here

(-)b/audio/ardour6/Makefile (-2 / +6 lines)
1	# Created by: Michael Beer <beerml@sigma6audio.de>	1	# Created by: Michael Beer <beerml@sigma6audio.de>
2		2
3	PORTNAME= ardour6	3	PORTNAME= ardour6
4	PORTVERSION= 6.8.0	4	PORTVERSION= 6.9.0
5	PORTREVISION= 1
6	CATEGORIES= audio	5	CATEGORIES= audio
7	MASTER_SITES= LOCAL/nc/mirror/ \	6	MASTER_SITES= LOCAL/nc/mirror/ \
		7	https://community.ardour.org/srctar/ \
8	https://misc.neelc.org/mirror/	8	https://misc.neelc.org/mirror/
9	# The original master side points to the latest release only:	9	# The original master side points to the latest release only:
10	# MASTER_SITES= https://community.ardour.org/srctar/	10	# MASTER_SITES= https://community.ardour.org/srctar/
Lines 32-42 LIB_DEPENDS= libserd-0.so:devel/serd \ Link Here
32	libjack.so:audio/jack \	32	libjack.so:audio/jack \
33	libfontconfig.so:x11-fonts/fontconfig \	33	libfontconfig.so:x11-fonts/fontconfig \
34	libfreetype.so:print/freetype2 \	34	libfreetype.so:print/freetype2 \
		35	libharfbuzz.so:print/harfbuzz \
35	libboost_date_time.so:devel/boost-libs \	36	libboost_date_time.so:devel/boost-libs \
36	libvamp-hostsdk.so:audio/vamp-plugin-sdk \	37	libvamp-hostsdk.so:audio/vamp-plugin-sdk \
37	libsamplerate.so:audio/libsamplerate \	38	libsamplerate.so:audio/libsamplerate \
38	libsndfile.so:audio/libsndfile \	39	libsndfile.so:audio/libsndfile \
39	libtag.so:audio/taglib \	40	libtag.so:audio/taglib \
		41	libfftw3.so:math/fftw3 \
40	libfftw3f.so:math/fftw3-float \	42	libfftw3f.so:math/fftw3-float \
41	libcurl.so:ftp/curl \	43	libcurl.so:ftp/curl \
42	libogg.so:audio/libogg \	44	libogg.so:audio/libogg \
Lines 107-111 post-install: Link Here
107	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ardour-${PORTVERSION}	109	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ardour-${PORTVERSION}
108	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/hardour-${PORTVERSION}	110	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/hardour-${PORTVERSION}
109	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/luasession	111	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/luasession
		112	@${LN} -sf ffmpeg ${STAGEDIR}${PREFIX}/bin/ffmpeg_harvid
		113	@${LN} -sf ffprobe ${STAGEDIR}${PREFIX}/bin/ffprobe_harvid
110		114
111	.include <bsd.port.mk>	115	.include <bsd.port.mk>

Added Link Here

(-)b/audio/ardour6/files/patch-libs_ardour_plugin__manager.cc (+18 lines)
1	--- libs/ardour/plugin_manager.cc.orig 2021-08-13 16:20:07 UTC
2	+++ libs/ardour/plugin_manager.cc
3	@@ -87,6 +87,7 @@
4	#include "ardour/search_paths.h"
5
6	#if (defined WINDOWS_VST_SUPPORT \|\| defined MACVST_SUPPORT \|\| defined LXVST_SUPPORT)
7	+#include "ardour/system_exec.h"
8	#include "ardour/vst2_scan.h"
9	#endif
10
11	@@ -113,6 +114,7 @@
12
13	#include "ardour/audio_unit.h"
14	#include "ardour/auv2_scan.h"
15	+#include "ardour/system_exec.h"
16	#include <Carbon/Carbon.h>
17	#endif
18