diff options
| author | Matthew Oliver <protogonoi@gmail.com> | 2020-10-07 18:23:23 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-07 00:23:23 -0700 |
| commit | 72d98524e38d96982618d872ae045c2edb7f2c2e (patch) | |
| tree | 938f98d29453f0c19943da588bcf6ede02b0e110 /ports/ffmpeg/0006-fix-StaticFeatures.patch | |
| parent | 7dc0049439681a7f9537af420573d0ac3ef6ce31 (diff) | |
| download | vcpkg-72d98524e38d96982618d872ae045c2edb7f2c2e.tar.gz vcpkg-72d98524e38d96982618d872ae045c2edb7f2c2e.zip | |
[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>
Diffstat (limited to 'ports/ffmpeg/0006-fix-StaticFeatures.patch')
| -rw-r--r-- | ports/ffmpeg/0006-fix-StaticFeatures.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ports/ffmpeg/0006-fix-StaticFeatures.patch b/ports/ffmpeg/0006-fix-StaticFeatures.patch index bec030368..ce5c2f9e3 100644 --- a/ports/ffmpeg/0006-fix-StaticFeatures.patch +++ b/ports/ffmpeg/0006-fix-StaticFeatures.patch @@ -2,17 +2,17 @@ diff --git a/configure b/configure index 3bdcfc6..00b2f13 100644 --- a/configure +++ b/configure -@@ -6251,7 +6251,8 @@ if enabled libmfx; then - enabled libmfx && { check_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit || - { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } +@@ -6351,7 +6351,8 @@ if enabled libmfx; then + fi + 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; } - enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_load || - require libmysofa mysofa.h mysofa_load -lmysofa $zlib_extralibs; } + enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine || + require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; } enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei || -@@ -6292,7 +6293,7 @@ if enabled debug_configure; then +@@ -6392,7 +6393,7 @@ if enabled debug_configure; then else enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ fi @@ -21,7 +21,7 @@ index 3bdcfc6..00b2f13 100644 enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init 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 -@@ -6360,6 +6361,8 @@ enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal" +@@ -6460,6 +6461,8 @@ enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal" 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 || @@ -30,7 +30,7 @@ index 3bdcfc6..00b2f13 100644 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)" || -@@ -6379,6 +6382,7 @@ enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OP +@@ -6479,6 +6482,7 @@ enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OP 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 || |