mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-30 20:59:12 +08:00
5962fd3c53
* [opencv4] Update t 4.7.0. * update versions. * [rtabmap] Support opencv 4.7. * Update versions. * [ffmpeg] Update to 5.1.2. * [ffmpeg] Use $VERSION * [ffmpeg] Update versions. * [nasm] Update to 2.16.01. * [ffmpeg] Fix linker crash with nasm. * [discordapi] Update to 2023-01-02 version. * Update versions. * [pangolin] Fix issue with ffmpeg 5.1. * Update versions * [ffmpeg] Fix nasm compilation with x86. * Update ffmpeg.json * Update ffmpeg.json * Update portfile.cmake * Update ffmpeg.json * Update baseline.json Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
16 lines
1.2 KiB
Diff
16 lines
1.2 KiB
Diff
diff --git a/configure b/configure
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6671,7 +6671,10 @@
|
|
[ "$toolchain" != "msvc" ] ||
|
|
require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } &&
|
|
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
|