| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566 |
- diff --git a/configure b/configure
- index a8b74e0..c99f41c 100755
- --- a/configure
- +++ b/configure
- @@ -6633,7 +6633,7 @@ fi
-
- enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion ||
- check_lib zlib zlib.h zlibVersion -lz; }
- -enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2
- +enabled bzlib && require_pkg_config bzlib bzip2 bzlib.h BZ2_bzlibVersion
- enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma
-
- enabled zlib && test_exec $zlib_extralibs <<EOF && enable zlib_gzip
- @@ -6757,7 +6757,8 @@ if enabled libmfx; then
- fi
-
- 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 libmp3lame && { check_lib libmp3lame lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs ||
- + require libmp3lame lame/lame.h lame_set_VBR_quality -llibmp3lame-static -llibmpghip-static $libm_extralibs; }
- enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine ||
- require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; }
- enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei -lnppif ||
- @@ -6772,7 +6773,7 @@ require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264 && require_pkg_config libopenh264 "openh264 >= 1.3.0" wels/codec_api.h WelsGetCodecVersion
- enabled libopenjpeg && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
- { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
- -enabled libopenmpt && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
- +enabled libopenmpt && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create
- enabled libopenvino && { { check_pkg_config libopenvino openvino openvino/c/openvino.h ov_core_create && enable openvino2; } ||
- { check_pkg_config libopenvino openvino c_api/ie_c_api.h ie_c_api_version ||
- require libopenvino c_api/ie_c_api.h ie_c_api_version -linference_engine_c_api; } }
- @@ -6796,8 +6797,8 @@ enabled libshaderc && require_pkg_config spirv_compiler "shaderc >= 2019.
- enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer
- enabled libsmbclient && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init ||
- require libsmbclient libsmbclient.h smbc_init -lsmbclient; }
- -enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
- -enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
- +enabled libsnappy && require_pkg_config libsnappy snappy snappy-c.h snappy_compress
- +enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr $libm_extralibs
- enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init
- enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
- enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
- @@ -6880,6 +6881,8 @@ enabled openal && { check_pkg_config openal "openal >= 1.1" "AL/al.h"
- enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel ||
- check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel "-framework OpenCL" ||
- check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
- + check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -lAdvapi32 -lOle32 -lCfgmgr32||
- + check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -pthread -ldl ||
- die "ERROR: opencl not found"; } &&
- { test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
- test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
- @@ -7204,10 +7207,10 @@ enabled amf &&
- "(AMF_VERSION_MAJOR << 48 | AMF_VERSION_MINOR << 32 | AMF_VERSION_RELEASE << 16 | AMF_VERSION_BUILD_NUM) >= 0x0001000400210000"
-
- # Funny iconv installations are not unusual, so check it after all flags have been set
- -if enabled libc_iconv; then
- +if enabled libc_iconv && disabled iconv; then
- check_func_headers iconv.h iconv
- elif enabled iconv; then
- - check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv
- + check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv || check_lib iconv iconv.h iconv -liconv -lcharset
- fi
-
- enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
|
