Changeset 24c207f for wscript


Ignore:
Timestamp:
Mar 23, 2017, 3:46:07 PM (2 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, sampler
Children:
ecf7572
Parents:
59be50d (diff), 91fa88d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into gitshaversion

File:
1 edited

Legend:

Unmodified
Added
Removed
  • wscript

    r59be50d r24c207f  
    323323                args = '--cflags --libs', uselib_store = 'AVUTIL',
    324324                mandatory = ctx.options.enable_avcodec)
    325         ctx.check_cfg(package = 'libavresample', atleast_version = '1.0.1',
    326                 args = '--cflags --libs', uselib_store = 'AVRESAMPLE',
    327                 mandatory = ctx.options.enable_avcodec)
    328         if all ( 'HAVE_' + i in ctx.env
    329                 for i in ['AVCODEC', 'AVFORMAT', 'AVUTIL', 'AVRESAMPLE'] ):
     325        ctx.check_cfg(package = 'libswresample', atleast_version = '2.3.0',
     326                args = '--cflags --libs', uselib_store = 'SWRESAMPLE',
     327                mandatory = False)
     328        if 'HAVE_SWRESAMPLE' not in ctx.env:
     329            ctx.check_cfg(package = 'libavresample', atleast_version = '1.0.1',
     330                    args = '--cflags --libs', uselib_store = 'AVRESAMPLE',
     331                    mandatory = False)
     332
     333        msg_check = 'Checking for all libav libraries'
     334        if 'HAVE_AVCODEC' not in ctx.env:
     335            ctx.msg(msg_check, 'not found (missing avcodec)', color = 'YELLOW')
     336        elif 'HAVE_AVFORMAT' not in ctx.env:
     337            ctx.msg(msg_check, 'not found (missing avformat)', color = 'YELLOW')
     338        elif 'HAVE_AVUTIL' not in ctx.env:
     339            ctx.msg(msg_check, 'not found (missing avutil)', color = 'YELLOW')
     340        elif 'HAVE_SWRESAMPLE' not in ctx.env and 'HAVE_AVRESAMPLE' not in ctx.env:
     341            resample_missing = 'not found (avresample or swresample required)'
     342            ctx.msg(msg_check, resample_missing, color = 'YELLOW')
     343        else:
     344            ctx.msg(msg_check, 'yes')
     345            if 'HAVE_SWRESAMPLE' in ctx.env:
     346                ctx.define('HAVE_SWRESAMPLE', 1)
     347            elif 'HAVE_AVRESAMPLE' in ctx.env:
     348                ctx.define('HAVE_AVRESAMPLE', 1)
    330349            ctx.define('HAVE_LIBAV', 1)
    331             ctx.msg('Checking for all libav libraries', 'yes')
    332         else:
    333             ctx.msg('Checking for all libav libraries', 'not found', color = 'YELLOW')
    334350
    335351    if (ctx.options.enable_wavread != False):
Note: See TracChangeset for help on using the changeset viewer.