diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-04-05 13:35:58 -0700 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-04-05 13:35:58 -0700 |
| commit | 97b7134f41b48963345ef3d6bdf950c8d569d43d (patch) | |
| tree | ce2538582a8c15a6cfb568209e8577fe3f61af52 /ports/ffmpeg/detect-openssl.patch | |
| parent | bdf903a991c3f187e59d6ee8056dc1600f060f3b (diff) | |
| parent | a141b603b93cce21f67733e649fbd076ade74393 (diff) | |
| download | vcpkg-97b7134f41b48963345ef3d6bdf950c8d569d43d.tar.gz vcpkg-97b7134f41b48963345ef3d6bdf950c8d569d43d.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/5702
Diffstat (limited to 'ports/ffmpeg/detect-openssl.patch')
| -rw-r--r-- | ports/ffmpeg/detect-openssl.patch | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ports/ffmpeg/detect-openssl.patch b/ports/ffmpeg/detect-openssl.patch index cb8a77e0a..affd37d15 100644 --- a/ports/ffmpeg/detect-openssl.patch +++ b/ports/ffmpeg/detect-openssl.patch @@ -12,14 +12,11 @@ diff --git a/configure b/configure index a1818dc..1cf2a7c 100755 --- a/configure +++ b/configure -@@ -5836,6 +5836,7 @@ enabled openssl && { use_pkg_config openssl openssl/ssl.h OPENSSL_init - check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto || - check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 || - check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || -+ check_lib openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 || +@@ -6127,6 +6127,7 @@ + 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 SSL_library_init -llibeay32 -lssleay32 || die "ERROR: openssl not found"; } - enabled qtkit_indev && { check_header_objcc QTKit/QTKit.h || disable qtkit_indev; } - --- -2.10.1.windows.1 - + enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create && + require_pkg_config rockchip_mpp "rockchip_mpp >= 1.3.7" rockchip/rk_mpi.h mpp_create && |