[FFmpeg-cvslog] configure: add pkg-config check for libmysofa
Reino Wijnsma
git at videolan.org
Mon May 14 18:34:48 EEST 2018
ffmpeg | branch: master | Reino Wijnsma <rwijnsma at xs4all.nl> | Mon May 7 17:59:43 2018 +0200| [1548d2a5a547dd043726c102687b184c7ac08575] | committer: Paul B Mahol
configure: add pkg-config check for libmysofa
This does require libmysofa with today's latest commit (https://github.com/hoene/libmysofa/commit/08f243d1ec35f6f794aedeb4b187d9f9353bdbc1).
They already had a pkg-config file, but the dependencies weren't setup right. Until now.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1548d2a5a547dd043726c102687b184c7ac08575
---
configure | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 451d1937b7..6a9d51698d 100755
--- a/configure
+++ b/configure
@@ -6011,7 +6011,8 @@ enabled libmfx && { check_pkg_config libmfx libmfx "mfx/mfxvideo.h" M
{ require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } }
enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load
enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs
-enabled libmysofa && require libmysofa "mysofa.h" mysofa_load -lmysofa $zlib_extralibs
+enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_load ||
+ require libmysofa mysofa.h mysofa_load -lmysofa $zlib_extralibs; }
enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc ||
check_lib libnpp npp.h nppGetLibVersion -lnppi -lnppc ||
die "ERROR: libnpp not found"; }
More information about the ffmpeg-cvslog
mailing list