From 52041e888c2c19ceff1b34a0fbd132bc0c752521 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Thu, 25 Sep 2025 20:06:30 +0200 Subject: [PATCH] meson.build: Make libswscale a requirement only if videoconvert is enabled --- meson.build | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 58a00daf8..83e964a07 100644 --- a/meson.build +++ b/meson.build @@ -339,14 +339,23 @@ endif pw_cat_ffmpeg = get_option('pw-cat-ffmpeg') ffmpeg = get_option('ffmpeg') if pw_cat_ffmpeg.allowed() or ffmpeg.allowed() + # libswscale is only used by videoconvert. FFmpeg might however be used for + # compressed audio (both for decoding said compressed audio and for parsing + # it in pw-cat). If users only care about audio, then libswscale would still + # become a requirement if its required flag is defined only by FFmpeg options. + # Make the videoconvert option a factor in swscale_dep as well to avoid this. + videoconvert = get_option('videoconvert') avcodec_dep = dependency('libavcodec', required: pw_cat_ffmpeg.enabled() or ffmpeg.enabled()) avformat_dep = dependency('libavformat', required: pw_cat_ffmpeg.enabled()) avfilter_dep = dependency('libavfilter', required: ffmpeg.enabled()) avutil_dep = dependency('libavutil', required: pw_cat_ffmpeg.enabled() or ffmpeg.enabled()) - swscale_dep = dependency('libswscale', required: pw_cat_ffmpeg.enabled() or ffmpeg.enabled()) + swscale_dep = dependency('libswscale', required: (pw_cat_ffmpeg.enabled() or ffmpeg.enabled()) and videoconvert.enabled()) else avcodec_dep = dependency('', required: false) + avformat_dep = dependency('', required: false) avfilter_dep = dependency('', required: false) + avutil_dep = dependency('', required: false) + swscale_dep = dependency('', required: false) endif cdata.set('HAVE_PW_CAT_FFMPEG_INTEGRATION', pw_cat_ffmpeg.allowed())