mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-19 03:20:26 +08:00
0f719b3fdf
* [ffmpeg] Update to 5.0 * update versions * Fix after merge. * ffmpeg: Fix lzma debug lib naming. * Update ffmpeg.json * Update ffmpeg.json * Update ffmpeg.json * fixup versions. * fixup * version fixup * Update ffmpeg.json * [ffmpeg] Disable autodetect. * [ffmpeg] Update version. * [ffmpeg] fixup autodetect on linux/uwp. * Update ffmpeg.json * [avcpp] Update to 2.1.0. * [pangolin] Update to 0.8. * Update versions. * [pangolin] Fixup port file. * Update pangolin.json * [aubio] Update to latest git master. * Update pangolin.json * [avcpp] Add license field. * [avcpp] Fix pkgconf detection of ffmpeg. * [ignition-cmake] Update to 2.16.0. * [ignition-math6] Update to 6.13.0. * [ignition-common3] Update to 3.14.1. * [avcpp] Reformat. * Update versions. * [avcpp] Fix pkgconfig cross compile. * [discordcoreapi] Disable on uwp. * Update versions * [aubio] Fix deprecated portfile functions. * Update versions. * [ffmpeg] Fix amf/mfx feature. * [ignition-math6] Require python 3.10. * Update versions. * fixup * [ignition-math6] Change version to last known good 6.9.2. * [discordcoreapi] Properly Fix. * Update versions. * Update versions. * Update ffmpeg.json * Update ffmpeg.json
50 lines
3.6 KiB
Diff
50 lines
3.6 KiB
Diff
diff --git a/configure b/configure
|
|
index 3bdcfc6..00b2f13 100644
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6351,7 +6351,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 ||
|
|
@@ -6392,7 +6393,7 @@ if enabled debug_configure; then
|
|
else
|
|
enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
|
|
fi
|
|
-enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
|
|
+enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr -lm
|
|
enabled libssh && require_pkg_config libssh libssh 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
|
|
@@ -6460,6 +6461,8 @@ enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal"
|
|
enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel ||
|
|
check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-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)" ||
|
|
@@ -6479,6 +6482,7 @@ enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OP
|
|
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
|
|
check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
|
|
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
|
|
+ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -lcrypt32 -lAdvapi32 -lUser32||
|
|
die "ERROR: openssl not found"; }
|
|
enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
|
|
enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create &&
|
|
@@ -6707,7 +6711,7 @@ enabled amf &&
|
|
if enabled libc_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 -llibcharset
|
|
fi
|
|
|
|
enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
|