Changes in / [7c9285f:d1decd5]

Files:

• .gitignore (modified) (1 diff)
• .travis.yml (modified) (2 diffs)
• Makefile (modified) (1 diff)
• doc/requirements.rst (modified) (1 diff)
• python/demos/demo_pitch.py (modified) (1 diff)
• src/musicutils.h (modified) (1 diff)
• wscript (modified) (2 diffs)

.gitignore

@@ -13 +13 @@
 
 # ignore compiled test programs
-RE:tests/src/test-[a-z-_]*$
-RE:tests/cpp/test-[a-z-_]*$
+RE:tests/src/test-[a-z_-]*$
+RE:tests/cpp/test-[a-z_-]*$
 
 # only sgml manpages count

.travis.yml

@@ -11 +11 @@
       os: linux
       env: WAFOPTS="--build-type=debug"
-    - name: "Linux (Python 2.7)"
+    - name: "Linux (Python 2.7, nodeps)"
       python: 2.7
       os: linux
       distro: trusty
+      env: WAFOPTS="--nodeps"
     - name: "Linux (Python pypy3.5)"
       language: python
       python: "pypy3.5"
       os: linux
-    - name: "Linux (fftw3, no other deps)"
+    - name: "Linux (double, fftw3)"
       python: 3.8
       os: linux
-      env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3 --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband"
+      env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3"
     - name: "Linux (default, dpkg-buildflags)"
       os: linux
@@ -41 +42 @@
       os: osx
       osx_image: xcode10
-      env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband"
+      env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate --nodeps"
     - name: "iOS"
       language: shell
       os: osx
-      env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
+      env: WAFOPTS="--with-target-platform=ios --nodeps" AUBIO_NOTESTS=1
     - name: "iOSSimulator"
       language: shell
       os: osx
-      env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
+      env: WAFOPTS="--with-target-platform=iosimulator --nodeps" AUBIO_NOTESTS=1
 
 #    - name: "Windows (Python 3.8.0, lib only)"

Makefile

@@ -184 +184 @@
         -$(SOX) -r 32000 -b 16 -n "$(TESTSOUNDS)/32000Hz_127f_sine440.wav"    synth 127s sine 440        vol 0.9
         -$(SOX) -r  8000 -b 16 -n "$(TESTSOUNDS)/8000Hz_30s_silence.wav"      trim 0 30
-        -$(SOX) -r 48000 -b 32 -n "$(TESTSOUNDS)/48000Hz_60s_sweep.wav"       synth 60   sine 100-20000  vol 0.9
+        -$(SOX) -r 48000 -b 16 -n "$(TESTSOUNDS)/48000Hz_60s_sweep.wav"       synth 60   sine 100-20000  vol 0.9
         -$(SOX) -r 44100 -b 16 -n "$(TESTSOUNDS)/44100Hz_44100f_sine441.wav"  synth 44100s   sine 441   vol 0.9
         -$(SOX) -r 44100 -b 16 -n "$(TESTSOUNDS)/44100Hz_100f_sine441.wav"    synth 100s sine 441       vol 0.9

doc/requirements.rst

@@ -31 +31 @@
     If ``pkg-config`` is not found in ``PATH``, the configure step will
     succeed, but none of the external libraries will be used.
+
+To build aubio with no external libraries, use the ``--nodeps`` build option.
 
 Media libraries

python/demos/demo_pitch.py

@@ -98 +98 @@
 ax3.plot(times, [tolerance]*len(confidences))
 ax3.axis( xmin = times[0], xmax = times[-1])
-ax3.set_ylabel('condidence')
+ax3.set_ylabel('confidence')
 set_xlabels_sample2time(ax3, times[-1], samplerate)
 plt.show()

src/musicutils.h

@@ -241 +241 @@
   \param threshold threshold in dB SPL
 
-  \return 0 if level is under the given threshold, 1 otherwise
+  \return 1 if level is under the given threshold, 0 otherwise
 
 */

wscript

@@ -49 +49 @@
             dest = 'build_type', const = 'debug',
             help = 'build in debug mode (see --build-type)')
+    ctx.add_option('--nodeps', action = 'store_const',
+            dest = 'nodeps', const = 'debug',
+            help = 'build with no external dependencies')
     add_option_enable_disable(ctx, 'fftw3f', default = False,
             help_str = 'compile with fftw3f instead of ooura (recommended)',
@@ -130 +133 @@
         target_platform = ctx.options.target_platform
 
+    if ctx.options.nodeps:
+        external_deps = [
+                'sndfile',
+                'samplerate',
+                'jack',
+                'avcodec',
+                'blas',
+                'fftw3',
+                'fftw3f',
+        ]
+        for d in external_deps:
+            if not hasattr(ctx.options, 'enable_' + d):
+                raise ctx.errors.ConfigurationError ('--enable-%s missing from options' % d)
+            if getattr(ctx.options, 'enable_' + d) == True:
+                msg = 'Option --nodeps can not be used along with --enable-%s' % d
+                raise ctx.errors.ConfigurationError (msg)
+            elif getattr(ctx.options, 'enable_' + d) is None:
+                msg = 'Option --nodeps used but automatic detection with --enable-%s' % d
+                ctx.msg('Warning', msg)
+            setattr(ctx.options, 'enable_' + d, False)
+
     from waflib import Options