Changeset 24c207f for python


Ignore:
Timestamp:
Mar 23, 2017, 3:46:07 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:
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
  • python/lib/moresetuptools.py

    r59be50d r24c207f  
    7575    # loof for additional packages
    7676    print("Info: looking for *optional* additional packages")
    77     packages = ['libavcodec', 'libavformat', 'libavutil', 'libavresample',
    78                 'jack',
    79                 'jack',
     77    packages = ['libavcodec', 'libavformat', 'libavutil',
     78                'libswresample', 'libavresample',
    8079                'sndfile',
    8180                #'fftw3f',
     
    8988    if 'avcodec' in ext.libraries \
    9089            and 'avformat' in ext.libraries \
    91             and 'avutil' in ext.libraries \
    92             and 'avresample' in ext.libraries:
    93         ext.define_macros += [('HAVE_LIBAV', 1)]
    94     if 'jack' in ext.libraries:
    95         ext.define_macros += [('HAVE_JACK', 1)]
     90            and 'avutil' in ext.libraries:
     91        if 'swresample' in ext.libraries:
     92            ext.define_macros += [('HAVE_SWRESAMPLE', 1)]
     93        elif 'avresample' in ext.libraries:
     94            ext.define_macros += [('HAVE_AVRESAMPLE', 1)]
     95        if 'swresample' in ext.libraries or 'avresample' in ext.libraries:
     96            ext.define_macros += [('HAVE_LIBAV', 1)]
    9697    if 'sndfile' in ext.libraries:
    9798        ext.define_macros += [('HAVE_SNDFILE', 1)]
Note: See TracChangeset for help on using the changeset viewer.