mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 00:27:50 +08:00
1b4d69f302
* [amd-amf] Update to 1.4.29 * [ffnvcodec] Update to 11.1.5.2 * [mfx-dispatch] Fix pkgconfig * [ffmpeg] Update to 6.0 * update versions * [amd-amd] Fix merge * Update ffmpeg.json * ffmpeg: Remove libpng dependency. Ffmpeg doesnt have a libpng dependency. All thats needed for png support is zlib which has its own option already * Update ffmpeg.json * [ignition-common3] patch for ffmpeg3 * [freerdp] Update to 2.11.1 * Revert "Merge pull request #1 from autoantwort/ffmpeg" This reverts commitb52416c67d, reversing changes made to8fdd44e901. * Update ffmpeg.json * Update ffmpeg.json --------- Co-authored-by: Leander Schulten <Leander.Schulten@rwth-aachen.de>
16 lines
1.2 KiB
Diff
16 lines
1.2 KiB
Diff
diff --git a/configure b/configure
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6730,7 +6730,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 >= 89"
|
|
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
|