diff --git a/ardour5-missing-kissfft.patch b/ardour5-missing-kissfft.patch new file mode 100644 index 0000000..82acc34 --- /dev/null +++ b/ardour5-missing-kissfft.patch @@ -0,0 +1,28 @@ +diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript +index 92dc9502b..f70202379 100644 +--- a/libs/qm-dsp/wscript ++++ b/libs/qm-dsp/wscript +@@ -26,6 +26,8 @@ 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) ++ conf.check_cxx(lib="kiss_fft_double", uselib_store="KISSFFT", mandatory=True) ++ conf.check_cxx(lib="kiss_fftr_double", uselib_store="KISSFFTR", mandatory=True) + else: + conf.load('compiler_cxx') + autowaf.configure(conf) +diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript +index f3e0024ee..2acaa4959 100644 +--- a/libs/vamp-plugins/wscript ++++ b/libs/vamp-plugins/wscript +@@ -57,8 +57,8 @@ def build(bld): + obj.includes = ['.'] + obj.name = 'libardourvampplugins' + obj.target = 'ardourvampplugins' +- obj.uselib = 'FFTW3F VAMPSDK QMDSP' +- obj.use = 'libvampplugin libqm-dsp' ++ obj.uselib = 'FFTW3F VAMPSDK QMDSP KISSFFT KISSFFTR' ++ obj.use = 'libvampplugin libqm-dsp libkiss_fft_double libkiss_fftr_double' + autowaf.ensure_visible_symbols (obj, True) + if bld.is_defined('HAVE_AUBIO4'): + obj.source += ' Onset.cpp ' diff --git a/ardour5.spec b/ardour5.spec index c8a1ade..e23e035 100644 --- a/ardour5.spec +++ b/ardour5.spec @@ -30,7 +30,7 @@ Name: ardour5 Version: 5.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Digital Audio Workstation License: GPLv3+ @@ -47,6 +47,8 @@ Source2: gpl-3.0.txt Patch0: ardour5-5.12.0-appdata.patch # Patched (untracked) revision.cc, created with the above Patch1: ardour5-%{version}-appdata-revision.patch +# QM-DSP library is missing kiss-fft functions (#1494796) +Patch2: %{name}-missing-kissfft.patch BuildRequires: alsa-lib-devel BuildRequires: aubio-devel >= 0.3.2 @@ -92,6 +94,7 @@ BuildRequires: lv2-devel >= 1.0.0 BuildRequires: pangomm-devel >= 1.4 # https://fedoraproject.org/wiki/Packaging:Python#Dependencies BuildRequires: python2 +BuildRequires: kiss-fft-devel BuildRequires: qm-dsp-static BuildRequires: readline-devel BuildRequires: rubberband-devel >= 1.0 @@ -182,6 +185,7 @@ cp %{SOURCE1} %{SOURCE2} . %build export LC_ALL=en_US.UTF-8 +export LD_FLAGS="%{__global_ldflags}" ./waf configure \ %if %{with strict} --strict \ @@ -338,6 +342,9 @@ fi %{_mandir}/*/man1/%{name}.1* %changelog +* Wed Sep 27 2017 Guido Aulisi - 5.12.0-2 +- Fix stretch Mode crashes ardour5 (#1494796) + * Tue Sep 19 2017 Nils Philippsen - 5.12.0-1 - version 5.12.0 - enable push2 support