diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,3 +1,4 @@ +libSoundTouch.so.1 libX11.so.6 libarchive.so.13 libasound.so.2 @@ -11,6 +12,7 @@ libdl.so.2 libfftw3f.so.3 libfftw3f_threads.so.3 +libfluidsynth.so.2 libfontconfig.so.1 libgcc_s.so.1 libgdk-x11-2.0.so.0 @@ -26,6 +28,7 @@ liblilv-0.so.0 liblo.so.7 liblrdf.so.2 +libltc.so.11 libm.so.6 libmvec.so.1 libpango-1.0.so.0 diff --git a/files/use-internal-qm-dsp.patch b/files/use-internal-qm-dsp.patch new file mode 100644 --- /dev/null +++ b/files/use-internal-qm-dsp.patch @@ -0,0 +1,37 @@ +diff --git i/libs/qm-dsp/wscript w/libs/qm-dsp/wscript +index 775098e06b..13f6b9410a 100644 +--- i/libs/qm-dsp/wscript ++++ w/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 i/wscript w/wscript +index 1c9bb1ff5d..95d377d8a7 100644 +--- i/wscript ++++ w/wscript +@@ -1041,8 +1041,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) diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,10 +1,11 @@ name : ardour -version : '6.3' -release : 29 +version : '6.5' +release : 30 source : - - git|https://github.com/Ardour/ardour.git : 6.3 + - git|https://github.com/Ardour/ardour.git : 6.5 license : GPL-3.0-or-later component : multimedia.audio +homepage : https://ardour.org/ summary : Professional-grade digital audio workstation description: | Ardour is a professional DAW aimed for audio engineers, musicians and composers with many features like: unlimited tracks, LADSPA/LV2 support, powerful routing, video sync and much more. @@ -14,24 +15,26 @@ - pkgconfig(aubio) - pkgconfig(fftw3) - pkgconfig(flac) - - pkgconfig(gtk+-2.0) + - pkgconfig(fluidsynth) - pkgconfig(gtkmm-2.4) + - pkgconfig(hidapi-hidraw) - pkgconfig(jack) - pkgconfig(libarchive) - pkgconfig(libcurl) - pkgconfig(liblo) - pkgconfig(libpulse-simple) - pkgconfig(libusb-1.0) + - pkgconfig(ltc) - pkgconfig(lrdf) - pkgconfig(lilv-0) - pkgconfig(ogg) - - pkgconfig(python-2.7) - pkgconfig(raptor2) - pkgconfig(rubberband) - pkgconfig(samplerate) - pkgconfig(serf-1) - pkgconfig(sndfile) - pkgconfig(sord-0) + - pkgconfig(soundtouch) - pkgconfig(sratom-0) - pkgconfig(suil-0) - pkgconfig(taglib) @@ -39,7 +42,10 @@ - itstool - libboost-devel setup : | + %patch -p1 < $pkgfiles/use-internal-qm-dsp.patch + %waf_configure -j1 \ + --use-external-libs \ --cxx11 \ --optimize \ --freedesktop \ @@ -47,7 +53,7 @@ --libdir=%libdir% \ --with-backends=alsa,dummy,jack,pulseaudio build : | - %waf_build + %waf_build -j4 install : | %waf_install diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -1,9 +1,10 @@ ardour + https://ardour.org/ - Jacob Alzén - jacob.alzen@gmail.com + Campbell Jones + dev@serebit.com GPL-3.0-or-later multimedia.audio @@ -58,16 +59,17 @@ /usr/lib64/ardour6/LV2/reasonablesynth.lv2/manifest.ttl /usr/lib64/ardour6/LV2/reasonablesynth.lv2/reasonablesynth.so /usr/lib64/ardour6/LV2/reasonablesynth.lv2/reasonablesynth.ttl - /usr/lib64/ardour6/ardour-6.3.0 + /usr/lib64/ardour6/ardour-6.5.0 /usr/lib64/ardour6/ardour-exec-wrapper /usr/lib64/ardour6/ardour-request-device /usr/lib64/ardour6/ardour-vst-scanner + /usr/lib64/ardour6/ardour-vst3-scanner /usr/lib64/ardour6/backends/libalsa_audiobackend.so /usr/lib64/ardour6/backends/libdummy_audiobackend.so /usr/lib64/ardour6/backends/libjack_audiobackend.so /usr/lib64/ardour6/backends/libpulseaudio_backend.so /usr/lib64/ardour6/engines/libclearlooks.so - /usr/lib64/ardour6/hardour-6.3.0 + /usr/lib64/ardour6/hardour-6.5.0 /usr/lib64/ardour6/libardour.so /usr/lib64/ardour6/libardour.so.3 /usr/lib64/ardour6/libardour.so.3.0.0 @@ -87,7 +89,6 @@ /usr/lib64/ardour6/libgtkmm2ext.so /usr/lib64/ardour6/libgtkmm2ext.so.0 /usr/lib64/ardour6/libgtkmm2ext.so.0.8.3 - /usr/lib64/ardour6/libhidapi.a /usr/lib64/ardour6/libmidipp.so /usr/lib64/ardour6/libmidipp.so.4 /usr/lib64/ardour6/libmidipp.so.4.1.0 @@ -165,6 +166,7 @@ /usr/share/ardour6/export/Ogg_Vorbis .preset /usr/share/ardour6/export/Ogg_Vorbis.format /usr/share/ardour6/export/Ring Tone.format + /usr/share/ardour6/export/WAV (tagged).format /usr/share/ardour6/icons/act-disabled.png /usr/share/ardour6/icons/add.png /usr/share/ardour6/icons/anchored_trim_left_cursor.png @@ -814,6 +816,7 @@ /usr/share/ardour6/scripts/avldrums_midimap.lua /usr/share/ardour6/scripts/bounce_replace.lua /usr/share/ardour6/scripts/bypass_all_plugins.lua + /usr/share/ardour6/scripts/collapse_playlists.lua /usr/share/ardour6/scripts/create_drum_tracks.lua /usr/share/ardour6/scripts/delete_xrun_markers.lua /usr/share/ardour6/scripts/export_mp4chaps.lua @@ -1108,12 +1111,12 @@ - - 2020-09-08 - 6.3 + + 2021-01-24 + 6.5 Packaging update - Jacob Alzén - jacob.alzen@gmail.com + Campbell Jones + dev@serebit.com \ No newline at end of file