- Update `audio/aubio' to version 0.4.1; make all dependencies/features

optional; provide a way to disable Doxygen even when it was found in the system - License was changed to GPLv3; do not install LICENSE_FILE since it is merely a boilerplate with no actual copyright data - `audio/ardour' needs to be patched for API changes in aubio 0.4. The patch comes from upstream, but new aubio version detection logic is not directly applicable, so simply define HAVE_AUBIO4 in the port's Makefile - While here, ensure that `audio/ardour' gets all of its dependencies, (ir)regardless of particular OPTIONS selected (or not selected) for the `audio/aubio' port - Bump port revisions of `audio/ardour' and `audio/denemo', the only two libaubio consumers in the tree PR: 200556 (slightly modified)
svn path=/head/; revision=392608
2025-07-17 01:09:24 -04:00 · 2015-07-21 01:52:25 +00:00 · 2015-07-21 01:52:25 +00:00 · 4aae9d7765 · 2021-03-31 03:12:20 +00:00
commit 4aae9d7765
parent 610ce8a63a
7 changed files with 761 additions and 61 deletions
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	ardour
 PORTVERSION=	2.8.16
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://freebsd.nsu.ru/distfiles/

@ -14,14 +15,16 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	liblo.so:${PORTSDIR}/audio/liblo \
 		liblrdf.so:${PORTSDIR}/textproc/liblrdf \
+		libjack.so:${PORTSDIR}/audio/jack \
 		libaubio.so:${PORTSDIR}/audio/aubio \
 		libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
 		libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
 		libgnomecanvasmm-2.6.so:${PORTSDIR}/graphics/libgnomecanvasmm26

 USES=		cpe gettext scons pkgconfig tar:bzip2
 MAKE_ARGS+=	SYSLIBS=yes PREFIX=${PREFIX} NLS=yes
-CFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include -DHAVE_AUBIO4
 USE_GNOME=	libxslt
 USE_LDCONFIG=	${PREFIX}/lib/ardour2 ${PREFIX}/lib/ardour2/surfaces

--- a/audio/ardour/files/patch-aubio4
+++ b/audio/ardour/files/patch-aubio4
@ -0,0 +1,340 @@
+commit 1eaa30b7257f006878c9b2c88ecbaea5bc36b174
+Author: Robin Gareus <robin@gareus.org>
+Date:   Sun Jan 12 18:11:14 2014 +0100
+
+    aubio 3+4 compat
+
+diff --git libs/vamp-plugins/Onset.cpp libs/vamp-plugins/Onset.cpp
+index d475b11..196ca29 100644
+--- libs/vamp-plugins/Onset.cpp
+++ libs/vamp-plugins/Onset.cpp
+@@ -22,29 +22,51 @@ using std::vector;
+ using std::cerr;
+ using std::endl;
+ 
+#ifdef HAVE_AUBIO4
+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];
+}
+#endif
+
+ Onset::Onset(float inputSampleRate) :
+     Plugin(inputSampleRate),
+     m_ibuf(0),
+-    m_fftgrain(0),
+     m_onset(0),
+#ifdef HAVE_AUBIO4
+    m_onsetdet(0),
+    m_onsettype(OnsetComplex),
+    m_minioi(4),
+    m_silence(-70),
+#else
+    m_fftgrain(0),
+     m_pv(0),
+     m_peakpick(0),
+     m_onsetdet(0),
+     m_onsettype(aubio_onset_complex),
+-    m_threshold(0.3),
+    m_channelCount(1),
+     m_silence(-90),
+-    m_channelCount(1)
+#endif
+    m_threshold(0.3)
+ {
+ }
+ 
+ Onset::~Onset()
+ {
+#ifdef HAVE_AUBIO4
+    if (m_onsetdet) del_aubio_onset(m_onsetdet);
+#else
+     if (m_onsetdet) aubio_onsetdetection_free(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);
+#endif
+    if (m_ibuf) del_fvec(m_ibuf);
+    if (m_onset) del_fvec(m_onset);
+ }
+ 
+ string
+@@ -74,7 +96,11 @@ Onset::getMaker() const
+ int
+ Onset::getPluginVersion() const
+ {
+#ifdef HAVE_AUBIO4
+    return 2;
+#else
+     return 1;
+#endif
+ }
+ 
+ string
+@@ -86,10 +112,20 @@ Onset::getCopyright() const
+ bool
+ Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)
+ {
+-    m_channelCount = channels;
+     m_stepSize = stepSize;
+     m_blockSize = blockSize;
+ 
+#ifdef HAVE_AUBIO4
+    if (channels != 1) {
+        std::cerr << "Onset::initialise: channels must be 1" << std::endl;
+        return false;
+    }
+    m_ibuf = new_fvec(stepSize);
+    m_onset = new_fvec(1);
+    reset();
+#else
+    m_channelCount = channels;
+
+     m_ibuf = new_fvec(stepSize, channels);
+     m_onset = new_fvec(1, channels);
+     m_fftgrain = new_cvec(blockSize, channels);
+@@ -103,13 +139,32 @@ Onset::initialise(size_t channels, size_t stepSize, size_t blockSize)
+ 
+     m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;
+ 
+#endif
+     return true;
+ }
+ 
+#ifdef HAVE_AUBIO4
+ void
+ Onset::reset()
+ {
+    if (m_onsetdet) del_aubio_onset(m_onsetdet);
+
+    m_onsetdet = new_aubio_onset
+        (const_cast<char *>(getAubioNameForOnsetType(m_onsettype)),
+         m_blockSize,
+         m_stepSize,
+         lrintf(m_inputSampleRate));
+    
+    aubio_onset_set_threshold(m_onsetdet, m_threshold);
+    aubio_onset_set_silence(m_onsetdet, m_silence);
+    aubio_onset_set_minioi(m_onsetdet, m_minioi);
+
+    m_delay = Vamp::RealTime::frame2RealTime(4 * m_stepSize,
+                                             lrintf(m_inputSampleRate));
+
+    m_lastOnset = Vamp::RealTime::zeroTime - m_delay - m_delay;
+ }
+#endif
+ 
+ size_t
+ Onset::getPreferredStepSize() const
+@@ -132,8 +187,13 @@ Onset::getParameterDescriptors() const
+     desc.identifier = "onsettype";
+     desc.name = "Onset Detection Function Type";
+     desc.minValue = 0;
+#ifdef HAVE_AUBIO4
+    desc.maxValue = 7;
+    desc.defaultValue = (int)OnsetComplex;
+#else
+     desc.maxValue = 6;
+     desc.defaultValue = (int)aubio_onset_complex;
+#endif
+     desc.isQuantized = true;
+     desc.quantizeStep = 1;
+     desc.valueNames.push_back("Energy Based");
+@@ -143,6 +203,9 @@ Onset::getParameterDescriptors() const
+     desc.valueNames.push_back("Phase Deviation");
+     desc.valueNames.push_back("Kullback-Liebler");
+     desc.valueNames.push_back("Modified Kullback-Liebler");
+#ifdef HAVE_AUBIO4
+    desc.valueNames.push_back("Spectral Flux");
+#endif
+     list.push_back(desc);
+ 
+     desc = ParameterDescriptor();
+@@ -159,11 +222,27 @@ Onset::getParameterDescriptors() const
+     desc.name = "Silence Threshold";
+     desc.minValue = -120;
+     desc.maxValue = 0;
+#ifdef HAVE_AUBIO4
+    desc.defaultValue = -70;
+#else
+     desc.defaultValue = -90;
+#endif
+     desc.unit = "dB";
+     desc.isQuantized = false;
+     list.push_back(desc);
+ 
+#ifdef HAVE_AUBIO4
+    desc = ParameterDescriptor();
+    desc.identifier = "minioi";
+    desc.name = "Minimum Inter-Onset Interval";
+    desc.minValue = 0;
+    desc.maxValue = 40;
+    desc.defaultValue = 4;
+    desc.unit = "ms";
+    desc.isQuantized = true;
+    desc.quantizeStep = 1;
+    list.push_back(desc);
+#endif
+     return list;
+ }
+ 
+@@ -176,6 +255,10 @@ Onset::getParameter(std::string param) const
+         return m_threshold;
+     } else if (param == "silencethreshold") {
+         return m_silence;
+#ifdef HAVE_AUBIO4
+    } else if (param == "minioi") {
+        return m_minioi;
+#endif
+     } else {
+         return 0.0;
+     }
+@@ -186,6 +269,16 @@ Onset::setParameter(std::string param, float value)
+ {
+     if (param == "onsettype") {
+         switch (lrintf(value)) {
+#ifdef HAVE_AUBIO4
+        case 0: m_onsettype = OnsetEnergy; break;
+        case 1: m_onsettype = OnsetSpecDiff; break;
+        case 2: m_onsettype = OnsetHFC; break;
+        case 3: m_onsettype = OnsetComplex; break;
+        case 4: m_onsettype = OnsetPhase; break;
+        case 5: m_onsettype = OnsetKL; break;
+        case 6: m_onsettype = OnsetMKL; break;
+        case 7: m_onsettype = OnsetSpecFlux; break;
+#else
+         case 0: m_onsettype = aubio_onset_energy; break;
+         case 1: m_onsettype = aubio_onset_specdiff; break;
+         case 2: m_onsettype = aubio_onset_hfc; break;
+@@ -193,11 +286,16 @@ Onset::setParameter(std::string param, float value)
+         case 4: m_onsettype = aubio_onset_phase; break;
+         case 5: m_onsettype = aubio_onset_kl; break;
+         case 6: m_onsettype = aubio_onset_mkl; break;
+#endif
+         }
+     } else if (param == "peakpickthreshold") {
+         m_threshold = value;
+     } else if (param == "silencethreshold") {
+         m_silence = value;
+#ifdef HAVE_AUBIO4
+    } else if (param == "minioi") {
+        m_minioi = value;
+#endif
+     }
+ }
+ 
+@@ -216,6 +314,7 @@ Onset::getOutputDescriptors() const
+     d.sampleRate = 0;
+     list.push_back(d);
+ 
+#ifndef HAVE_AUBIO4
+     d = OutputDescriptor();
+     d.identifier = "detectionfunction";
+     d.name = "Onset Detection Function";
+@@ -226,7 +325,7 @@ Onset::getOutputDescriptors() const
+     d.isQuantized = false;
+     d.sampleType = OutputDescriptor::OneSamplePerStep;
+     list.push_back(d);
+-
+#endif
+     return list;
+ }
+ 
+@@ -234,6 +333,15 @@ Onset::FeatureSet
+ Onset::process(const float *const *inputBuffers,
+                Vamp::RealTime timestamp)
+ {
+#ifdef HAVE_AUBIO4
+    for (size_t i = 0; i < m_stepSize; ++i) {
+        fvec_set_sample(m_ibuf, inputBuffers[0][i], i);
+    }
+
+    aubio_onset_do(m_onsetdet, m_ibuf, m_onset);
+
+    bool isonset = m_onset->data[0];
+#else
+     for (size_t i = 0; i < m_stepSize; ++i) {
+         for (size_t j = 0; j < m_channelCount; ++j) {
+             fvec_write_sample(m_ibuf, inputBuffers[j][i], j, i);
+@@ -250,6 +358,7 @@ Onset::process(const float *const *inputBuffers,
+             isonset = false;
+         }
+     }
+#endif
+ 
+     FeatureSet returnFeatures;
+ 
+@@ -263,11 +372,13 @@ Onset::process(const float *const *inputBuffers,
+             m_lastOnset = timestamp;
+         }
+     }
+#ifndef HAVE_AUBIO4
+     Feature feature;
+     for (size_t j = 0; j < m_channelCount; ++j) {
+         feature.values.push_back(m_onset->data[j][0]);
+     }
+     returnFeatures[1].push_back(feature);
+#endif
+ 
+     return returnFeatures;
+ }
+diff --git libs/vamp-plugins/Onset.h libs/vamp-plugins/Onset.h
+index 314e107..bba95e0 100644
+--- libs/vamp-plugins/Onset.h
+++ libs/vamp-plugins/Onset.h
+@@ -20,6 +20,19 @@
+ #include <vamp-sdk/Plugin.h>
+ #include <aubio/aubio.h>
+ 
+#ifdef HAVE_AUBIO4
+enum OnsetType {
+    OnsetEnergy,
+    OnsetSpecDiff,
+    OnsetHFC,
+    OnsetComplex,
+    OnsetPhase,
+    OnsetKL,
+    OnsetMKL,
+    OnsetSpecFlux // new in 0.4!
+};
+#endif
+
+ class Onset : public Vamp::Plugin
+ {
+ public:
+@@ -54,20 +67,25 @@ public:
+ 
+ protected:
+     fvec_t *m_ibuf;
+-    cvec_t *m_fftgrain;
+     fvec_t *m_onset;
+#ifdef HAVE_AUBIO4
+    aubio_onset_t *m_onsetdet;
+    OnsetType m_onsettype;
+    float m_minioi;
+#else
+    cvec_t *m_fftgrain;
+     aubio_pvoc_t *m_pv;
+     aubio_pickpeak_t *m_peakpick;
+     aubio_onsetdetection_t *m_onsetdet;
+     aubio_onsetdetection_type m_onsettype;
+-    float m_threshold;
+    size_t m_channelCount;
+#endif
+     float m_silence;
+    float m_threshold;
+     size_t m_stepSize;
+     size_t m_blockSize;
+-    size_t m_channelCount;
+     Vamp::RealTime m_delay;
+     Vamp::RealTime m_lastOnset;
+ };
+ 
+-
+ #endif
--- a/audio/aubio/Makefile
+++ b/audio/aubio/Makefile
@ -2,32 +2,82 @@
 # $FreeBSD$

 PORTNAME=	aubio
-PORTVERSION=	0.3.2
-PORTREVISION=	13
+PORTVERSION=	0.4.1
 CATEGORIES=	audio
 MASTER_SITES=	http://aubio.org/pub/

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for audio labelling

-LICENSE=	GPLv2 # or later
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	GPLv3

-BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
-LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libjack.so:${PORTSDIR}/audio/jack \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		liblash.so:${PORTSDIR}/audio/lash
+BUILD_DEPENDS=	txt2man:${PORTSDIR}/textproc/txt2man

-GNU_CONFIGURE=	yes
-# --disable-complex: does not compile due to missing carg(3) et al.
-CONFIGURE_ARGS=	--disable-complex
-USES=		gmake pathfix pkgconfig libtool
+USES=		pkgconfig tar:bzip2 waf
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip

-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lm
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
+
+OPTIONS_DEFINE=	COMPLEX DOXYGEN FFMPEG JACK SAMPLERATE SNDFILE
+OPTIONS_DEFAULT=	FFTW JACK SAMPLERATE SNDFILE SINGLE
+
+COMPLEX_DESC=	Compile with C99 complex.h
+COMPLEX_CONFIGURE_ENABLE=	complex
+
+DOXYGEN_CONFIGURE_OFF=	--disable-doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+
+FFMPEG_CONFIGURE_ENABLE=	avcodec
+FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+
+JACK_CONFIGURE_ENABLE=	jack
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+
+SAMPLERATE_CONFIGURE_ENABLE=	samplerate
+SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+
+SNDFILE_CONFIGURE_ENABLE=	sndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+
+OPTIONS_SINGLE=	FFT PRECISION
+OPTIONS_SINGLE_FFT=	FFTW OOURA
+OPTIONS_SINGLE_PRECISION=	DOUBLE SINGLE
+
+FFT_DESC=	FFT implementation
+FFTW_DESC=	FFTW3/FFTW3F (depending on precision)
+OOURA_DESC=	Ooura (last resort)
+
+PRECISION_DESC=	Precision
+DOUBLE_DESC=	Double precision mode
+SINGLE_DESC=	Single precision mode
+DOUBLE_CONFIGURE_ENABLE=	double
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOXYGEN}
+PLIST_SUB+=	DOXYGEN=""
+.else
+PLIST_SUB+=	DOXYGEN="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MFFTW}
+.  if ${PORT_OPTIONS:MDOUBLE}
+LIB_DEPENDS+=	libfftw3.so:${PORTSDIR}/math/fftw3
+.  else
+LIB_DEPENDS+=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
+.  endif
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/pkgconfig/s,$${LIBDIR},&data,' \
+		${WRKSRC}/waflib/TaskGen.py
+
+.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) && !defined(INSTALL_STRIPPED)
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
+.  for b in mfcc notes onset pitch quiet track
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${b}
+.  endfor
+.endif

 .include <bsd.port.mk>
--- a/audio/aubio/distinfo
+++ b/audio/aubio/distinfo
@ -1,2 +1,2 @@
-SHA256 (aubio-0.3.2.tar.gz) = dc1387b048610a6141f523c27314b7a60bd299c3d6789c372445ddc6511512cd
-SIZE (aubio-0.3.2.tar.gz) = 609006
+SHA256 (aubio-0.4.1.tar.bz2) = 25d7df0a9cd6366fda764a803424caddf5fb819fc75b42a7a03e1e6f8eb3c695
+SIZE (aubio-0.4.1.tar.bz2) = 288136
--- a/audio/aubio/files/patch-wscript
+++ b/audio/aubio/files/patch-wscript
@ -0,0 +1,36 @@
+--- wscript.orig	2014-03-12 15:19:28 UTC
+++ wscript
+@@ -72,6 +72,9 @@ def options(ctx):
+     add_option_enable_disable(ctx, 'double', default = False,
+             help_str = 'compile in double precision mode',
+             help_disable_str = 'compile in single precision mode (default)')
+    ctx.add_option('--disable-doxygen', action = 'store_true',
+            dest = 'disable_doxygen',
+            help = 'disable doxygen even if found')
+ 
+     ctx.add_option('--with-target-platform', type='string',
+             help='set target platform for cross-compilation', dest='target_platform')
+@@ -254,6 +257,9 @@ def configure(ctx):
+     # check if doxygen is installed, optional
+     try:
+       ctx.find_program('doxygen', var='DOXYGEN')
+      if ctx.options.disable_doxygen:
+        from sys import stderr
+        print >> stderr, 'doxygen found, but disabled with --disable-doxygen'
+     except ctx.errors.ConfigurationError:
+       ctx.to_log('doxygen was not found (ignoring)')
+ 
+@@ -291,11 +297,11 @@ def build(bld):
+         bld( source = bld.path.ant_glob('doc/*.txt') )
+ 
+     # build documentation from source files using doxygen
+-    if bld.env['DOXYGEN']:
+    if bld.env['DOXYGEN'] and not ctx.options.disable_doxygen:
+         bld( name = 'doxygen', rule = 'doxygen ${SRC} > /dev/null',
+                 source = 'doc/web.cfg',
+                 cwd = 'doc')
+-        bld.install_files( '${PREFIX}' + '/share/doc/libaubio-doc',
+        bld.install_files( '${PREFIX}' + '/share/doc/aubio',
+                 bld.path.ant_glob('doc/web/html/**'),
+                 cwd = bld.path.find_dir ('doc/web'),
+                 relative_trick = True)
--- a/audio/aubio/pkg-plist
+++ b/audio/aubio/pkg-plist
@ -1,49 +1,320 @@
+bin/aubiomfcc
 bin/aubionotes
 bin/aubioonset
+bin/aubiopitch
+bin/aubioquiet
 bin/aubiotrack
 include/aubio/aubio.h
-include/aubio/aubioext.h
-include/aubio/beattracking.h
-include/aubio/biquad.h
-include/aubio/config.h
-include/aubio/fft.h
-include/aubio/filter.h
-include/aubio/hist.h
-include/aubio/jackio.h
+include/aubio/cvec.h
+include/aubio/fmat.h
+include/aubio/fvec.h
+include/aubio/io/audio_unit.h
+include/aubio/io/sink.h
+include/aubio/io/sink_apple_audio.h
+include/aubio/io/sink_sndfile.h
+include/aubio/io/sink_wavwrite.h
+include/aubio/io/source.h
+include/aubio/io/source_apple_audio.h
+include/aubio/io/source_avcodec.h
+include/aubio/io/source_sndfile.h
+include/aubio/io/source_wavread.h
+include/aubio/lvec.h
 include/aubio/mathutils.h
-include/aubio/midi/list.h
-include/aubio/midi/midi.h
-include/aubio/midi/midi_driver.h
-include/aubio/midi/midi_event.h
-include/aubio/midi/midi_file.h
-include/aubio/midi/midi_parser.h
-include/aubio/midi/midi_player.h
-include/aubio/midi/midi_track.h
-include/aubio/midi/timer.h
-include/aubio/onset.h
-include/aubio/onsetdetection.h
-include/aubio/peakpick.h
-include/aubio/phasevoc.h
-include/aubio/pitchdetection.h
-include/aubio/pitchfcomb.h
-include/aubio/pitchmcomb.h
-include/aubio/pitchschmitt.h
-include/aubio/pitchyin.h
-include/aubio/pitchyinfft.h
-include/aubio/resample.h
-include/aubio/sample.h
-include/aubio/scale.h
-include/aubio/sndfileio.h
-include/aubio/tempo.h
-include/aubio/tss.h
+include/aubio/musicutils.h
+include/aubio/onset/onset.h
+include/aubio/onset/peakpicker.h
+include/aubio/pitch/pitch.h
+include/aubio/pitch/pitchfcomb.h
+include/aubio/pitch/pitchmcomb.h
+include/aubio/pitch/pitchschmitt.h
+include/aubio/pitch/pitchspecacf.h
+include/aubio/pitch/pitchyin.h
+include/aubio/pitch/pitchyinfft.h
+include/aubio/spectral/fft.h
+include/aubio/spectral/filterbank.h
+include/aubio/spectral/filterbank_mel.h
+include/aubio/spectral/mfcc.h
+include/aubio/spectral/phasevoc.h
+include/aubio/spectral/specdesc.h
+include/aubio/spectral/tss.h
+include/aubio/synth/sampler.h
+include/aubio/synth/wavetable.h
+include/aubio/tempo/beattracking.h
+include/aubio/tempo/tempo.h
+include/aubio/temporal/a_weighting.h
+include/aubio/temporal/biquad.h
+include/aubio/temporal/c_weighting.h
+include/aubio/temporal/filter.h
+include/aubio/temporal/resampler.h
 include/aubio/types.h
+include/aubio/utils/hist.h
+include/aubio/utils/parameter.h
+include/aubio/utils/scale.h
+include/aubio/vecutils.h
 lib/libaubio.a
 lib/libaubio.so
-lib/libaubio.so.2
-lib/libaubio.so.2.1.1
-lib/libaubioext.a
-lib/libaubioext.so
-lib/libaubioext.so.2
-lib/libaubioext.so.2.1.1
+lib/libaubio.so.4
+lib/libaubio.so.4.1.1
 libdata/pkgconfig/aubio.pc
-share/sounds/aubio/woodblock.aiff
+man/man1/aubiocut.1.gz
+man/man1/aubiomfcc.1.gz
+man/man1/aubionotes.1.gz
+man/man1/aubioonset.1.gz
+man/man1/aubiopitch.1.gz
+man/man1/aubioquiet.1.gz
+man/man1/aubiotrack.1.gz
+%%DOXYGEN%%share/doc/aubio/html/a__weighting_8h.html
+%%DOXYGEN%%share/doc/aubio/html/a__weighting_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/annotated.html
+%%DOXYGEN%%share/doc/aubio/html/arrowdown.png
+%%DOXYGEN%%share/doc/aubio/html/arrowright.png
+%%DOXYGEN%%share/doc/aubio/html/aubio_8h.html
+%%DOXYGEN%%share/doc/aubio/html/aubio_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/bc_s.png
+%%DOXYGEN%%share/doc/aubio/html/bdwn.png
+%%DOXYGEN%%share/doc/aubio/html/biquad_8h.html
+%%DOXYGEN%%share/doc/aubio/html/biquad_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/c__weighting_8h.html
+%%DOXYGEN%%share/doc/aubio/html/c__weighting_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/classes.html
+%%DOXYGEN%%share/doc/aubio/html/closed.png
+%%DOXYGEN%%share/doc/aubio/html/cvec_8h.html
+%%DOXYGEN%%share/doc/aubio/html/cvec_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/dir_0019dc9908b3707f2efe5d1d2e908f03.html
+%%DOXYGEN%%share/doc/aubio/html/dir_24909bf68f95b02474c7cd396a6ea1b7.html
+%%DOXYGEN%%share/doc/aubio/html/dir_6c3688c2a02b4bf89699351955a39c88.html
+%%DOXYGEN%%share/doc/aubio/html/dir_7672bb780010713f2d2504f90f5cfe22.html
+%%DOXYGEN%%share/doc/aubio/html/dir_9f81523443f82c74e7139b3dddc1da52.html
+%%DOXYGEN%%share/doc/aubio/html/dir_bc161955dc3a3d2485839eba21420d01.html
+%%DOXYGEN%%share/doc/aubio/html/dir_cbdb8362360e11eafe2fa3bc74cf0ffd.html
+%%DOXYGEN%%share/doc/aubio/html/dir_fcd67417bc8295f1aecfd58a346e9273.html
+%%DOXYGEN%%share/doc/aubio/html/doc.png
+%%DOXYGEN%%share/doc/aubio/html/doxygen.css
+%%DOXYGEN%%share/doc/aubio/html/doxygen.png
+%%DOXYGEN%%share/doc/aubio/html/dynsections.js
+%%DOXYGEN%%share/doc/aubio/html/examples.html
+%%DOXYGEN%%share/doc/aubio/html/examples_2aubionotes_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/examples_2aubioonset_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/examples_2aubiopitch_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/examples_2aubiotrack_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/fft_8h.html
+%%DOXYGEN%%share/doc/aubio/html/fft_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/files.html
+%%DOXYGEN%%share/doc/aubio/html/filter_8h.html
+%%DOXYGEN%%share/doc/aubio/html/filter_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/filterbank_8h.html
+%%DOXYGEN%%share/doc/aubio/html/filterbank_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/filterbank__mel_8h.html
+%%DOXYGEN%%share/doc/aubio/html/filterbank__mel_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/fmat_8h.html
+%%DOXYGEN%%share/doc/aubio/html/fmat_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/folderclosed.png
+%%DOXYGEN%%share/doc/aubio/html/folderopen.png
+%%DOXYGEN%%share/doc/aubio/html/functions.html
+%%DOXYGEN%%share/doc/aubio/html/functions_vars.html
+%%DOXYGEN%%share/doc/aubio/html/fvec_8h.html
+%%DOXYGEN%%share/doc/aubio/html/fvec_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/globals.html
+%%DOXYGEN%%share/doc/aubio/html/globals_c.html
+%%DOXYGEN%%share/doc/aubio/html/globals_d.html
+%%DOXYGEN%%share/doc/aubio/html/globals_defs.html
+%%DOXYGEN%%share/doc/aubio/html/globals_f.html
+%%DOXYGEN%%share/doc/aubio/html/globals_func.html
+%%DOXYGEN%%share/doc/aubio/html/globals_func_c.html
+%%DOXYGEN%%share/doc/aubio/html/globals_func_d.html
+%%DOXYGEN%%share/doc/aubio/html/globals_func_f.html
+%%DOXYGEN%%share/doc/aubio/html/globals_func_l.html
+%%DOXYGEN%%share/doc/aubio/html/globals_func_n.html
+%%DOXYGEN%%share/doc/aubio/html/globals_h.html
+%%DOXYGEN%%share/doc/aubio/html/globals_l.html
+%%DOXYGEN%%share/doc/aubio/html/globals_n.html
+%%DOXYGEN%%share/doc/aubio/html/globals_s.html
+%%DOXYGEN%%share/doc/aubio/html/globals_type.html
+%%DOXYGEN%%share/doc/aubio/html/globals_u.html
+%%DOXYGEN%%share/doc/aubio/html/index.html
+%%DOXYGEN%%share/doc/aubio/html/io_2test-sink_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/io_2test-source_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/io_2test-source_multi_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/jquery.js
+%%DOXYGEN%%share/doc/aubio/html/lvec_8h.html
+%%DOXYGEN%%share/doc/aubio/html/lvec_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/mfcc_8h.html
+%%DOXYGEN%%share/doc/aubio/html/mfcc_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/musicutils_8h.html
+%%DOXYGEN%%share/doc/aubio/html/musicutils_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/nav_f.png
+%%DOXYGEN%%share/doc/aubio/html/nav_g.png
+%%DOXYGEN%%share/doc/aubio/html/nav_h.png
+%%DOXYGEN%%share/doc/aubio/html/onset_2test-onset_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/onset_8h.html
+%%DOXYGEN%%share/doc/aubio/html/onset_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/open.png
+%%DOXYGEN%%share/doc/aubio/html/parameter_8h.html
+%%DOXYGEN%%share/doc/aubio/html/parameter_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/phasevoc_8h.html
+%%DOXYGEN%%share/doc/aubio/html/phasevoc_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/pitch_2test-pitch_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/pitch_8h.html
+%%DOXYGEN%%share/doc/aubio/html/pitch_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/resampler_8h.html
+%%DOXYGEN%%share/doc/aubio/html/resampler_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/sampler_8h.html
+%%DOXYGEN%%share/doc/aubio/html/sampler_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_0.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_0.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_1.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_1.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_10.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_10.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_2.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_2.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_3.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_3.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_4.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_4.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_5.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_5.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_6.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_6.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_7.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_7.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_8.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_8.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_9.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_9.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_a.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_a.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_b.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_b.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_c.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_c.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_d.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_d.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_e.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_e.js
+%%DOXYGEN%%share/doc/aubio/html/search/all_f.html
+%%DOXYGEN%%share/doc/aubio/html/search/all_f.js
+%%DOXYGEN%%share/doc/aubio/html/search/classes_0.html
+%%DOXYGEN%%share/doc/aubio/html/search/classes_0.js
+%%DOXYGEN%%share/doc/aubio/html/search/classes_1.html
+%%DOXYGEN%%share/doc/aubio/html/search/classes_1.js
+%%DOXYGEN%%share/doc/aubio/html/search/classes_2.html
+%%DOXYGEN%%share/doc/aubio/html/search/classes_2.js
+%%DOXYGEN%%share/doc/aubio/html/search/close.png
+%%DOXYGEN%%share/doc/aubio/html/search/defines_0.html
+%%DOXYGEN%%share/doc/aubio/html/search/defines_0.js
+%%DOXYGEN%%share/doc/aubio/html/search/defines_1.html
+%%DOXYGEN%%share/doc/aubio/html/search/defines_1.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_0.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_0.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_1.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_1.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_2.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_2.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_3.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_3.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_4.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_4.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_5.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_5.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_6.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_6.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_7.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_7.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_8.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_8.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_9.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_9.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_a.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_a.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_b.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_b.js
+%%DOXYGEN%%share/doc/aubio/html/search/files_c.html
+%%DOXYGEN%%share/doc/aubio/html/search/files_c.js
+%%DOXYGEN%%share/doc/aubio/html/search/functions_0.html
+%%DOXYGEN%%share/doc/aubio/html/search/functions_0.js
+%%DOXYGEN%%share/doc/aubio/html/search/functions_1.html
+%%DOXYGEN%%share/doc/aubio/html/search/functions_1.js
+%%DOXYGEN%%share/doc/aubio/html/search/functions_2.html
+%%DOXYGEN%%share/doc/aubio/html/search/functions_2.js
+%%DOXYGEN%%share/doc/aubio/html/search/functions_3.html
+%%DOXYGEN%%share/doc/aubio/html/search/functions_3.js
+%%DOXYGEN%%share/doc/aubio/html/search/functions_4.html
+%%DOXYGEN%%share/doc/aubio/html/search/functions_4.js
+%%DOXYGEN%%share/doc/aubio/html/search/functions_5.html
+%%DOXYGEN%%share/doc/aubio/html/search/functions_5.js
+%%DOXYGEN%%share/doc/aubio/html/search/mag_sel.png
+%%DOXYGEN%%share/doc/aubio/html/search/nomatches.html
+%%DOXYGEN%%share/doc/aubio/html/search/search.css
+%%DOXYGEN%%share/doc/aubio/html/search/search.js
+%%DOXYGEN%%share/doc/aubio/html/search/search_l.png
+%%DOXYGEN%%share/doc/aubio/html/search/search_m.png
+%%DOXYGEN%%share/doc/aubio/html/search/search_r.png
+%%DOXYGEN%%share/doc/aubio/html/search/searchdata.js
+%%DOXYGEN%%share/doc/aubio/html/search/typedefs_0.html
+%%DOXYGEN%%share/doc/aubio/html/search/typedefs_0.js
+%%DOXYGEN%%share/doc/aubio/html/search/typedefs_1.html
+%%DOXYGEN%%share/doc/aubio/html/search/typedefs_1.js
+%%DOXYGEN%%share/doc/aubio/html/search/typedefs_2.html
+%%DOXYGEN%%share/doc/aubio/html/search/typedefs_2.js
+%%DOXYGEN%%share/doc/aubio/html/search/typedefs_3.html
+%%DOXYGEN%%share/doc/aubio/html/search/typedefs_3.js
+%%DOXYGEN%%share/doc/aubio/html/search/typedefs_4.html
+%%DOXYGEN%%share/doc/aubio/html/search/typedefs_4.js
+%%DOXYGEN%%share/doc/aubio/html/search/variables_0.html
+%%DOXYGEN%%share/doc/aubio/html/search/variables_0.js
+%%DOXYGEN%%share/doc/aubio/html/search/variables_1.html
+%%DOXYGEN%%share/doc/aubio/html/search/variables_1.js
+%%DOXYGEN%%share/doc/aubio/html/search/variables_2.html
+%%DOXYGEN%%share/doc/aubio/html/search/variables_2.js
+%%DOXYGEN%%share/doc/aubio/html/search/variables_3.html
+%%DOXYGEN%%share/doc/aubio/html/search/variables_3.js
+%%DOXYGEN%%share/doc/aubio/html/search/variables_4.html
+%%DOXYGEN%%share/doc/aubio/html/search/variables_4.js
+%%DOXYGEN%%share/doc/aubio/html/sink_8h.html
+%%DOXYGEN%%share/doc/aubio/html/sink_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/source_8h.html
+%%DOXYGEN%%share/doc/aubio/html/source_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/specdesc_8h.html
+%%DOXYGEN%%share/doc/aubio/html/specdesc_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/spectral_2test-filterbank_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/spectral_2test-filterbank_mel_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/spectral_2test-mfcc_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/spectral_2test-phasevoc_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/spectral_2test-specdesc_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/spectral_2test-tss_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/splitbar.png
+%%DOXYGEN%%share/doc/aubio/html/src_2spectral_2test-fft_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/structcvec__t.html
+%%DOXYGEN%%share/doc/aubio/html/structfmat__t.html
+%%DOXYGEN%%share/doc/aubio/html/structfvec__t.html
+%%DOXYGEN%%share/doc/aubio/html/structlvec__t.html
+%%DOXYGEN%%share/doc/aubio/html/sync_off.png
+%%DOXYGEN%%share/doc/aubio/html/sync_on.png
+%%DOXYGEN%%share/doc/aubio/html/synth_2test-sampler_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/synth_2test-wavetable_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/tab_a.png
+%%DOXYGEN%%share/doc/aubio/html/tab_b.png
+%%DOXYGEN%%share/doc/aubio/html/tab_h.png
+%%DOXYGEN%%share/doc/aubio/html/tab_s.png
+%%DOXYGEN%%share/doc/aubio/html/tabs.css
+%%DOXYGEN%%share/doc/aubio/html/tempo_2test-tempo_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/tempo_8h.html
+%%DOXYGEN%%share/doc/aubio/html/tempo_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/temporal_2test-a_weighting_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/temporal_2test-biquad_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/temporal_2test-c_weighting_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/temporal_2test-filter_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/test-cvec_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/test-fmat_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/test-fvec_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/test-lvec_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/tss_8h.html
+%%DOXYGEN%%share/doc/aubio/html/tss_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/types_8h.html
+%%DOXYGEN%%share/doc/aubio/html/types_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/utils_2test-parameter_8c-example.html
+%%DOXYGEN%%share/doc/aubio/html/vecutils_8h.html
+%%DOXYGEN%%share/doc/aubio/html/vecutils_8h_source.html
+%%DOXYGEN%%share/doc/aubio/html/wavetable_8h.html
+%%DOXYGEN%%share/doc/aubio/html/wavetable_8h_source.html
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	denemo
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	GNU