From ff622fca572d5942f1a3b956a1e93d3ead23494a Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Wed, 27 Dec 2023 17:44:50 +0100 Subject: [PATCH] [py] remove libavresample from moresetuptools --- python/lib/moresetuptools.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/python/lib/moresetuptools.py b/python/lib/moresetuptools.py index f639ae88..0c704315 100644 --- a/python/lib/moresetuptools.py +++ b/python/lib/moresetuptools.py @@ -76,8 +76,7 @@ def add_local_macros(ext, usedouble = False): def add_external_deps(ext, usedouble = False): # loof for additional packages print("Info: looking for *optional* additional packages") - packages = ['libavcodec', 'libavformat', 'libavutil', - 'libswresample', 'libavresample', + packages = ['libavcodec', 'libavformat', 'libavutil', 'libswresample', 'jack', 'sndfile', 'rubberband', @@ -91,13 +90,9 @@ def add_external_deps(ext, usedouble = False): add_packages(packages, ext=ext) if 'avcodec' in ext.libraries \ and 'avformat' in ext.libraries \ - and 'avutil' in ext.libraries: - if 'swresample' in ext.libraries: - ext.define_macros += [('HAVE_SWRESAMPLE', 1)] - elif 'avresample' in ext.libraries: - ext.define_macros += [('HAVE_AVRESAMPLE', 1)] - if 'swresample' in ext.libraries or 'avresample' in ext.libraries: - ext.define_macros += [('HAVE_LIBAV', 1)] + and 'avutil' in ext.libraries \ + and 'swresample' in ext.libraries: + ext.define_macros += [('HAVE_LIBAV', 1)] if 'sndfile' in ext.libraries: ext.define_macros += [('HAVE_SNDFILE', 1)] if 'samplerate' in ext.libraries: -- 2.11.0