mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 23:29:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8c6f8ce350
vcpkg/ports/ffmpeg/0006-fix-StaticFeatures.patch

50 lines
3.7 KiB
Diff
Raw Normal View History

[ffmpeg] Fix ffmpeg[opencl, openssl, lzma] static build failed (#8797) * [ffmpeg] Fix ffmpeg[opencl, openssl] static build failed * [ffmpeg] Fix ffmpeg/CONTROL[lzma] static build failed * Fix conflict * Fix conflict * Fix conflict * [ffmpeg] Remove include(vcpkg_common_functions) * Remove include(vcpkg_common_functions) * [ffmpeg] Fix patch apply failed * Fix conflict * [ffmpeg] Fix conflict * [ffmpeg] Fix patch
2020-04-28 05:43:29 +08:00
diff --git a/configure b/configure
[ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2023-11-15 04:54:21 +08:00
index 6d3f31fc95..f5f4a769cc 100644
[ffmpeg] Fix ffmpeg[opencl, openssl, lzma] static build failed (#8797) * [ffmpeg] Fix ffmpeg[opencl, openssl] static build failed * [ffmpeg] Fix ffmpeg/CONTROL[lzma] static build failed * Fix conflict * Fix conflict * Fix conflict * [ffmpeg] Remove include(vcpkg_common_functions) * Remove include(vcpkg_common_functions) * [ffmpeg] Fix patch apply failed * Fix conflict * [ffmpeg] Fix conflict * [ffmpeg] Fix patch
2020-04-28 05:43:29 +08:00
--- a/configure
+++ b/configure
[ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2023-11-15 04:54:21 +08:00
@@ -6761,7 +6761,8 @@ if enabled libmfx; then
[ffmpeg] Update to 4.3.1 (#13365) Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com> Co-authored-by: wangli28 <wangli28@beyondsoft.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-10-07 15:23:23 +08:00
fi
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-19 03:58:14 +08:00
enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load
-enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs
+enabled libmp3lame && { check_lib libmp3lame lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs ||
+ require libmp3lame lame/lame.h lame_set_VBR_quality -llibmp3lame-static -llibmpghip-static $libm_extralibs; }
[ffmpeg] Update to 4.3.1 (#13365) Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com> Co-authored-by: wangli28 <wangli28@beyondsoft.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-10-07 15:23:23 +08:00
enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine ||
require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; }
[ffmpeg] Update to 5.0 (#23312) * [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
2023-01-04 02:32:17 +08:00
enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei -lnppif ||
[ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2023-11-15 04:54:21 +08:00
@@ -6805,7 +6806,7 @@ if enabled debug_configure; then
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-19 03:58:14 +08:00
else
enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
fi
-enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
+enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr -lm
[ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2023-11-15 04:54:21 +08:00
enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-19 03:58:14 +08:00
enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
[ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2023-11-15 04:54:21 +08:00
@@ -6888,6 +6889,8 @@ enabled openal && { check_pkg_config openal "openal >= 1.1" "AL/al.h"
[ffmpeg] Fix ffmpeg[opencl, openssl, lzma] static build failed (#8797) * [ffmpeg] Fix ffmpeg[opencl, openssl] static build failed * [ffmpeg] Fix ffmpeg/CONTROL[lzma] static build failed * Fix conflict * Fix conflict * Fix conflict * [ffmpeg] Remove include(vcpkg_common_functions) * Remove include(vcpkg_common_functions) * [ffmpeg] Fix patch apply failed * Fix conflict * [ffmpeg] Fix conflict * [ffmpeg] Fix patch
2020-04-28 05:43:29 +08:00
enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel ||
check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
+ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -lAdvapi32 -lOle32 -lCfgmgr32||
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-19 03:58:14 +08:00
+ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -pthread -ldl ||
[ffmpeg] Fix ffmpeg[opencl, openssl, lzma] static build failed (#8797) * [ffmpeg] Fix ffmpeg[opencl, openssl] static build failed * [ffmpeg] Fix ffmpeg/CONTROL[lzma] static build failed * Fix conflict * Fix conflict * Fix conflict * [ffmpeg] Remove include(vcpkg_common_functions) * Remove include(vcpkg_common_functions) * [ffmpeg] Fix patch apply failed * Fix conflict * [ffmpeg] Fix conflict * [ffmpeg] Fix patch
2020-04-28 05:43:29 +08:00
die "ERROR: opencl not found"; } &&
{ test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
[ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2023-11-15 04:54:21 +08:00
@@ -6914,6 +6917,7 @@ enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0" ope
[ffmpeg] Fix ffmpeg[opencl, openssl, lzma] static build failed (#8797) * [ffmpeg] Fix ffmpeg[opencl, openssl] static build failed * [ffmpeg] Fix ffmpeg/CONTROL[lzma] static build failed * Fix conflict * Fix conflict * Fix conflict * [ffmpeg] Remove include(vcpkg_common_functions) * Remove include(vcpkg_common_functions) * [ffmpeg] Fix patch apply failed * Fix conflict * [ffmpeg] Fix conflict * [ffmpeg] Fix patch
2020-04-28 05:43:29 +08:00
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
+ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -lcrypt32 -lAdvapi32 -lUser32||
die "ERROR: openssl not found"; }
enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create &&
[ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2023-11-15 04:54:21 +08:00
@@ -7215,7 +7219,7 @@ enabled amf &&
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-19 03:58:14 +08:00
if enabled libc_iconv; then
check_func_headers iconv.h iconv
elif enabled iconv; then
- check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv
+ check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv || check_lib iconv iconv.h iconv -liconv -llibcharset
fi
enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
Reference in New Issue Copy Permalink