Changeset 549928e

Timestamp:

Dec 10, 2013, 2:30:42 PM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

ab41f5c

Parents:

eb99982

Message:

wscript: make sure all libav libraries are installed to build source_avcodec

Signed-off-by: Paul Brossier <​piem@piem.org>

Files:

• src/io/source.c (modified) (3 diffs)
• src/io/source_avcodec.c (modified) (2 diffs)
• wscript (modified) (1 diff)

src/io/source.c

@@ -24 +24 @@
 #include "fmat.h"
 #include "io/source.h"
-#ifdef HAVE_AVCODEC
+#ifdef HAVE_LIBAV
 #include "io/source_avcodec.h"
-#endif /* HAVE_AVCODEC */
+#endif /* HAVE_LIBAV */
 #ifdef __APPLE__
 #include "io/source_apple_audio.h"
@@ -53 +53 @@
 aubio_source_t * new_aubio_source(char_t * uri, uint_t samplerate, uint_t hop_size) {
   aubio_source_t * s = AUBIO_NEW(aubio_source_t);
-#if HAVE_AVCODEC
+#if HAVE_LIBAV
   s->source = (void *)new_aubio_source_avcodec(uri, samplerate, hop_size);
   if (s->source) {
@@ -64 +64 @@
     return s;
   }
-#endif /* HAVE_AVCODEC */
+#endif /* HAVE_LIBAV */
 #ifdef __APPLE__
   s->source = (void *)new_aubio_source_apple_audio(uri, samplerate, hop_size);

src/io/source_avcodec.c

@@ -22 +22 @@
 #include "config.h"
 
-#ifdef HAVE_AVCODEC
+#ifdef HAVE_LIBAV
 
 #include <sndfile.h>
@@ -403 +403 @@
 }
 
-#endif /* HAVE_SNDFILE */
+#endif /* HAVE_LIBAV */

wscript

@@ -214 +214 @@
         ctx.check_cfg(package = 'libavresample', atleast_version = '1.0.1',
                 args = '--cflags --libs', uselib_store = 'AVRESAMPLE', mandatory = False)
+        if all ( 'HAVE_' + i in ctx.env.define_key
+                for i in ['AVCODEC', 'AVFORMAT', 'AVUTIL', 'AVRESAMPLE'] ):
+            ctx.define('HAVE_LIBAV', 1)
+            ctx.msg('Checking for all libav libraries', 'yes')
+        else:
+            ctx.msg('Checking for all libav libraries', 'not found', color = 'YELLOW')
 
     # use memcpy hacks