Bug#733968: Bug#733969: ardour3: FTBFS when built against libaubio4
hi!,
here is a patch for ardour. i don't have write access to the repo.
ardour3 and denemo will follow.
best, paul
On 01/10/2014 04:00 PM, Paul Brossier wrote:
Hi all,
On 01/10/2014 02:21 PM, Niels Thykier wrote:
Hi,
Adding Paul Brossier to CC, since he maintains aubio and uploaded the
version with the API bump. Paul, please see/comment Adrian's mail below.
From my point of view (i.e. with my release hat on), I am fine with
either resolution the two of you come up with as long as the build
failure here is resolved and aubio's transition is finished.
~Niels
On 2014-01-09 15:28, Adrian Knoth wrote:
On 01/02/14 19:27, Niels Thykier wrote:
Hi!
Package: ardour3
Version: 3.5.143~dfsg-1
Severity: serious
Hi,
Your package FTBFS during a rebuilt against libaubio4. Here is the tail
from amd64.
aubio 0.4 is not API-compatible with the previous 0.3 release. aubio
upstream currently lists both APIs as stable.
Ardour upstream has tightened the dependency to aubio 0.3.2, and it
certainly needs time to incorporate the API changes. For ardour2 (bug
#733968), this might never happen unless backported.
There's not even a document on aubio's website how to migrate from 0.3
to 0.4.
point, i'm not very good at writing documentation, sorry.
Long story short: that's too much for packaging, this is serious
upstream work. Since Ardour upstream has decided to stick with 0.3.2, I
suggest we re-introduce libaubio-0.3.x in Debian until the remaining
users have all been transitioned to aubio4 (read: as soon as the
r-depends count of aubio3 drops to zero).
I'll be happy to write the patches for ardour, ardour3, and denemo.
I should be done in a few hours.
To be clear: I'm talking about co-existence of both aubio versions in
Debian, at least temporary.
i'll be offline starting tomorrow for 12 days. i hope to have the three
patches ready before then.
cheers, Paul
From 390a4df33ba9fe637d80ae15ece2b37221a4fc4c Mon Sep 17 00:00:00 2001
From: Paul Brossier p...@piem.org
Date: Sat, 11 Jan 2014 08:31:48 -0400
Subject: [PATCH] debian/patches/180_aubio.patch: update to aubio 0.4.0
(Closes: #733968)
---
debian/control | 2 +-
debian/patches/180_aubio.patch | 304 +
debian/patches/series | 1 +
debian/rules | 2 +-
4 files changed, 307 insertions(+), 2 deletions(-)
create mode 100644 debian/patches/180_aubio.patch
diff --git a/debian/control b/debian/control
index f6cf8bb..eafbc3b 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Build-Depends: cdbs,
ladspa-sdk (= 1.1-2),
libasound2-dev (= 0.9.4) [linux-any],
liboss-salsa-dev [!linux-any],
- libaubio-dev,
+ libaubio-dev (= 0.4.0),
libjack-dev,
liblo-dev,
libsuil-dev,
diff --git a/debian/patches/180_aubio.patch b/debian/patches/180_aubio.patch
new file mode 100644
index 000..ccd4f54
--- /dev/null
+++ b/debian/patches/180_aubio.patch
@@ -0,0 +1,304 @@
+Description: merge latest vamp-aubio-plugins version to use aubio 0.4.0
+ Update libs/vamp-plugins/Onset.{cpp,h} to new aubio.
+ Merge with the latest vamp-aubio-plugins revision 798ef8d.
+ See http://git.aubio.org/?p=vamp-aubio-plugins.git;a=summary.
+Author: Paul Brossier p...@debian.org
+Forwarded: not-needed
+Last-Update: 2014-12-29
+
+--- a/SConstruct
b/SConstruct
+@@ -446,7 +446,7 @@
+ 'jack' : '0.120.0',
+ 'libgnomecanvas-2.0' : '2.0',
+ 'sndfile' : '1.0.18',
+-'aubio': '0.3.0',
++'aubio': '0.4.0',
+ 'liblo': '0.24'
+ }
+
+--- a/libs/vamp-plugins/Onset.cpp
b/libs/vamp-plugins/Onset.cpp
+@@ -22,29 +22,32 @@
+ using std::cerr;
+ using std::endl;
+
++const char *getAubioNameForOnsetType(OnsetType t)
++{
++// In the same order as the enum elements in the header
++static const char *const names[] = {
++energy, specdiff, hfc, complex, phase, kl, mkl, specflux
++};
++return names[(int)t];
++}
++
+ Onset::Onset(float inputSampleRate) :
+ Plugin(inputSampleRate),
+ m_ibuf(0),
+-m_fftgrain(0),
+ m_onset(0),
+-m_pv(0),
+-m_peakpick(0),
+ m_onsetdet(0),
+-m_onsettype(aubio_onset_complex),
++m_onsettype(OnsetComplex),
+ m_threshold(0.3),
+-m_silence(-90),
+-m_channelCount(1)
++m_silence(-70),
++m_minioi(4)
+ {
+ }
+
+ Onset::~Onset()
+ {
+-if (m_onsetdet) aubio_onsetdetection_free(m_onsetdet);
++if (m_onsetdet) del_aubio_onset(m_onsetdet);
+ if (m_ibuf) del_fvec(m_ibuf);
+ if (m_onset) del_fvec(m_onset);
+-if (m_fftgrain) del_cvec(m_fftgrain);
+-if (m_pv) del_aubio_pvoc(m_pv);
+-if (m_peakpick) del_aubio_peakpicker(m_peakpick);
+ }
+
+ string
+@@ -74,7 +77,7 @@
+ int
+ Onset::getPluginVersion() const
+ {
+-return 1;
++return 2;
+ }
+
+ string
+@@ -86,22 +89,18 @@
+ bool
+ Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)
+ {
+-
Bug#733969: ardour3: FTBFS when built against libaubio4
On 01/11/2014 08:40 AM, Paul Brossier wrote:
hi!,
here is a patch for ardour. i don't have write access to the repo.
ardour3 and denemo will follow.
here is the ardour3 one, unfortunately i could not test it yet (hard
disk full).
but the patch is no different from the ardour one, appart from the
skipped SConstruct hunk.
cheers, Paul
best, paul
On 01/10/2014 04:00 PM, Paul Brossier wrote:
Hi all,
On 01/10/2014 02:21 PM, Niels Thykier wrote:
Hi,
Adding Paul Brossier to CC, since he maintains aubio and uploaded
the version with the API bump. Paul, please see/comment Adrian's
mail below.
From my point of view (i.e. with my release hat on), I am fine
with either resolution the two of you come up with as long as the
build failure here is resolved and aubio's transition is
finished.
~Niels
On 2014-01-09 15:28, Adrian Knoth wrote:
On 01/02/14 19:27, Niels Thykier wrote:
Hi!
Package: ardour3 Version: 3.5.143~dfsg-1 Severity: serious
Hi,
Your package FTBFS during a rebuilt against libaubio4. Here
is the tail from amd64.
aubio 0.4 is not API-compatible with the previous 0.3 release.
aubio upstream currently lists both APIs as stable.
Ardour upstream has tightened the dependency to aubio 0.3.2,
and it certainly needs time to incorporate the API changes. For
ardour2 (bug #733968), this might never happen unless
backported.
There's not even a document on aubio's website how to migrate
from 0.3 to 0.4.
point, i'm not very good at writing documentation, sorry.
Long story short: that's too much for packaging, this is
serious upstream work. Since Ardour upstream has decided to
stick with 0.3.2, I suggest we re-introduce libaubio-0.3.x in
Debian until the remaining users have all been transitioned to
aubio4 (read: as soon as the r-depends count of aubio3 drops to
zero).
I'll be happy to write the patches for ardour, ardour3, and
denemo.
I should be done in a few hours.
To be clear: I'm talking about co-existence of both aubio
versions in Debian, at least temporary.
i'll be offline starting tomorrow for 12 days. i hope to have the
three patches ready before then.
cheers, Paul
From 42a9c0bead9c3bfab06b06c74b49b3534e2ce61c Mon Sep 17 00:00:00 2001
From: Paul Brossier p...@piem.org
Date: Sat, 11 Jan 2014 09:36:56 -0400
Subject: [PATCH] debian/patches/aubio.patch: update to aubio 0.4.0 (Closes:
#733969)
---
debian/control | 2 +-
debian/patches/aubio.patch | 293 +
debian/patches/series | 1 +
debian/rules | 2 +-
4 files changed, 296 insertions(+), 2 deletions(-)
create mode 100644 debian/patches/aubio.patch
diff --git a/debian/control b/debian/control
index f420c41..a4fdaad 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Build-Depends:
libpangomm-1.4-dev (= 2.28.4),
ladspa-sdk (= 1.1-2),
libasound2-dev (= 0.9.4),
- libaubio-dev (= 0.3.2),
+ libaubio-dev (= 0.4.0),
libjack-dev,
liblo-dev (= 0.26~),
libsamplerate0-dev (= 0.1.8),
diff --git a/debian/patches/aubio.patch b/debian/patches/aubio.patch
new file mode 100644
index 000..5c6ddae
--- /dev/null
+++ b/debian/patches/aubio.patch
@@ -0,0 +1,293 @@
+Description: merge latest vamp-aubio-plugins version to use aubio 0.4.0
+ Update libs/vamp-plugins/Onset.{cpp,h} to new aubio.
+ Merge with the latest vamp-aubio-plugins revision 798ef8d.
+ See http://git.aubio.org/?p=vamp-aubio-plugins.git;a=summary.
+Author: Paul Brossier p...@debian.org
+Bug-Debian: http://bugs.debian.org/733969
+Last-Update: 2014-12-29
+
+--- a/libs/vamp-plugins/Onset.cpp
b/libs/vamp-plugins/Onset.cpp
+@@ -22,29 +22,32 @@
+ using std::cerr;
+ using std::endl;
+
++const char *getAubioNameForOnsetType(OnsetType t)
++{
++// In the same order as the enum elements in the header
++static const char *const names[] = {
++energy, specdiff, hfc, complex, phase, kl, mkl, specflux
++};
++return names[(int)t];
++}
++
+ Onset::Onset(float inputSampleRate) :
+ Plugin(inputSampleRate),
+ m_ibuf(0),
+-m_fftgrain(0),
+ m_onset(0),
+-m_pv(0),
+-m_peakpick(0),
+ m_onsetdet(0),
+-m_onsettype(aubio_onset_complex),
++m_onsettype(OnsetComplex),
+ m_threshold(0.3),
+-m_silence(-90),
+-m_channelCount(1)
++m_silence(-70),
++m_minioi(4)
+ {
+ }
+
+ Onset::~Onset()
+ {
+-if (m_onsetdet) aubio_onsetdetection_free(m_onsetdet);
++if (m_onsetdet) del_aubio_onset(m_onsetdet);
+ if (m_ibuf) del_fvec(m_ibuf);
+ if (m_onset) del_fvec(m_onset);
+-if (m_fftgrain) del_cvec(m_fftgrain);
+-if (m_pv) del_aubio_pvoc(m_pv);
+-if (m_peakpick) del_aubio_peakpicker(m_peakpick);
+ }
+
+ string
+@@ -74,7 +77,7 @@
+ int
+ Onset::getPluginVersion() const
+ {
+-return 1;
++return 2;
+ }
+
+ string
+@@ -86,22 +89,18 @@
+ bool
+ Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)
+ {
+-m_channelCount = channels;
++if
Bug#733969: ardour3: FTBFS when built against libaubio4
Hi, Adding Paul Brossier to CC, since he maintains aubio and uploaded the version with the API bump. Paul, please see/comment Adrian's mail below. From my point of view (i.e. with my release hat on), I am fine with either resolution the two of you come up with as long as the build failure here is resolved and aubio's transition is finished. ~Niels On 2014-01-09 15:28, Adrian Knoth wrote: On 01/02/14 19:27, Niels Thykier wrote: Hi! Package: ardour3 Version: 3.5.143~dfsg-1 Severity: serious Hi, Your package FTBFS during a rebuilt against libaubio4. Here is the tail from amd64. aubio 0.4 is not API-compatible with the previous 0.3 release. aubio upstream currently lists both APIs as stable. Ardour upstream has tightened the dependency to aubio 0.3.2, and it certainly needs time to incorporate the API changes. For ardour2 (bug #733968), this might never happen unless backported. There's not even a document on aubio's website how to migrate from 0.3 to 0.4. Long story short: that's too much for packaging, this is serious upstream work. Since Ardour upstream has decided to stick with 0.3.2, I suggest we re-introduce libaubio-0.3.x in Debian until the remaining users have all been transitioned to aubio4 (read: as soon as the r-depends count of aubio3 drops to zero). To be clear: I'm talking about co-existence of both aubio versions in Debian, at least temporary. Cheers ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#733969: ardour3: FTBFS when built against libaubio4
Hi all, On 01/10/2014 02:21 PM, Niels Thykier wrote: Hi, Adding Paul Brossier to CC, since he maintains aubio and uploaded the version with the API bump. Paul, please see/comment Adrian's mail below. From my point of view (i.e. with my release hat on), I am fine with either resolution the two of you come up with as long as the build failure here is resolved and aubio's transition is finished. ~Niels On 2014-01-09 15:28, Adrian Knoth wrote: On 01/02/14 19:27, Niels Thykier wrote: Hi! Package: ardour3 Version: 3.5.143~dfsg-1 Severity: serious Hi, Your package FTBFS during a rebuilt against libaubio4. Here is the tail from amd64. aubio 0.4 is not API-compatible with the previous 0.3 release. aubio upstream currently lists both APIs as stable. Ardour upstream has tightened the dependency to aubio 0.3.2, and it certainly needs time to incorporate the API changes. For ardour2 (bug #733968), this might never happen unless backported. There's not even a document on aubio's website how to migrate from 0.3 to 0.4. point, i'm not very good at writing documentation, sorry. Long story short: that's too much for packaging, this is serious upstream work. Since Ardour upstream has decided to stick with 0.3.2, I suggest we re-introduce libaubio-0.3.x in Debian until the remaining users have all been transitioned to aubio4 (read: as soon as the r-depends count of aubio3 drops to zero). I'll be happy to write the patches for ardour, ardour3, and denemo. I should be done in a few hours. To be clear: I'm talking about co-existence of both aubio versions in Debian, at least temporary. i'll be offline starting tomorrow for 12 days. i hope to have the three patches ready before then. cheers, Paul ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#733969: ardour3: FTBFS when built against libaubio4
On 01/02/14 19:27, Niels Thykier wrote: Hi! Package: ardour3 Version: 3.5.143~dfsg-1 Severity: serious Hi, Your package FTBFS during a rebuilt against libaubio4. Here is the tail from amd64. aubio 0.4 is not API-compatible with the previous 0.3 release. aubio upstream currently lists both APIs as stable. Ardour upstream has tightened the dependency to aubio 0.3.2, and it certainly needs time to incorporate the API changes. For ardour2 (bug #733968), this might never happen unless backported. There's not even a document on aubio's website how to migrate from 0.3 to 0.4. Long story short: that's too much for packaging, this is serious upstream work. Since Ardour upstream has decided to stick with 0.3.2, I suggest we re-introduce libaubio-0.3.x in Debian until the remaining users have all been transitioned to aubio4 (read: as soon as the r-depends count of aubio3 drops to zero). To be clear: I'm talking about co-existence of both aubio versions in Debian, at least temporary. Cheers ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#733969: ardour3: FTBFS when built against libaubio4
Package: ardour3
Version: 3.5.143~dfsg-1
Severity: serious
Hi,
Your package FTBFS during a rebuilt against libaubio4. Here is the tail
from amd64.
^
../libs/vamp-plugins/Onset.h:62:5: error: 'aubio_onsetdetection_type' does not
name a type
aubio_onsetdetection_type m_onsettype;
^
* Node /«PKGBUILDDIR»/build/gtk2_ardour/ardev_common_waf.sh is created by more
than once (full message on 'waf -v -v'). The task generators are:
1. 'ardev_common_waf.sh' in /«PKGBUILDDIR»/gtk2_ardour
2. 'ardev_common_waf.sh' in /«PKGBUILDDIR»/gtk2_ardour
Waf: Leaving directory `/«PKGBUILDDIR»/build'
Build failed
- task in 'libardourvampplugins' failed (exit status 1):
{task 35358800: cxx plugins.cpp - plugins.cpp.1.o}
['/usr/bin/g++', '-I/«PKGBUILDDIR»', '-D_FORTIFY_SOURCE=2', '-g', '-O2',
'-fstack-protector', '--param=ssp-buffer-size=4', '-Wformat',
'-Werror=format-security', '-Wall', '-DNDEBUG', '-fshow-column', '-DWAF_BUILD',
'-O3', '-fomit-frame-pointer', '-ffast-math', '-fstrength-reduce', '-pipe',
'-DARCH_X86', '-mmmx', '-msse', '-mfpmath=sse', '-DUSE_XMMINTRIN',
'-DBUILD_SSE_OPTIMIZATIONS', '-DLXVST_64BIT', '-Wall', '-Wpointer-arith',
'-Wcast-qual', '-Wcast-align', '-DBOOST_SYSTEM_NO_DEPRECATED',
'-D_ISOC9X_SOURCE', '-D_LARGEFILE64_SOURCE', '-D_FILE_OFFSET_BITS=64',
'-DENABLE_NLS', '-Woverloaded-virtual', '-D__STDC_LIMIT_MACROS',
'-D__STDC_FORMAT_MACROS', '-DHAVE_FFTW3', '-fPIC',
'-I/«PKGBUILDDIR»/build/libs/vamp-plugins',
'-I/«PKGBUILDDIR»/libs/vamp-plugins', '-I/«PKGBUILDDIR»/build/libs/vamp-sdk',
'-I/«PKGBUILDDIR»/libs/vamp-sdk', '-I/«PKGBUILDDIR»/build/libs/qm-dsp',
'-I/«PKGBUILDDIR»/libs/qm-dsp', '-I/«PKGBUILDDIR»/build',
'-DINTERNAL_SHARED_LIBS=1', '-DHAVE_GLIB=1', '-DHAVE_GTHREAD=1',
'-DHAVE_GLIBMM=1', '-DHAVE_SNDFILE=1', '-DHAVE_GIOMM=1', '-DHAVE_CURL=1',
'-DHAVE_LO=1', '-DHAVE_DLOPEN=1', '-DENABLE_NLS=1', '-DLXVST_SUPPORT=1',
'-DWINDOWS_KEY=Mod4Super', '-DIS_OSX=0', '-DCONFIG_ARCH=x86_64',
'-DHAVE_XML=1', '-DHAVE_SIGCPP=1', '-DHAVE_UUID=1', '-DHAVE_GETMNTENT=1',
'-DHAVE_EXECINFO=1', '-DHAVE_POSIX_MEMALIGN=1', '-DHAVE_LIBS_PBD=1',
'-DHAVE_LIBS_MIDIPP2=1', '-DHAVE_LIBS_EVORAL=1', '-DHAVE_FFTW3=1',
'-DHAVE_FFTW3F=1', '-DHAVE_LIBS_VAMP_SDK=1', '-DHAVE_LIBS_QM_DSP=1',
'-DHAVE_AUBIO=1', '-DHAVE_LIBS_VAMP_PLUGINS=1', '-DHAVE_LIBS_TAGLIB=1',
'-DHAVE_LIBS_LIBLTC=1', '-DHAVE_LIBS_RUBBERBAND=1',
'-DHAVE_CONTROL_PROTOCOL=1', '-DHAVE_FRONTIER=1', '-DHAVE_GENERIC_MIDI=1',
'-DHAVE_MACKIE=1', '-DHAVE_OSC=1', '-DHAVE_TRANZPORT=1', '-DHAVE_WIIMOTE=1',
'-DHAVE_LIBS_SURFACES=1', '-DHAVE_2IN2OUT=1', '-DHAVE_1IN2OUT=1',
'-DHAVE_VBAP=1', '-DHAVE_LIBS_PANNERS=1', '-DHAVE_JACK=1',
'-DHAVE_LIBS_BACKENDS=1', '-DHAVE_LIBS_TIMECODE=1', '-DHAVE_LRDF=1',
'-DHAVE_SAMPLERATE=1', '-DHAVE_ALSA=1', '-DHAVE_LV2=1', '-DHAVE_NEW_LV2=1',
'-DHAVE_SERD=1', '-DHAVE_SORD=1', '-DHAVE_SRATOM=1', '-DHAVE_LILV=1',
'-DHAVE_NEW_LILV=1', '-DHAVE_SUIL=1', '-DLV2_SUPPORT=1', '-DHAVE_OGG=1',
'-DHAVE_FLAC=1', '-DHAVE_RUBBERBAND=1', '-DUSE_RUBBERBAND=1',
'-DCURRENT_SESSION_FILE_VERSION=3001', '-DHAVE_SYS_VFS_H=1',
'-DHAVE_SYS_STATVFS_H=1', '-DHAVE_UNISTD=1', '-DHAVE_BOOST_SCOPED_PTR_HPP=1',
'-DHAVE_BOOST_PTR_CONTAINER_PTR_LIST_HPP=1', '-DHAVE_LIBS_ARDOUR=1',
'-DHAVE_GTKMM=1', '-DHAVE_GTK=1', '-DHAVE_LIBS_GTKMM2EXT=1',
'-DHAVE_LIBS_CLEARLOOKS_NEWER=1', '-DHAVE_BOOST_FORMAT_HPP=1',
'-DHAVE_LIBS_AUDIOGRAPHER=1', '-DHAVE_LV2_1_0_0=1',
'-DHAVE_LIBS_PLUGINS_REASONABLESYNTH_LV2=1', '-DHAVE_GNOMECANVAS=1',
'-DHAVE_GNOMECANVASMM=1', '-DHAVE_X11=1', '-DHAVE_FONTCONFIG=1',
'-DHAVE_BOOST_SHARED_PTR_HPP=1', '-DHAVE_BOOST_WEAK_PTR_HPP=1',
'-DHAVE_GTK2_ARDOUR=1', '-DHAVE_EXPORT=1', '-DHAVE_MIDI_MAPS=1',
'-DHAVE_MCP=1', '-DHAVE_PATCHFILES=1', '-DHAVE_TOOLS_SANITY_CHECK=1',
'../libs/vamp-plugins/plugins.cpp', '-c', '-o',
'libs/vamp-plugins/plugins.cpp.1.o']
Using packaged revision
BUILD SHARED LIB
make: *** [debian/stamp-makefile-build] Error 1
~Niels
[Reference] https://buildd.debian.org/status/package.php?p=ardour3suite=sid
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
