Changeset bad88364 for wscript


Ignore:
Timestamp:
Mar 17, 2017, 10:59:51 AM (7 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
sampler
Children:
f8bdcb2
Parents:
bff692e (diff), c7d444a (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 sampler

File:
1 edited

Legend:

Unmodified
Added
Removed
  • wscript

    rbff692e rbad88364  
    339339                args = '--cflags --libs', uselib_store = 'AVUTIL',
    340340                mandatory = ctx.options.enable_avcodec)
    341         ctx.check_cfg(package = 'libavresample', atleast_version = '1.0.1',
    342                 args = '--cflags --libs', uselib_store = 'AVRESAMPLE',
    343                 mandatory = ctx.options.enable_avcodec)
    344         if all ( 'HAVE_' + i in ctx.env
    345                 for i in ['AVCODEC', 'AVFORMAT', 'AVUTIL', 'AVRESAMPLE'] ):
     341        ctx.check_cfg(package = 'libswresample', atleast_version = '2.3.0',
     342                args = '--cflags --libs', uselib_store = 'SWRESAMPLE',
     343                mandatory = False)
     344        if 'HAVE_SWRESAMPLE' not in ctx.env:
     345            ctx.check_cfg(package = 'libavresample', atleast_version = '1.0.1',
     346                    args = '--cflags --libs', uselib_store = 'AVRESAMPLE',
     347                    mandatory = False)
     348
     349        msg_check = 'Checking for all libav libraries'
     350        if 'HAVE_AVCODEC' not in ctx.env:
     351            ctx.msg(msg_check, 'not found (missing avcodec)', color = 'YELLOW')
     352        elif 'HAVE_AVFORMAT' not in ctx.env:
     353            ctx.msg(msg_check, 'not found (missing avformat)', color = 'YELLOW')
     354        elif 'HAVE_AVUTIL' not in ctx.env:
     355            ctx.msg(msg_check, 'not found (missing avutil)', color = 'YELLOW')
     356        elif 'HAVE_SWRESAMPLE' not in ctx.env and 'HAVE_AVRESAMPLE' not in ctx.env:
     357            resample_missing = 'not found (avresample or swresample required)'
     358            ctx.msg(msg_check, resample_missing, color = 'YELLOW')
     359        else:
     360            ctx.msg(msg_check, 'yes')
     361            if 'HAVE_SWRESAMPLE' in ctx.env:
     362                ctx.define('HAVE_SWRESAMPLE', 1)
     363            elif 'HAVE_AVRESAMPLE' in ctx.env:
     364                ctx.define('HAVE_AVRESAMPLE', 1)
    346365            ctx.define('HAVE_LIBAV', 1)
    347             ctx.msg('Checking for all libav libraries', 'yes')
    348         else:
    349             ctx.msg('Checking for all libav libraries', 'not found', color = 'YELLOW')
    350366
    351367    if (ctx.options.enable_wavread != False):
Note: See TracChangeset for help on using the changeset viewer.