Changeset 8177483 for python


Ignore:
Timestamp:
Mar 26, 2017, 1:09:06 PM (7 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, sampler
Children:
6e8f021
Parents:
42f1cd01 (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 awhitening

File:
1 edited

Legend:

Unmodified
Added
Removed
  • python/lib/moresetuptools.py

    r42f1cd01 r8177483  
    113113    # loof for additional packages
    114114    print("Info: looking for *optional* additional packages")
    115     packages = ['libavcodec', 'libavformat', 'libavutil', 'libavresample',
    116                 'jack',
    117                 'jack',
     115    packages = ['libavcodec', 'libavformat', 'libavutil',
     116                'libswresample', 'libavresample',
    118117                'sndfile',
    119118                #'fftw3f',
     
    127126    if 'avcodec' in ext.libraries \
    128127            and 'avformat' in ext.libraries \
    129             and 'avutil' in ext.libraries \
    130             and 'avresample' in ext.libraries:
    131         ext.define_macros += [('HAVE_LIBAV', 1)]
    132     if 'jack' in ext.libraries:
    133         ext.define_macros += [('HAVE_JACK', 1)]
     128            and 'avutil' in ext.libraries:
     129        if 'swresample' in ext.libraries:
     130            ext.define_macros += [('HAVE_SWRESAMPLE', 1)]
     131        elif 'avresample' in ext.libraries:
     132            ext.define_macros += [('HAVE_AVRESAMPLE', 1)]
     133        if 'swresample' in ext.libraries or 'avresample' in ext.libraries:
     134            ext.define_macros += [('HAVE_LIBAV', 1)]
    134135    if 'sndfile' in ext.libraries:
    135136        ext.define_macros += [('HAVE_SNDFILE', 1)]
Note: See TracChangeset for help on using the changeset viewer.