From 05e926a4aa861efa5b43b322f541646cf0f1a123 Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 9 Mar 2020 16:58:06 +0100 Subject: [PATCH] ardour: use external libs where available, enable dummy backend --- .../ardour/patches/use-bundled-qm-dsp.patch | 50 +++++++++++++++++++ srcpkgs/ardour/template | 8 +-- 2 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/ardour/patches/use-bundled-qm-dsp.patch diff --git a/srcpkgs/ardour/patches/use-bundled-qm-dsp.patch b/srcpkgs/ardour/patches/use-bundled-qm-dsp.patch new file mode 100644 index 00000000000..86dca8dc5e7 --- /dev/null +++ b/srcpkgs/ardour/patches/use-bundled-qm-dsp.patch @@ -0,0 +1,50 @@ +From 2b5e890480691ce5a6c9f05b55e83a3b9ed8a8b9 Mon Sep 17 00:00:00 2001 +From: q66 +Date: Mon, 9 Mar 2020 16:33:43 +0100 +Subject: [PATCH] use bundled qm-dsp + +--- + libs/qm-dsp/wscript | 11 ++--------- + wscript | 2 -- + 2 files changed, 2 insertions(+), 11 deletions(-) + +diff --git libs/qm-dsp/wscript libs/qm-dsp/wscript +index 92dc9502b1..dbbff16722 100644 +--- libs/qm-dsp/wscript ++++ libs/qm-dsp/wscript +@@ -23,17 +23,10 @@ def options(opt): + 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 = ''' +diff --git wscript wscript +index 4b5acb0ad7..c0358af37e 100644 +--- wscript ++++ wscript +@@ -991,8 +991,6 @@ def configure(conf): + + 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) +-- +2.25.1 + diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template index bd40e9222fa..a118f9618b3 100644 --- a/srcpkgs/ardour/template +++ b/srcpkgs/ardour/template @@ -3,12 +3,14 @@ pkgname=ardour version=5.12 revision=3 build_style=waf -configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa --libjack=weak --optimize --docs" -hostmakedepends="python git graphviz doxygen pkg-config clang perl" +configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy + --libjack=weak --optimize --docs --use-external-libs" +hostmakedepends="python git graphviz doxygen pkg-config clang perl tar" makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2 - sratom-devel gtkmm2-devel libarchive-devel" + sratom-devel gtkmm2-devel libarchive-devel fluidsynth-devel hidapi-devel + libltc-devel" short_desc="Professional-grade digital audio workstation" maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later"