git: edfde42f517a - main - audio/ardour: Update to 8.6.0 release.

The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=edfde42f517aa7e9f9f8f5d325455937748f5c28

commit edfde42f517aa7e9f9f8f5d325455937748f5c28
Author:     Florian Walpen <dev@submerge.ch>
AuthorDate: 2024-04-12 13:25:23 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-04-23 19:17:20 +0000

    audio/ardour: Update to 8.6.0 release.
    
    ChangeLog:      https://ardour.org/whatsnew.html
    PR:             278327
---
 audio/ardour/Makefile                              |  5 ++---
 audio/ardour/distinfo                              |  6 ++---
 audio/ardour/files/patch-libs_aaf_aaf_LibCFB.h     | 11 ---------
 ...aaf_AAFIAudioFiles.c => patch-libs_aaf_utils.c} |  6 ++---
 audio/ardour/files/patch-libs_ardour_session.cc    | 26 ----------------------
 5 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index 2caa89eb4f05..fc7b5256eadc 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -1,12 +1,11 @@
 PORTNAME=	ardour
-DISTVERSION=	8.4.0
-PORTREVISION=	1
+DISTVERSION=	8.6.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=	562
+DISTFILES=	574
 DIST_SUBDIR=	${DISTNAME}
 
 MAINTAINER=	dev@submerge.ch
diff --git a/audio/ardour/distinfo b/audio/ardour/distinfo
index 4ac647b18907..f90f518145c8 100644
--- a/audio/ardour/distinfo
+++ b/audio/ardour/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708609514
-SHA256 (Ardour-8.4.0/562) = 7c64fd95808d94440639698e0f8ece30da8b5efde2777fff55c8bc21404e28cf
-SIZE (Ardour-8.4.0/562) = 17574218
+TIMESTAMP = 1713026350
+SHA256 (Ardour-8.6.0/574) = e19740e980b162ecd22379b735000741609f89c7553796b75f47b75e2f1e0a8e
+SIZE (Ardour-8.6.0/574) = 17588463
diff --git a/audio/ardour/files/patch-libs_aaf_aaf_LibCFB.h b/audio/ardour/files/patch-libs_aaf_aaf_LibCFB.h
deleted file mode 100644
index b260e1fc766d..000000000000
--- a/audio/ardour/files/patch-libs_aaf_aaf_LibCFB.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/aaf/aaf/LibCFB.h.orig	2023-12-14 15:52:18 UTC
-+++ libs/aaf/aaf/LibCFB.h
-@@ -28,6 +28,8 @@
-
- #if defined(__linux__)
- #include <linux/limits.h>
-+#elif defined(__FreeBSD__)
-+#include <limits.h>
- #elif defined(__APPLE__)
- #include <sys/syslimits.h>
- #elif defined(_MSC_VER) // MSVC
diff --git a/audio/ardour/files/patch-libs_aaf_AAFIAudioFiles.c b/audio/ardour/files/patch-libs_aaf_utils.c
similarity index 69%
rename from audio/ardour/files/patch-libs_aaf_AAFIAudioFiles.c
rename to audio/ardour/files/patch-libs_aaf_utils.c
index 4f981129b14e..d9b366efc851 100644
--- a/audio/ardour/files/patch-libs_aaf_AAFIAudioFiles.c
+++ b/audio/ardour/files/patch-libs_aaf_utils.c
@@ -1,6 +1,6 @@
---- libs/aaf/AAFIAudioFiles.c.orig	2023-12-14 16:14:03 UTC
-+++ libs/aaf/AAFIAudioFiles.c
-@@ -39,6 +39,9 @@
+--- libs/aaf/utils.c.orig	2024-04-12 12:56:21 UTC
++++ libs/aaf/utils.c
+@@ -32,6 +32,9 @@
  #include <arpa/inet.h>
  #include <mntent.h>
  #include <unistd.h> /* access() */
diff --git a/audio/ardour/files/patch-libs_ardour_session.cc b/audio/ardour/files/patch-libs_ardour_session.cc
deleted file mode 100644
index 7655ac83d243..000000000000
--- a/audio/ardour/files/patch-libs_ardour_session.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- libs/ardour/session.cc.orig	2024-02-21 00:37:39 UTC
-+++ libs/ardour/session.cc
-@@ -136,7 +136,10 @@
- #include "ardour/utils.h"
- #include "ardour/vca_manager.h"
- #include "ardour/vca.h"
-+
-+#ifdef VST3_SUPPORT
- #include "ardour/vst3_plugin.h"
-+#endif // VST3_SUPPORT
- 
- #include "midi++/port.h"
- #include "midi++/mmc.h"
-@@ -881,10 +884,12 @@ Session::destroy ()
- 
- 	_transport_fsm->stop ();
- 
-+#ifdef VST3_SUPPORT
- 	/* close VST3 Modules */
- 	for (auto const& nfo : PluginManager::instance().vst3_plugin_info()) {
- 		std::dynamic_pointer_cast<VST3PluginInfo> (nfo)->m.reset ();
- 	}
-+#endif // VST3_SUPPORT
- 
- 	DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n");
-