From: Paul Brossier Date: Wed, 27 Dec 2023 16:48:10 +0000 (+0100) Subject: [waf] remove avresample from wscript X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=ae9b76b1014768160812e42a55456b5cd0752c30;p=aubio.git [waf] remove avresample from wscript --- diff --git a/wscript b/wscript index ae8b14b5..131b09fe 100644 --- a/wscript +++ b/wscript @@ -448,11 +448,6 @@ def configure(ctx): args = '--cflags --libs libswresample >= 1.2.0', uselib_store = 'SWRESAMPLE', mandatory = False) - if 'HAVE_SWRESAMPLE' not in ctx.env: - ctx.check_cfg(package = 'libavresample', - args = '--cflags --libs libavresample >= 1.0.1', - uselib_store = 'AVRESAMPLE', - mandatory = False) msg_check = 'Checking for all libav libraries' if 'HAVE_AVCODEC' not in ctx.env: @@ -461,16 +456,11 @@ def configure(ctx): ctx.msg(msg_check, 'not found (missing avformat)', color = 'YELLOW') elif 'HAVE_AVUTIL' not in ctx.env: ctx.msg(msg_check, 'not found (missing avutil)', color = 'YELLOW') - elif 'HAVE_SWRESAMPLE' not in ctx.env \ - and 'HAVE_AVRESAMPLE' not in ctx.env: - resample_missing = 'not found (avresample or swresample required)' + elif 'HAVE_SWRESAMPLE' not in ctx.env : + resample_missing = 'not found (missing swresample)' ctx.msg(msg_check, resample_missing, color = 'YELLOW') else: ctx.msg(msg_check, 'yes') - if 'HAVE_SWRESAMPLE' in ctx.env: - ctx.define('HAVE_SWRESAMPLE', 1) - elif 'HAVE_AVRESAMPLE' in ctx.env: - ctx.define('HAVE_AVRESAMPLE', 1) ctx.define('HAVE_LIBAV', 1) # check for vorbisenc