File ardour-always_internal_libaaf.patch of Package ardour

Overview Repositories Revisions Requests Users Attributes Meta

File ardour-always_internal_libaaf.patch of Package ardour

diff --git a/libs/aaf/wscript b/libs/aaf/wscript
index 5ca7958a17..066ef4ee61 100644
--- a/libs/aaf/wscript
+++ b/libs/aaf/wscript
@@ -34,16 +34,12 @@ libaaf_sources = [
 ]
 
 def options(opt):
-    autowaf.set_options(opt)
+    pass
 
 def configure(conf):
-    if conf.is_defined('USE_EXTERNAL_LIBS'):
-        autowaf.check_pkg(conf, 'aaf', uselib_store='LIBAAF', mandatory=True)
+    pass
 
 def build(bld):
-    if bld.is_defined('USE_EXTERNAL_LIBS'):
-        return
-
     if bld.is_defined ('INTERNAL_SHARED_LIBS'):
         obj              = bld.shlib(features = 'c cshlib', source=libaaf_sources)
         obj.defines = [ 'LIBAAF_DLL_EXPORTS=1' ]
diff --git a/session_utils/wscript b/session_utils/wscript
index b7f6ef2b19..d4120a47b0 100644
--- a/session_utils/wscript
+++ b/session_utils/wscript
@@ -45,10 +45,7 @@ def build_ardour_util(bld, util):
     obj.uselib       += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK'
 
     if util == "new_aaf_session":
-        if bld.is_defined('USE_EXTERNAL_LIBS'):
-            obj.uselib += ' LIBAAF'
-        else:
-            obj.use.extend (['libaaf'])
+        obj.use.extend (['libaaf'])
 
     if bld.is_defined('HAVE_SUIL'):
         obj.uselib += ' SUIL'

Places

File ardour-always_internal_libaaf.patch of Package ardour

Places