mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 22:29:01 +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
417 B
Diff
15 lines
417 B
Diff
diff --git a/configure b/configure
|
|
index 2829d79..697a504 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -4221,9 +4221,6 @@
|
|
if disabled autodetect; then
|
|
|
|
- # Unless iconv is explicitely disabled by the user, we still want to probe
|
|
- # for the iconv from the libc.
|
|
- disabled iconv || enable libc_iconv
|
|
|
|
disable_weak $EXTERNAL_AUTODETECT_LIBRARY_LIST
|
|
disable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST
|
|
fi
|