Attachment #247400 for bug #275875




PORTNAME=	ardour
DISTVERSION=	8.2.0
CATEGORIES=	audio
# Official source download is tailored to browsers, downloads from github are
# deliberately made empty. Put the badly named distfile into a subdirectory.
MASTER_SITES=	https://community.ardour.org/download/release/
DISTNAME=	Ardour-${DISTVERSION}
DISTFILES=	556
DIST_SUBDIR=	${DISTNAME}

MAINTAINER=	dev@submerge.ch

VST3_DESC=		Build with VST3 plugin support

VST3_BUILD_DEPENDS=	vst3sdk>0:audio/vst3sdk
VST3_CONFIGURE_OFF=	--no-vst3
VST3_CONFIGURE_OFF=	--vst3

post-patch:
	@${REINPLACE_CMD} -e 's/obj\.use            = '\''libsmf libpbd'\''/obj\.use            = '\''libsmf_internal libpbd'\''/g' ${WRKSRC}/libs/evoral/wscript

Lines 1-3 Link Here

(-)b/audio/ardour/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1697821942	1	TIMESTAMP = 1702555795
2	SHA256 (Ardour-8.1.0/550) = 5a2656b326b2ee38f14df9378d044982f9ca1607e7e0bec647686eb6edc9dc17	2	SHA256 (Ardour-8.2.0/556) = 74b13659cd25c1145706e3163c088e06ac9b5a34316601acfd35b6d124bbc93f
3	SIZE (Ardour-8.1.0/550) = 13835817	3	SIZE (Ardour-8.2.0/556) = 13897958




--- libs/aaf/AAFIAudioFiles.c.orig	2023-12-14 16:14:03 UTC
+++ libs/aaf/AAFIAudioFiles.c
@@ -39,6 +39,9 @@
 #include <arpa/inet.h>
 #include <mntent.h>
 #include <unistd.h> /* access() */
+#elif defined(__FreeBSD__)
+#include <limits.h>
+#include <unistd.h>
 #elif defined(__APPLE__)
 #include <sys/syslimits.h>
 #include <unistd.h> /* access() */

Added Link Here

(-)b/audio/ardour/files/patch-libs_aaf_aaf_LibCFB.h (+11 lines)
1	--- libs/aaf/aaf/LibCFB.h.orig 2023-12-14 15:52:18 UTC
2	+++ libs/aaf/aaf/LibCFB.h
3	@@ -28,6 +28,8 @@
4
5	#if defined(__linux__)
6	#include <linux/limits.h>
7	+#elif defined(__FreeBSD__)
8	+#include <limits.h>
9	#elif defined(__APPLE__)
10	#include <sys/syslimits.h>
11	#elif defined(_MSC_VER) // MSVC

Return to bug 275875

Lines 1-11 Link Here

(-)b/audio/ardour/Makefile (-4 / +3 lines)
1	PORTNAME= ardour	1	PORTNAME= ardour
2	DISTVERSION= 8.1.0	2	DISTVERSION= 8.2.0
3	CATEGORIES= audio	3	CATEGORIES= audio
4	# Official source download is tailored to browsers, downloads from github are	4	# Official source download is tailored to browsers, downloads from github are
5	# deliberately made empty. Put the badly named distfile into a subdirectory.	5	# deliberately made empty. Put the badly named distfile into a subdirectory.
6	MASTER_SITES= https://community.ardour.org/download/release/	6	MASTER_SITES= https://community.ardour.org/download/release/
7	DISTNAME= Ardour-${DISTVERSION}	7	DISTNAME= Ardour-${DISTVERSION}
8	DISTFILES= 550	8	DISTFILES= 556
9	DIST_SUBDIR= ${DISTNAME}	9	DIST_SUBDIR= ${DISTNAME}
10		10
11	MAINTAINER= dev@submerge.ch	11	MAINTAINER= dev@submerge.ch
Lines 75-82 OPTIONS_SUB= yes Link Here
75	VST3_DESC= Build with VST3 plugin support	75	VST3_DESC= Build with VST3 plugin support
76		76
77	VST3_BUILD_DEPENDS= vst3sdk>0:audio/vst3sdk	77	VST3_BUILD_DEPENDS= vst3sdk>0:audio/vst3sdk
78	# Inverted logic, the --vst3 argument _disables_ VST3 support.	78	VST3_CONFIGURE_OFF= --no-vst3
79	VST3_CONFIGURE_OFF= --vst3
80		79
81	post-patch:	80	post-patch:
82	@${REINPLACE_CMD} -e 's/obj\.use = '\''libsmf libpbd'\''/obj\.use = '\''libsmf_internal libpbd'\''/g' ${WRKSRC}/libs/evoral/wscript	81	@${REINPLACE_CMD} -e 's/obj\.use = '\''libsmf libpbd'\''/obj\.use = '\''libsmf_internal libpbd'\''/g' ${WRKSRC}/libs/evoral/wscript

Added Link Here

(-)b/audio/ardour/files/patch-libs_aaf_AAFIAudioFiles.c (+12 lines)
1	--- libs/aaf/AAFIAudioFiles.c.orig 2023-12-14 16:14:03 UTC
2	+++ libs/aaf/AAFIAudioFiles.c
3	@@ -39,6 +39,9 @@
4	#include <arpa/inet.h>
5	#include <mntent.h>
6	#include <unistd.h> /* access() */
7	+#elif defined(__FreeBSD__)
8	+#include <limits.h>
9	+#include <unistd.h>
10	#elif defined(__APPLE__)
11	#include <sys/syslimits.h>
12	#include <unistd.h> /* access() */

Lines 2-7 bin/%%ARDOUR_MAJOR%% Link Here

(-)b/audio/ardour/pkg-plist (-1 / +12 lines)
2	bin/%%ARDOUR_MAJOR%%-copy-mixer	2	bin/%%ARDOUR_MAJOR%%-copy-mixer
3	bin/%%ARDOUR_MAJOR%%-export	3	bin/%%ARDOUR_MAJOR%%-export
4	bin/%%ARDOUR_MAJOR%%-lua	4	bin/%%ARDOUR_MAJOR%%-lua
		5	bin/%%ARDOUR_MAJOR%%-new_aaf_session
5	bin/%%ARDOUR_MAJOR%%-new_empty_session	6	bin/%%ARDOUR_MAJOR%%-new_empty_session
6	bin/%%ARDOUR_MAJOR%%-new_session	7	bin/%%ARDOUR_MAJOR%%-new_session
7	bin/ffmpeg_harvid	8	bin/ffmpeg_harvid
Lines 46-51 lib/%%ARDOUR_MAJOR%%/backends/libdummy_audiobackend.so Link Here
46	lib/%%ARDOUR_MAJOR%%/backends/libjack_audiobackend.so	47	lib/%%ARDOUR_MAJOR%%/backends/libjack_audiobackend.so
47	lib/%%ARDOUR_MAJOR%%/engines/libclearlooks.so	48	lib/%%ARDOUR_MAJOR%%/engines/libclearlooks.so
48	lib/%%ARDOUR_MAJOR%%/hardour-%%VERSION%%	49	lib/%%ARDOUR_MAJOR%%/hardour-%%VERSION%%
		50	lib/%%ARDOUR_MAJOR%%/libaaf.so
		51	lib/%%ARDOUR_MAJOR%%/libaaf.so.0
		52	lib/%%ARDOUR_MAJOR%%/libaaf.so.0.0.0
49	lib/%%ARDOUR_MAJOR%%/libardour.so	53	lib/%%ARDOUR_MAJOR%%/libardour.so
50	lib/%%ARDOUR_MAJOR%%/libardour.so.3	54	lib/%%ARDOUR_MAJOR%%/libardour.so.3
51	lib/%%ARDOUR_MAJOR%%/libardour.so.3.0.0	55	lib/%%ARDOUR_MAJOR%%/libardour.so.3.0.0
Lines 95-108 lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport2.so Link Here
95	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport8.so	99	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport8.so
96	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_generic_midi.so	100	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_generic_midi.so
97	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launch_control_xl.so	101	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launch_control_xl.so
		102	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_mini.so
98	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_pro.so	103	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_pro.so
		104	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_x.so
99	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_mcp.so	105	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_mcp.so
100	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_osc.so	106	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_osc.so
		107	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_ssl_uf8.so
101	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_us2400.so	108	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_us2400.so
102	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_websockets.so	109	lib/%%ARDOUR_MAJOR%%/surfaces/libardour_websockets.so
103	lib/%%ARDOUR_MAJOR%%/utils/ardour-util.sh	110	lib/%%ARDOUR_MAJOR%%/utils/ardour-util.sh
104	lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-copy-mixer	111	lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-copy-mixer
105	lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-export	112	lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-export
		113	lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-new_aaf_session
106	lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-new_empty_session	114	lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-new_empty_session
107	lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-new_session	115	lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-new_session
108	lib/%%ARDOUR_MAJOR%%/vamp/libardourvampplugins.so	116	lib/%%ARDOUR_MAJOR%%/vamp/libardourvampplugins.so
Lines 180-186 share/applications/%%ARDOUR_MAJOR%%.desktop Link Here
180	%%DATADIR%%/icons/halfnote.png	188	%%DATADIR%%/icons/halfnote.png
181	%%DATADIR%%/icons/i_beam_cursor.png	189	%%DATADIR%%/icons/i_beam_cursor.png
182	%%DATADIR%%/icons/launch_control_xl.png	190	%%DATADIR%%/icons/launch_control_xl.png
		191	%%DATADIR%%/icons/launchpad-mini.png
183	%%DATADIR%%/icons/launchpad-pro.png	192	%%DATADIR%%/icons/launchpad-pro.png
		193	%%DATADIR%%/icons/launchpad-x.png
184	%%DATADIR%%/icons/mezzforte.png	194	%%DATADIR%%/icons/mezzforte.png
185	%%DATADIR%%/icons/mezzoforte.png	195	%%DATADIR%%/icons/mezzoforte.png
186	%%DATADIR%%/icons/mezzopiano.png	196	%%DATADIR%%/icons/mezzopiano.png
Lines 854-859 share/applications/%%ARDOUR_MAJOR%%.desktop Link Here
854	%%DATADIR%%/scripts/record_now.lua	864	%%DATADIR%%/scripts/record_now.lua
855	%%DATADIR%%/scripts/remove_unknown_procs.lua	865	%%DATADIR%%/scripts/remove_unknown_procs.lua
856	%%DATADIR%%/scripts/reset_mixer.lua	866	%%DATADIR%%/scripts/reset_mixer.lua
		867	%%DATADIR%%/scripts/reverse_midi.lua
857	%%DATADIR%%/scripts/rubberband_swing.lua	868	%%DATADIR%%/scripts/rubberband_swing.lua
858	%%DATADIR%%/scripts/s_chanmap.lua	869	%%DATADIR%%/scripts/s_chanmap.lua
859	%%DATADIR%%/scripts/s_cut_copy_section.lua	870	%%DATADIR%%/scripts/s_cut_copy_section.lua
Lines 896-901 share/applications/%%ARDOUR_MAJOR%%.desktop Link Here
896	%%DATADIR%%/scripts/surround_to_stereo.lua	907	%%DATADIR%%/scripts/surround_to_stereo.lua
897	%%DATADIR%%/scripts/tomsloop.lua	908	%%DATADIR%%/scripts/tomsloop.lua
898	%%DATADIR%%/scripts/track_organizer.lua	909	%%DATADIR%%/scripts/track_organizer.lua
		910	%%DATADIR%%/scripts/trigger_mixer_scene.lua
899	%%DATADIR%%/scripts/tx_raw_midi_from_file.lua	911	%%DATADIR%%/scripts/tx_raw_midi_from_file.lua
900	%%DATADIR%%/scripts/vamp_audio_to_midi.lua	912	%%DATADIR%%/scripts/vamp_audio_to_midi.lua
901	%%DATADIR%%/scripts/voice_activate.lua	913	%%DATADIR%%/scripts/voice_activate.lua
902	-