Changeset 549928e


Ignore:
Timestamp:
Dec 10, 2013, 2:30:42 PM (7 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, 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:
3 edited

Legend:

Unmodified
Added
Removed
  • src/io/source.c

    reb99982 r549928e  
    2424#include "fmat.h"
    2525#include "io/source.h"
    26 #ifdef HAVE_AVCODEC
     26#ifdef HAVE_LIBAV
    2727#include "io/source_avcodec.h"
    28 #endif /* HAVE_AVCODEC */
     28#endif /* HAVE_LIBAV */
    2929#ifdef __APPLE__
    3030#include "io/source_apple_audio.h"
     
    5353aubio_source_t * new_aubio_source(char_t * uri, uint_t samplerate, uint_t hop_size) {
    5454  aubio_source_t * s = AUBIO_NEW(aubio_source_t);
    55 #if HAVE_AVCODEC
     55#if HAVE_LIBAV
    5656  s->source = (void *)new_aubio_source_avcodec(uri, samplerate, hop_size);
    5757  if (s->source) {
     
    6464    return s;
    6565  }
    66 #endif /* HAVE_AVCODEC */
     66#endif /* HAVE_LIBAV */
    6767#ifdef __APPLE__
    6868  s->source = (void *)new_aubio_source_apple_audio(uri, samplerate, hop_size);
  • src/io/source_avcodec.c

    reb99982 r549928e  
    2222#include "config.h"
    2323
    24 #ifdef HAVE_AVCODEC
     24#ifdef HAVE_LIBAV
    2525
    2626#include <sndfile.h>
     
    403403}
    404404
    405 #endif /* HAVE_SNDFILE */
     405#endif /* HAVE_LIBAV */
  • wscript

    reb99982 r549928e  
    214214        ctx.check_cfg(package = 'libavresample', atleast_version = '1.0.1',
    215215                args = '--cflags --libs', uselib_store = 'AVRESAMPLE', mandatory = False)
     216        if all ( 'HAVE_' + i in ctx.env.define_key
     217                for i in ['AVCODEC', 'AVFORMAT', 'AVUTIL', 'AVRESAMPLE'] ):
     218            ctx.define('HAVE_LIBAV', 1)
     219            ctx.msg('Checking for all libav libraries', 'yes')
     220        else:
     221            ctx.msg('Checking for all libav libraries', 'not found', color = 'YELLOW')
    216222
    217223    # use memcpy hacks
Note: See TracChangeset for help on using the changeset viewer.