mirror of
https://github.com/rustdesk/rustdesk.git
synced 2024-11-24 04:12:20 +08:00
a72a8906b0
* Revert "Revert vcpkg ffmpeg (#8751)" This reverts commit5c16a8302e. * vcpkg: Reland ffmpeg and try to fix sciter build Signed-off-by: Vasyl Gello <vasek.gello@gmail.com> * vcpkg: Detect AVX2 by requiring __m256i (ubuntu18.04 sciter) Signed-off-by: Vasyl Gello <vasek.gello@gmail.com> * Install nasm from debian buster and python3.7 ... from ubuntu universe [Skip CI] * vcpkg: Add libyuv port with fix for windows Fromabc59feabfFound by @deep-soft Signed-off-by: Vasyl Gello <vasek.gello@gmail.com> * Bump vcpkg baseline to 2024.07.12 Signed-off-by: Vasyl Gello <vasek.gello@gmail.com> * Fix F-Droid version action I thought the latest release will be updated by the time hook starts but it is not the case. Get tag from GITHUB_REF instead if GITHUB_REF_TYPE is "tag". Signed-off-by: Vasyl Gello <vasek.gello@gmail.com> --------- Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
15 lines
1.1 KiB
Diff
15 lines
1.1 KiB
Diff
diff --git a/configure b/configure
|
|
index 2be953f7e7..e075949ffc 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6497,6 +6497,7 @@ enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0
|
|
{ enabled gplv3 || ! enabled gpl || enabled nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } ||
|
|
{ enabled gpl && ! enabled nonfree && die "ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } ||
|
|
check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
|
|
check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
|
|
+ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto $pthreads_extralibs -ldl ||
|
|
check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
|
|
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
|
|
check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
|
|
|