Attachment 248772 Details for Bug 277342 – Update Ardour to 8.4.0 release.

[patch] Update Ardour to 8.4.0 release.

audio-ardour-Update-to-8.4.0-release.patch (text/plain), 8.04 KB, created by Florian Walpen on 2024-02-27 01:47:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Walpen

Created: 2024-02-27 01:47:47 UTC

Size: 8.04 KB

patch

obsolete

>From e0b646eed6bb03c160a6a5e58b4d4aef61fdefb2 Mon Sep 17 00:00:00 2001
>From: Florian Walpen <dev@submerge.ch>
>Date: Thu, 14 Dec 2023 17:37:07 +0100
>Subject: [PATCH] audio/ardour: Update to 8.4.0 release.
>
>Changes: https://ardour.org/whatsnew.html
>---
> audio/ardour/Makefile                             | 12 +++++++-----
> audio/ardour/distinfo                             |  6 +++---
> .../ardour/files/patch-libs_aaf_AAFIAudioFiles.c  | 12 ++++++++++++
> audio/ardour/files/patch-libs_aaf_aaf_LibCFB.h    | 11 +++++++++++
> audio/ardour/pkg-plist                            | 15 +++++++++++++++
> 5 files changed, 48 insertions(+), 8 deletions(-)
> create mode 100644 audio/ardour/files/patch-libs_aaf_AAFIAudioFiles.c
> create mode 100644 audio/ardour/files/patch-libs_aaf_aaf_LibCFB.h
>
>diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
>index 71e57809e13b..27b730fd9e4d 100644
>--- a/audio/ardour/Makefile
>+++ b/audio/ardour/Makefile
>@@ -1,11 +1,11 @@
> PORTNAME=	ardour
>-DISTVERSION=	8.1.0
>+DISTVERSION=	8.4.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=	550
>+DISTFILES=	562
> DIST_SUBDIR=	${DISTNAME}
> 
> MAINTAINER=	dev@submerge.ch
>@@ -53,12 +53,15 @@ USE_LDCONFIG=	yes
> USE_XORG=	x11
> 
> CONFIGURE_ARGS=	--optimize --ptformat --freedesktop --no-phone-home \
>-		--with-backends=jack,dummy --internal-shared-libs \
>+		--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
>@@ -75,8 +78,7 @@ OPTIONS_SUB=		yes
> VST3_DESC=		Build with VST3 plugin support
> 
> VST3_BUILD_DEPENDS=	vst3sdk>0:audio/vst3sdk
>-# Inverted logic, the --vst3 argument _disables_ VST3 support.
>-VST3_CONFIGURE_OFF=	--vst3
>+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
>diff --git a/audio/ardour/distinfo b/audio/ardour/distinfo
>index 738711edc9a0..4ac647b18907 100644
>--- a/audio/ardour/distinfo
>+++ b/audio/ardour/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1697821942
>-SHA256 (Ardour-8.1.0/550) = 5a2656b326b2ee38f14df9378d044982f9ca1607e7e0bec647686eb6edc9dc17
>-SIZE (Ardour-8.1.0/550) = 13835817
>+TIMESTAMP = 1708609514
>+SHA256 (Ardour-8.4.0/562) = 7c64fd95808d94440639698e0f8ece30da8b5efde2777fff55c8bc21404e28cf
>+SIZE (Ardour-8.4.0/562) = 17574218
>diff --git a/audio/ardour/files/patch-libs_aaf_AAFIAudioFiles.c b/audio/ardour/files/patch-libs_aaf_AAFIAudioFiles.c
>new file mode 100644
>index 000000000000..4f981129b14e
>--- /dev/null
>+++ b/audio/ardour/files/patch-libs_aaf_AAFIAudioFiles.c
>@@ -0,0 +1,12 @@
>+--- 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() */
>diff --git a/audio/ardour/files/patch-libs_aaf_aaf_LibCFB.h b/audio/ardour/files/patch-libs_aaf_aaf_LibCFB.h
>new file mode 100644
>index 000000000000..6464f7c18ce6
>--- /dev/null
>+++ b/audio/ardour/files/patch-libs_aaf_aaf_LibCFB.h
>@@ -0,0 +1,11 @@
>+--- 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/pkg-plist b/audio/ardour/pkg-plist
>index dfbfe98b69a5..bc547f0dda51 100644
>--- a/audio/ardour/pkg-plist
>+++ b/audio/ardour/pkg-plist
>@@ -46,6 +46,9 @@ lib/%%ARDOUR_MAJOR%%/backends/libdummy_audiobackend.so
> lib/%%ARDOUR_MAJOR%%/backends/libjack_audiobackend.so
> lib/%%ARDOUR_MAJOR%%/engines/libclearlooks.so
> lib/%%ARDOUR_MAJOR%%/hardour-%%VERSION%%
>+lib/%%ARDOUR_MAJOR%%/libaaf.so
>+lib/%%ARDOUR_MAJOR%%/libaaf.so.0
>+lib/%%ARDOUR_MAJOR%%/libaaf.so.0.0.0
> lib/%%ARDOUR_MAJOR%%/libardour.so
> lib/%%ARDOUR_MAJOR%%/libardour.so.3
> lib/%%ARDOUR_MAJOR%%/libardour.so.3.0.0
>@@ -95,9 +98,12 @@ lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport2.so
> lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport8.so
> lib/%%ARDOUR_MAJOR%%/surfaces/libardour_generic_midi.so
> lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launch_control_xl.so
>+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_mini.so
> lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_pro.so
>+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_x.so
> lib/%%ARDOUR_MAJOR%%/surfaces/libardour_mcp.so
> lib/%%ARDOUR_MAJOR%%/surfaces/libardour_osc.so
>+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_ssl_uf8.so
> lib/%%ARDOUR_MAJOR%%/surfaces/libardour_us2400.so
> lib/%%ARDOUR_MAJOR%%/surfaces/libardour_websockets.so
> lib/%%ARDOUR_MAJOR%%/utils/ardour-util.sh
>@@ -180,7 +186,9 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
> %%DATADIR%%/icons/halfnote.png
> %%DATADIR%%/icons/i_beam_cursor.png
> %%DATADIR%%/icons/launch_control_xl.png
>+%%DATADIR%%/icons/launchpad-mini.png
> %%DATADIR%%/icons/launchpad-pro.png
>+%%DATADIR%%/icons/launchpad-x.png
> %%DATADIR%%/icons/mezzforte.png
> %%DATADIR%%/icons/mezzoforte.png
> %%DATADIR%%/icons/mezzopiano.png
>@@ -307,6 +315,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
> %%DATADIR%%/midi_maps/Alesis_QX25.map
> %%DATADIR%%/midi_maps/Alesis_VI25.map
> %%DATADIR%%/midi_maps/Arturia_KeyLab49.map
>+%%DATADIR%%/midi_maps/Arturia_MiniLab_3.map
> %%DATADIR%%/midi_maps/Arturia_MiniLab_mkII.map
> %%DATADIR%%/midi_maps/DDX3216.map
> %%DATADIR%%/midi_maps/Devine_Versakey.map
>@@ -336,6 +345,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
> %%DATADIR%%/midi_maps/akai-mpd-32.map
> %%DATADIR%%/midi_maps/bcf2000.map
> %%DATADIR%%/midi_maps/bcf2000_mackie.map
>+%%DATADIR%%/midi_maps/donnerdmk25.map
> %%DATADIR%%/midi_maps/m-audio-oxygen61v3.map
> %%DATADIR%%/midi_maps/m-audio_oxygen25.map
> %%DATADIR%%/midi_maps/m-audio_oxygen25_3rdGen.map
>@@ -594,6 +604,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
> %%DATADIR%%/patchfiles/Lexicon_DR_Music_FX_Expansion.midnam
> %%DATADIR%%/patchfiles/Lexicon_Dual_FX_Expansion.midnam
> %%DATADIR%%/patchfiles/Lexicon_Dual_Vrb_Expansion.midnam
>+%%DATADIR%%/patchfiles/Lexicon_MPX100.midnam
> %%DATADIR%%/patchfiles/Lexicon_MPX500.midnam
> %%DATADIR%%/patchfiles/Lexicon_MPX_1.midnam
> %%DATADIR%%/patchfiles/Lexicon_MPX_500.midnam
>@@ -792,6 +803,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
> %%DATADIR%%/patchfiles/Yamaha_S30_80.midnam
> %%DATADIR%%/patchfiles/Yamaha_S90.midnam
> %%DATADIR%%/patchfiles/Yamaha_SY77.midnam
>+%%DATADIR%%/patchfiles/Yamaha_SY85.midnam
> %%DATADIR%%/patchfiles/Yamaha_SY99.midnam
> %%DATADIR%%/patchfiles/Yamaha_So3.midnam
> %%DATADIR%%/patchfiles/Yamaha_So8.midnam
>@@ -854,6 +866,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
> %%DATADIR%%/scripts/record_now.lua
> %%DATADIR%%/scripts/remove_unknown_procs.lua
> %%DATADIR%%/scripts/reset_mixer.lua
>+%%DATADIR%%/scripts/reverse_midi.lua
> %%DATADIR%%/scripts/rubberband_swing.lua
> %%DATADIR%%/scripts/s_chanmap.lua
> %%DATADIR%%/scripts/s_cut_copy_section.lua
>@@ -896,11 +909,13 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
> %%DATADIR%%/scripts/surround_to_stereo.lua
> %%DATADIR%%/scripts/tomsloop.lua
> %%DATADIR%%/scripts/track_organizer.lua
>+%%DATADIR%%/scripts/trigger_mixer_scene.lua
> %%DATADIR%%/scripts/tx_raw_midi_from_file.lua
> %%DATADIR%%/scripts/vamp_audio_to_midi.lua
> %%DATADIR%%/scripts/voice_activate.lua
> %%DATADIR%%/scripts/x-fade.lua
> %%DATADIR%%/templates/.stub
>+%%DATADIR%%/themes/adwaita_dark-ardour.colors
> %%DATADIR%%/themes/blueberry_milk-ardour.colors
> %%DATADIR%%/themes/caineville-ardour.colors
> %%DATADIR%%/themes/clear_gray-ardour.colors
>-- 
>2.43.2
>

Flags:

dev: maintainer-approval+

Actions: View | Diff

Attachments on bug 277342: 248772