Page MenuHomeSolus
Files F11046892

D10435.id.diff
No OneTemporary
Actions

D10435.id.diff
View Options

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 @@
<PISI>
<Source>
<Name>ardour</Name>
+ <Homepage>https://ardour.org/</Homepage>
<Packager>
- <Name>Jacob Alzén</Name>
- <Email>jacob.alzen@gmail.com</Email>
+ <Name>Campbell Jones</Name>
+ <Email>dev@serebit.com</Email>
</Packager>
<License>GPL-3.0-or-later</License>
<PartOf>multimedia.audio</PartOf>
@@ -58,16 +59,17 @@
<Path fileType="library">/usr/lib64/ardour6/LV2/reasonablesynth.lv2/manifest.ttl</Path>
<Path fileType="library">/usr/lib64/ardour6/LV2/reasonablesynth.lv2/reasonablesynth.so</Path>
<Path fileType="library">/usr/lib64/ardour6/LV2/reasonablesynth.lv2/reasonablesynth.ttl</Path>
- <Path fileType="library">/usr/lib64/ardour6/ardour-6.3.0</Path>
+ <Path fileType="library">/usr/lib64/ardour6/ardour-6.5.0</Path>
<Path fileType="library">/usr/lib64/ardour6/ardour-exec-wrapper</Path>
<Path fileType="library">/usr/lib64/ardour6/ardour-request-device</Path>
<Path fileType="library">/usr/lib64/ardour6/ardour-vst-scanner</Path>
+ <Path fileType="library">/usr/lib64/ardour6/ardour-vst3-scanner</Path>
<Path fileType="library">/usr/lib64/ardour6/backends/libalsa_audiobackend.so</Path>
<Path fileType="library">/usr/lib64/ardour6/backends/libdummy_audiobackend.so</Path>
<Path fileType="library">/usr/lib64/ardour6/backends/libjack_audiobackend.so</Path>
<Path fileType="library">/usr/lib64/ardour6/backends/libpulseaudio_backend.so</Path>
<Path fileType="library">/usr/lib64/ardour6/engines/libclearlooks.so</Path>
- <Path fileType="library">/usr/lib64/ardour6/hardour-6.3.0</Path>
+ <Path fileType="library">/usr/lib64/ardour6/hardour-6.5.0</Path>
<Path fileType="library">/usr/lib64/ardour6/libardour.so</Path>
<Path fileType="library">/usr/lib64/ardour6/libardour.so.3</Path>
<Path fileType="library">/usr/lib64/ardour6/libardour.so.3.0.0</Path>
@@ -87,7 +89,6 @@
<Path fileType="library">/usr/lib64/ardour6/libgtkmm2ext.so</Path>
<Path fileType="library">/usr/lib64/ardour6/libgtkmm2ext.so.0</Path>
<Path fileType="library">/usr/lib64/ardour6/libgtkmm2ext.so.0.8.3</Path>
- <Path fileType="library">/usr/lib64/ardour6/libhidapi.a</Path>
<Path fileType="library">/usr/lib64/ardour6/libmidipp.so</Path>
<Path fileType="library">/usr/lib64/ardour6/libmidipp.so.4</Path>
<Path fileType="library">/usr/lib64/ardour6/libmidipp.so.4.1.0</Path>
@@ -165,6 +166,7 @@
<Path fileType="data">/usr/share/ardour6/export/Ogg_Vorbis .preset</Path>
<Path fileType="data">/usr/share/ardour6/export/Ogg_Vorbis.format</Path>
<Path fileType="data">/usr/share/ardour6/export/Ring Tone.format</Path>
+ <Path fileType="data">/usr/share/ardour6/export/WAV (tagged).format</Path>
<Path fileType="data">/usr/share/ardour6/icons/act-disabled.png</Path>
<Path fileType="data">/usr/share/ardour6/icons/add.png</Path>
<Path fileType="data">/usr/share/ardour6/icons/anchored_trim_left_cursor.png</Path>
@@ -814,6 +816,7 @@
<Path fileType="data">/usr/share/ardour6/scripts/avldrums_midimap.lua</Path>
<Path fileType="data">/usr/share/ardour6/scripts/bounce_replace.lua</Path>
<Path fileType="data">/usr/share/ardour6/scripts/bypass_all_plugins.lua</Path>
+ <Path fileType="data">/usr/share/ardour6/scripts/collapse_playlists.lua</Path>
<Path fileType="data">/usr/share/ardour6/scripts/create_drum_tracks.lua</Path>
<Path fileType="data">/usr/share/ardour6/scripts/delete_xrun_markers.lua</Path>
<Path fileType="data">/usr/share/ardour6/scripts/export_mp4chaps.lua</Path>
@@ -1108,12 +1111,12 @@
</Files>
</Package>
<History>
- <Update release="29">
- <Date>2020-09-08</Date>
- <Version>6.3</Version>
+ <Update release="30">
+ <Date>2021-01-24</Date>
+ <Version>6.5</Version>
<Comment>Packaging update</Comment>
- <Name>Jacob Alzén</Name>
- <Email>jacob.alzen@gmail.com</Email>
+ <Name>Campbell Jones</Name>
+ <Email>dev@serebit.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 2:23 PM (3 h, 7 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5816074
Default Alt Text
D10435.id.diff (8 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.