mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 14:51:48 +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
18 lines
1.3 KiB
Diff
18 lines
1.3 KiB
Diff
diff --git a/configure b/configure
|
|
index 34a2e644c4..0ea64bd306 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6447,7 +6447,10 @@ enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x
|
|
warn "using libx264 without pkg-config"; } } &&
|
|
require_cpp_condition libx264 x264.h "X264_BUILD >= 118" &&
|
|
check_cpp_condition libx262 x264.h "X264_MPEG2"
|
|
-enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get &&
|
|
+enabled libx265 && { check_pkg_config libx265 x265 x265.h x265_api_get ||
|
|
+ { { check_lib libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++ -lgcc_s -lgcc -lrt -lnuma" ||
|
|
+ require libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++"; } &&
|
|
+ warn "using libx265 without pkg-config"; } } &&
|
|
require_cpp_condition libx265 x265.h "X265_BUILD >= 70"
|
|
enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs"
|
|
enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get
|
|
|