From e3128e932cedc7fe48c85da759672c0a7b3df71c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 26 Jun 2023 15:07:47 +0200 Subject: [PATCH] Compile and install libAAF --- gtk2_ardour/ardev_common.sh.in | 2 +- tools/linux_packaging/build | 2 +- tools/x-win/package.sh | 1 + wscript | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in index bc2b80858a..4ab7c149a0 100644 --- a/gtk2_ardour/ardev_common.sh.in +++ b/gtk2_ardour/ardev_common.sh.in @@ -43,7 +43,7 @@ export ARDOUR_DLL_PATH=$libs export GTK_PATH=~/.ardour3:$libs/clearlooks-newer export VAMP_PATH=$libs/vamp-plugins:$libs/vamp-pyin${VAMP_PATH:+:$VAMP_PATH} -export LD_LIBRARY_PATH=$libs/ptformat:$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/ctrl-interface/control_protocol:$libs/ctrl-interface/midi_surface:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/widgets:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/temporal:$libs/libltc:$libs/canvas:$libs/waveview:$libs/ardouralsautil${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +export LD_LIBRARY_PATH=$libs/ptformat:$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/ctrl-interface/control_protocol:$libs/ctrl-interface/midi_surface:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/aaf:$libs/gtkmm2ext:$libs/widgets:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/temporal:$libs/libltc:$libs/canvas:$libs/waveview:$libs/ardouralsautil${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} # DYLD_LIBRARY_PATH is for darwin. export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 23b490c70d..564a6f5ad1 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -507,7 +507,7 @@ cp $BUILD_ROOT/libs/ardour-avahi $APPLIB/ardour-avahi chmod +x $APPLIB/ardour-avahi OURLIBDIR=$BUILD_ROOT/libs -OURLIBS=$OURLIBDIR/ctrl-interface/midi_surface:$OURLIBDIR/ctrl-interface/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/glibmm2:$OURLIBDIR/canvas:$OURLIBDIR/widgets:$OURLIBDIR/waveview:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/temporal:$OURLIBDIR/libltc:$OURLIBDIR/qm-dsp:$OURLIBDIR/ardouralsautil:$OURLIBDIR/ptformat:$BUILD_ROOT/gtk2_ardour +OURLIBS=$OURLIBDIR/ctrl-interface/midi_surface:$OURLIBDIR/ctrl-interface/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/glibmm2:$OURLIBDIR/canvas:$OURLIBDIR/widgets:$OURLIBDIR/waveview:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/temporal:$OURLIBDIR/libltc:$OURLIBDIR/qm-dsp:$OURLIBDIR/ardouralsautil:$OURLIBDIR/ptformat:$OURLIBDIR/aaf:$BUILD_ROOT/gtk2_ardour echo $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index cd8517714d..797c6bf57f 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -139,6 +139,7 @@ cp build/libs/midi++2/midipp-*.dll $DESTDIR/bin/ cp build/libs/evoral/evoral-*.dll $DESTDIR/bin/ cp build/libs/ardour/ardour-*.dll $DESTDIR/bin/ cp build/libs/temporal/temporal-*.dll $DESTDIR/bin/ +cp build/libs/aaf/aaf-*.dll $DESTDIR/bin/ cp build/libs/canvas/canvas-*.dll $DESTDIR/bin/ cp build/libs/widgets/widgets-*.dll $DESTDIR/bin/ cp build/libs/waveview/waveview-*.dll $DESTDIR/bin/ diff --git a/wscript b/wscript index dc27cf27b1..781b02c3c1 100644 --- a/wscript +++ b/wscript @@ -310,6 +310,7 @@ children = [ 'libs/vamp-pyin', 'libs/zita-resampler', 'libs/zita-convolver', + 'libs/aaf', # core ardour libraries 'libs/pbd', 'libs/midi++2',