Showing the changes to python (1 of 9 files). Show all
Unified · Split
| @@ -74,9 +74,8 @@ def add_local_macros(ext, usedouble = False): · 73 unmodified lines | ||
| 74 | 74 | def add_external_deps(ext, usedouble = False): |
| 75 | 75 | # loof for additional packages |
| 76 | 76 | 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', | |
| 80 | 79 | 'sndfile', |
| 81 | 80 | #'fftw3f', |
| 82 | 81 | ] |
| @@ -88,11 +87,13 @@ def add_external_deps(ext, usedouble = False): · 5 unmodified lines | ||
| 88 | 87 | add_packages(packages, ext=ext) |
| 89 | 88 | if 'avcodec' in ext.libraries \ |
| 90 | 89 | 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)] | |
| 96 | 97 | if 'sndfile' in ext.libraries: |
| 97 | 98 | ext.define_macros += [('HAVE_SNDFILE', 1)] |
| 98 | 99 | if 'samplerate' in ext.libraries: |