mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 05:43:58 +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
15 lines
1.0 KiB
Diff
15 lines
1.0 KiB
Diff
diff --git a/configure b/configure
|
|
index b137669dd3..34c92230f4 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6331,7 +6331,7 @@ enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.
|
|
enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
|
|
enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion
|
|
enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
|
|
- { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&
|
|
+ { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac -lm -lstdc++ &&
|
|
warn "using libfdk without pkg-config"; } }
|
|
flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
|
|
enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs
|
|
|