diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile index 2caa89eb4f05..fc7b5256eadc 100644 --- a/audio/ardour/Makefile +++ b/audio/ardour/Makefile @@ -1,116 +1,115 @@ 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 COMMENT= Multichannel digital audio workstation WWW= https://ardour.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= lv2>=1.18.0:audio/lv2 \ itstool>2.0.0:textproc/itstool \ ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_aarch64= as:devel/binutils LIB_DEPENDS= libserd-0.so:devel/serd \ libsord-0.so:devel/sord \ libsratom-0.so:audio/sratom \ liblilv-0.so:audio/lilv \ libsuil-0.so:audio/suil \ libaubio.so:audio/aubio \ librubberband.so:audio/rubberband \ liblo.so:audio/liblo \ liblrdf.so:textproc/liblrdf \ 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 \ libFLAC.so:audio/flac \ libwebsockets.so:net/libwebsockets USES= compiler:c++11-lang desktop-file-utils gettext gnome \ libarchive pkgconfig python:build readline tar:bzip2 \ waf xorg shared-mime-info USE_CXXSTD= c++11 USE_GNOME= atk cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 pango USE_LDCONFIG= yes USE_XORG= x11 CONFIGURE_ARGS= --optimize --ptformat --freedesktop --no-phone-home \ --with-backends=jack,dummy --internal-shared-libs --no-ytk \ ${CONFIGURE_ARGS_${ARCH}} CONFIGURE_ARGS_amd64= --arch='-msse -mfpmath=sse -DARCH_X86' --dist-target=x86_64 # only support for i686 or better CONFIGURE_ARGS_i386= --arch='-msse -mfpmath=sse -march=i686 -DARCH_X86' --dist-target=i686 CONFIGURE_ENV+= PYTHONDONTWRITEBYTECODE=1 MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 LDFLAGS_powerpc= -Wl,-z,notext ARDOUR_MAJOR= ardour8 ETCDIR= ${PREFIX}/etc/${ARDOUR_MAJOR} DATADIR= ${PREFIX}/share/${ARDOUR_MAJOR} BINARY_ALIAS+= gas=${CC} PLIST_SUB+= VERSION=${PORTVERSION} \ ARDOUR_MAJOR=${ARDOUR_MAJOR} OPTIONS_DEFINE= VST3 OPTIONS_SUB= yes VST3_DESC= Build with VST3 plugin support VST3_BUILD_DEPENDS= vst3sdk>0:audio/vst3sdk VST3_CONFIGURE_OFF= --no-vst3 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 @${REINPLACE_CMD} -e 's/libsmf\.target = '\''smf'\''/libsmf\.target = '\''smf_internal'\''/g' ${WRKSRC}/libs/evoral/wscript post-install: @${FIND} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR} \ -name '*.so*' -exec ${STRIP_CMD} {} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/sanityCheck @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/utils/${ARDOUR_MAJOR}-copy-mixer @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/utils/${ARDOUR_MAJOR}-export @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/utils/${ARDOUR_MAJOR}-new_empty_session @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/utils/${ARDOUR_MAJOR}-new_session @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/ardour-exec-wrapper @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/ardour-vst-scanner @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/ardour-${PORTVERSION} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/hardour-${PORTVERSION} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/luasession @${LN} -sf ../lib/${ARDOUR_MAJOR}/utils/ardour-util.sh \ ${STAGEDIR}${PREFIX}/bin/${ARDOUR_MAJOR}-new_session @${LN} -sf ../lib/${ARDOUR_MAJOR}/utils/ardour-util.sh \ ${STAGEDIR}${PREFIX}/bin/${ARDOUR_MAJOR}-copy-mixer @${LN} -sf ../lib/${ARDOUR_MAJOR}/utils/ardour-util.sh \ ${STAGEDIR}${PREFIX}/bin/${ARDOUR_MAJOR}-export @${LN} -sf ../lib/${ARDOUR_MAJOR}/utils/ardour-util.sh \ ${STAGEDIR}${PREFIX}/bin/${ARDOUR_MAJOR}-new_empty_session @${LN} -sf ffmpeg ${STAGEDIR}${PREFIX}/bin/ffmpeg_harvid @${LN} -sf ffprobe ${STAGEDIR}${PREFIX}/bin/ffprobe_harvid post-install-VST3-on: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/ardour-vst3-scanner .include 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 -+#elif defined(__FreeBSD__) -+#include - #elif defined(__APPLE__) - #include - #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,12 +1,12 @@ ---- 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 #include #include /* access() */ +#elif defined(__FreeBSD__) +#include +#include #elif defined(__APPLE__) #include #include /* 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 (nfo)->m.reset (); - } -+#endif // VST3_SUPPORT - - DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n"); -