File ardour-internal-qm-dsp.patch of Package ardour

Overview Repositories Revisions Requests Users Attributes Meta

File ardour-internal-qm-dsp.patch of Package ardour

Only in Ardour-5.12.0: ardour-internal-qm-dsp.patch
diff -ru Ardour-5.12.0.orig/libs/qm-dsp/wscript Ardour-5.12.0/libs/qm-dsp/wscript
--- Ardour-5.12.0.orig/libs/qm-dsp/wscript	2017-09-15 22:56:23.000000000 +0200
+++ Ardour-5.12.0/libs/qm-dsp/wscript	2017-12-04 20:01:24.228759372 +0100
@@ -23,17 +23,10 @@
     autowaf.set_options(opt)
 
 def configure(conf):
-    if conf.is_defined('USE_EXTERNAL_LIBS'):
-        conf.check_cxx(header_name="base/Pitch.h", mandatory=True)
-        conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True)
-    else:
-        conf.load('compiler_cxx')
-        autowaf.configure(conf)
+    conf.load('compiler_cxx')
+    autowaf.configure(conf)
 
 def build(bld):
-    if bld.is_defined('USE_EXTERNAL_LIBS'):
-        return
-
     # Host Library
     obj = bld(features = 'c cxx cxxstlib')
     obj.source = '''
@@ -77,7 +70,6 @@
     obj.name         = 'libqm-dsp'
     obj.target       = 'qm-dsp'
     obj.vnum         = QM_DSP_VERSION
-    obj.install_path = bld.env['LIBDIR']
     if bld.env['build_target'] != 'mingw':
         obj.cxxflags += [ '-fPIC' ]
         obj.cflags   += [ '-fPIC' ]
Only in Ardour-5.12.0: .waf-1.6.11-06ee4b7efbeab1252ed3b11499834d2a
diff -ru Ardour-5.12.0.orig/wscript Ardour-5.12.0/wscript
--- Ardour-5.12.0.orig/wscript	2017-09-15 22:56:23.000000000 +0200
+++ Ardour-5.12.0/wscript	2017-12-04 19:32:32.138992337 +0100
@@ -991,8 +991,6 @@
 
     if Options.options.use_external_libs:
         conf.define('USE_EXTERNAL_LIBS', 1)
-        conf.env.append_value(
-            'CXXFLAGS', '-I' + Options.options.qm_dsp_include)
 
     if Options.options.boost_include != '':
         conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)

Places

File ardour-internal-qm-dsp.patch of Package ardour

Places