From b230c2eb28d5e39ee677b8f73b9b21c810feeb19 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 18 Feb 2024 20:38:33 +0100 Subject: [PATCH] Build against local libAAF (0.6.0 is not yet released) Revert once libAAF API is stable after libAAF 1.0 --- gtk2_ardour/wscript | 2 +- libs/aaf/wscript | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 240f9052be..af43c82722 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -542,7 +542,7 @@ def build(bld): else: obj.uselib += ' GTKMM' - if bld.is_defined('USE_EXTERNAL_LIBS'): + if False and bld.is_defined('USE_EXTERNAL_LIBS'): obj.uselib += ' LIBAAF' else: obj.use.extend (['libaaf']) diff --git a/libs/aaf/wscript b/libs/aaf/wscript index 0ce2822d98..3135f9229c 100644 --- a/libs/aaf/wscript +++ b/libs/aaf/wscript @@ -37,11 +37,11 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - if conf.is_defined('USE_EXTERNAL_LIBS'): + if False and conf.is_defined('USE_EXTERNAL_LIBS'): autowaf.check_pkg(conf, 'libaaf', uselib_store='LIBAAF', mandatory=True, atleast_version='0.6.0') def build(bld): - if bld.is_defined('USE_EXTERNAL_LIBS'): + if False and bld.is_defined('USE_EXTERNAL_LIBS'): return if bld.is_defined ('INTERNAL_SHARED_LIBS'):