diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake deleted file mode 100644 index 4680d402d..000000000 --- a/cmake/FindOpenSSL.cmake +++ /dev/null @@ -1,357 +0,0 @@ -# - Try to find the OpenSSL encryption library -# Once done this will define -# -# OPENSSL_ROOT_DIR - Set this variable to the root installation of OpenSSL -# -# Read-Only variables: -# OPENSSL_FOUND - system has the OpenSSL library -# OPENSSL_INCLUDE_DIR - the OpenSSL include directory -# OPENSSL_LIBRARIES - The libraries needed to use OpenSSL -# OPENSSL_VERSION - This is set to $major.$minor.$revision$path (eg. 0.9.8s) - -#============================================================================= -# Copyright 2006-2009 Kitware, Inc. -# Copyright 2006 Alexander Neundorf -# Copyright 2009-2011 Mathieu Malaterre -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -if (UNIX AND NOT ANDROID) - find_package(PkgConfig QUIET) - pkg_check_modules(_OPENSSL QUIET openssl) -endif (UNIX AND NOT ANDROID) - -# http://www.slproweb.com/products/Win32OpenSSL.html -SET(_OPENSSL_ROOT_HINTS - $ENV{OPENSSL_ROOT_DIR} - ${OPENSSL_ROOT_DIR} - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]" - ) -SET(_OPENSSL_ROOT_PATHS - "$ENV{PROGRAMFILES}/OpenSSL" - "$ENV{PROGRAMFILES}/OpenSSL-Win32" - "$ENV{PROGRAMFILES}/OpenSSL-Win64" - "C:/OpenSSL/" - "C:/OpenSSL-Win32/" - "C:/OpenSSL-Win64/" - "/obj/local/armeabi/" - "/obj/local/armeabi-v7a/" - ) -SET(_OPENSSL_ROOT_HINTS_AND_PATHS - HINTS ${_OPENSSL_ROOT_HINTS} - PATHS ${_OPENSSL_ROOT_PATHS} - ) - -FIND_PATH(OPENSSL_INCLUDE_DIR - NAMES - openssl/ssl.h - PATH_SUFFIXES - "include" - HINTS - ${_OPENSSL_INCLUDEDIR} - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - include -) - -IF(MSVC) - if(${MSVC_RUNTIME} STREQUAL "static") - set(MSVC_RUNTIME_SUFFIX "MT") - else() - set(MSVC_RUNTIME_SUFFIX "MD") - endif() -ENDIF(MSVC) - -IF(ANDROID) - FIND_LIBRARY(SSL_LIBRARY - NAMES - "ssl" - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - "lib" - ) - - FIND_LIBRARY(CRYPTO_LIBRARY - NAMES - "crypto" - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - "lib" - ) - - list(APPEND OPENSSL_LIBRARIES ${SSL_LIBRARY} ${CRYPTO_LIBRARY}) -ELSEIF(WIN32 AND NOT CYGWIN) - # MINGW should go here too - IF(MSVC) - # /MD and /MDd are the standard values - if someone wants to use - # others, the libnames have to change here too - # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b - # TODO: handle /MT and static lib - # In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix: - # * MD for dynamic-release - # * MDd for dynamic-debug - # * MT for static-release - # * MTd for static-debug - - # Implementation details: - # We are using the libraries located in the VC subdir instead of the parent directory even though : - # libeay32MD.lib is identical to ../libeay32.lib, and - # ssleay32MD.lib is identical to ../ssleay32.lib - - if(DEFINED OPENSSL_STATIC) - set(MSVC_RUNTIME_PATH_SUFFIX "lib/VC/static") - else() - set(MSVC_RUNTIME_PATH_SUFFIX "") - endif() - - FIND_LIBRARY(LIB_EAY_DEBUG - NAMES - "libeay32${MSVC_RUNTIME_SUFFIX}d" - libeay32 - libcrypto - libcrypto-1_1 - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - ${MSVC_RUNTIME_PATH_SUFFIX} - "lib" - "VC" - "lib/VC" - ) - - FIND_LIBRARY(LIB_EAY_RELEASE - NAMES - "libeay32${MSVC_RUNTIME_SUFFIX}" - libeay32 - libcrypto - libcrypto-1_1 - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - ${MSVC_RUNTIME_PATH_SUFFIX} - "lib" - "VC" - "lib/VC" - ) - - FIND_LIBRARY(SSL_EAY_DEBUG - NAMES - "ssleay32${MSVC_RUNTIME_SUFFIX}d" - ssleay32 - ssl - libssl - libssl-1_1 - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - ${MSVC_RUNTIME_PATH_SUFFIX} - "lib" - "VC" - "lib/VC" - ) - - FIND_LIBRARY(SSL_EAY_RELEASE - NAMES - "ssleay32${MSVC_RUNTIME_SUFFIX}" - ssleay32 - ssl - libssl - libssl-1_1 - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - ${MSVC_RUNTIME_PATH_SUFFIX} - "lib" - "VC" - "lib/VC" - ) - - set( OPENSSL_DEBUG_LIBRARIES ${SSL_EAY_DEBUG} ${LIB_EAY_DEBUG} ) - set( OPENSSL_RELEASE_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} ) - set( OPENSSL_LIBRARIES ${OPENSSL_RELEASE_LIBRARIES} ) - - MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE) - MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE) - ELSEIF(MINGW) - # same player, for MingW - FIND_LIBRARY(LIB_EAY - NAMES - libeay32 - libcrypto - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - "lib" - "lib/MinGW" - ) - - FIND_LIBRARY(SSL_EAY - NAMES - ssleay32 - libssl - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - "lib" - "lib/MinGW" - ) - - MARK_AS_ADVANCED(SSL_EAY LIB_EAY) - set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} ) - ELSE(MSVC) - # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues: - FIND_LIBRARY(LIB_EAY - NAMES - libeay32 - libcrypto - libcrypto-1_1 - HINTS - ${_OPENSSL_LIBDIR} - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - lib - ) - - FIND_LIBRARY(SSL_EAY - NAMES - ssleay32 - libssl - libssl-1_1 - HINTS - ${_OPENSSL_LIBDIR} - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - lib - ) - - MARK_AS_ADVANCED(SSL_EAY LIB_EAY) - set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} ) - ENDIF(MSVC) -ELSE(WIN32 AND NOT CYGWIN) - - FIND_LIBRARY(OPENSSL_SSL_LIBRARY - NAMES - ssl - ssleay32 - libssl-1_1 - "ssleay32${MSVC_RUNTIME_SUFFIX}" - HINTS - ${_OPENSSL_LIBDIR} - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - lib - ) - - FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARY - NAMES - crypto - libcrypto-1_1 - HINTS - ${_OPENSSL_LIBDIR} - ${_OPENSSL_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - lib - ) - - MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY) - - # compat defines - SET(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY}) - SET(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY}) - - SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}) - -ENDIF(ANDROID) - -function(from_hex HEX DEC) - string(TOUPPER "${HEX}" HEX) - set(_res 0) - string(LENGTH "${HEX}" _strlen) - - while (_strlen GREATER 0) - math(EXPR _res "${_res} * 16") - string(SUBSTRING "${HEX}" 0 1 NIBBLE) - string(SUBSTRING "${HEX}" 1 -1 HEX) - if (NIBBLE STREQUAL "A") - math(EXPR _res "${_res} + 10") - elseif (NIBBLE STREQUAL "B") - math(EXPR _res "${_res} + 11") - elseif (NIBBLE STREQUAL "C") - math(EXPR _res "${_res} + 12") - elseif (NIBBLE STREQUAL "D") - math(EXPR _res "${_res} + 13") - elseif (NIBBLE STREQUAL "E") - math(EXPR _res "${_res} + 14") - elseif (NIBBLE STREQUAL "F") - math(EXPR _res "${_res} + 15") - else() - math(EXPR _res "${_res} + ${NIBBLE}") - endif() - - string(LENGTH "${HEX}" _strlen) - endwhile() - - set(${DEC} ${_res} PARENT_SCOPE) -endfunction(from_hex) - -if (OPENSSL_INCLUDE_DIR) - if (_OPENSSL_VERSION) - set(OPENSSL_VERSION "${_OPENSSL_VERSION}") - elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") - file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str - REGEX "^#.?define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") - - # The version number is encoded as 0xMNNFFPPS: major minor fix patch status - # The status gives if this is a developer or prerelease and is ignored here. - # Major, minor, and fix directly translate into the version numbers shown in - # the string. The patch field translates to the single character suffix that - # indicates the bug fix state, which 00 -> nothing, 01 -> a, 02 -> b and so - # on. - - string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F]).*$" - "\\1;\\2;\\3;\\4;\\5" OPENSSL_VERSION_LIST "${openssl_version_str}") - list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR) - list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR) - from_hex("${OPENSSL_VERSION_MINOR}" OPENSSL_VERSION_MINOR) - list(GET OPENSSL_VERSION_LIST 2 OPENSSL_VERSION_FIX) - from_hex("${OPENSSL_VERSION_FIX}" OPENSSL_VERSION_FIX) - list(GET OPENSSL_VERSION_LIST 3 OPENSSL_VERSION_PATCH) - - if (NOT OPENSSL_VERSION_PATCH STREQUAL "00") - from_hex("${OPENSSL_VERSION_PATCH}" _tmp) - # 96 is the ASCII code of 'a' minus 1 - math(EXPR OPENSSL_VERSION_PATCH_ASCII "${_tmp} + 96") - unset(_tmp) - # Once anyone knows how OpenSSL would call the patch versions beyond 'z' - # this should be updated to handle that, too. This has not happened yet - # so it is simply ignored here for now. - string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING) - endif (NOT OPENSSL_VERSION_PATCH STREQUAL "00") - - set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}") - endif (_OPENSSL_VERSION) -endif (OPENSSL_INCLUDE_DIR) - -include(FindPackageHandleStandardArgs) - -if (OPENSSL_VERSION) - find_package_handle_standard_args(OpenSSL - REQUIRED_VARS - OPENSSL_LIBRARIES - OPENSSL_INCLUDE_DIR - VERSION_VAR - OPENSSL_VERSION - FAIL_MESSAGE - "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR" - ) -else (OPENSSL_VERSION) - find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR" - OPENSSL_LIBRARIES - OPENSSL_INCLUDE_DIR - ) -endif (OPENSSL_VERSION) - -MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES OPENSSL_DEBUG_LIBRARIES OPENSSL_RELEASE_LIBRARIES) diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf index d7be812b4..1c73f59c1 100644 --- a/scripts/android-build-32.conf +++ b/scripts/android-build-32.conf @@ -19,7 +19,7 @@ NDK_TARGET=21 JPEG_TAG=master OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0 -OPENSSL_TAG=OpenSSL_1_1_1m +OPENSSL_TAG=openssl-1.1.1n FFMPEG_TAG=n4.4.1 SRC_DIR=$SCRIPT_PATH/.. diff --git a/scripts/android-build-64.conf b/scripts/android-build-64.conf index 9cfe26111..6507b9b53 100644 --- a/scripts/android-build-64.conf +++ b/scripts/android-build-64.conf @@ -19,7 +19,7 @@ NDK_TARGET=21 JPEG_TAG=master OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0 -OPENSSL_TAG=OpenSSL_1_1_1j +OPENSSL_TAG=openssl-1.1.1n FFMPEG_TAG=n4.4.1 SRC_DIR=$SCRIPT_PATH/.. diff --git a/scripts/android-build-common.sh b/scripts/android-build-common.sh index 73366bfe6..bf0a488a1 100644 --- a/scripts/android-build-common.sh +++ b/scripts/android-build-common.sh @@ -248,7 +248,7 @@ function common_update { if [[ ! -f "$TARFILE" ]]; then - common_run wget -O "$TARFILE" "$SCM_URL/archive/$SCM_TAG.tar.gz" + common_run wget -O "$TARFILE" "$SCM_URL/$SCM_TAG.tar.gz" fi if [[ -d $BUILD_SRC ]]; diff --git a/scripts/android-build-ffmpeg.sh b/scripts/android-build-ffmpeg.sh index ea9c6980d..e22ece6b8 100755 --- a/scripts/android-build-ffmpeg.sh +++ b/scripts/android-build-ffmpeg.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCM_URL=https://github.com/FFmpeg/FFmpeg +SCM_URL=https://github.com/FFmpeg/FFmpeg/archive SCM_TAG=n4.4.1 OLD_PATH=$PATH diff --git a/scripts/android-build-freerdp.sh b/scripts/android-build-freerdp.sh index 5ca9525e5..704ae89b2 100755 --- a/scripts/android-build-freerdp.sh +++ b/scripts/android-build-freerdp.sh @@ -2,7 +2,7 @@ JPEG_TAG=master OPENH264_TAG=master -OPENSSL_TAG=master +OPENSSL_TAG=openssl-1.1.1n FFMPEG_TAG=n4.4.1 WITH_JPEG=0 diff --git a/scripts/android-build-jpeg.sh b/scripts/android-build-jpeg.sh index dafcf893a..65e792b97 100755 --- a/scripts/android-build-jpeg.sh +++ b/scripts/android-build-jpeg.sh @@ -1,5 +1,5 @@ #!/bin/bash -SCM_URL=https://github.com/akallabeth/jpeg8d +SCM_URL=https://github.com/akallabeth/jpeg8d/archive SCM_TAG=master source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh @@ -38,3 +38,4 @@ common_update $SCM_URL $SCM_TAG $BUILD_SRC build common_copy $BUILD_SRC $BUILD_DST +common_copy $BUILD_SRC $BUILD_DST/"${BUILD_ARCH}" diff --git a/scripts/android-build-openh264.sh b/scripts/android-build-openh264.sh index 5e9abed2c..cb1d002f5 100755 --- a/scripts/android-build-openh264.sh +++ b/scripts/android-build-openh264.sh @@ -1,5 +1,5 @@ #!/bin/bash -SCM_URL=https://github.com/cisco/openh264 +SCM_URL=https://github.com/cisco/openh264/archive SCM_TAG=master source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh diff --git a/scripts/android-build-openssl.sh b/scripts/android-build-openssl.sh index 834e53a21..5a8856314 100755 --- a/scripts/android-build-openssl.sh +++ b/scripts/android-build-openssl.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCM_URL=https://github.com/openssl/openssl +SCM_URL=https://www.openssl.org/source SCM_TAG=master COMPILER=4.9 diff --git a/scripts/android-build-release.conf b/scripts/android-build-release.conf index d1834efbe..6d05684ba 100644 --- a/scripts/android-build-release.conf +++ b/scripts/android-build-release.conf @@ -19,7 +19,7 @@ NDK_TARGET=23 JPEG_TAG=master OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0 -OPENSSL_TAG=OpenSSL_1_1_1m +OPENSSL_TAG=openssl-1.1.1n FFMPEG_TAG=n4.4.1 SRC_DIR=$SCRIPT_PATH/.. diff --git a/scripts/android-build.conf b/scripts/android-build.conf index def7690f5..7c9e93291 100644 --- a/scripts/android-build.conf +++ b/scripts/android-build.conf @@ -19,7 +19,7 @@ NDK_TARGET=21 JPEG_TAG=master OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0 -OPENSSL_TAG=OpenSSL_1_1_1m +OPENSSL_TAG=openssl-1.1.1n FFMPEG_TAG=n4.4.1 SRC_DIR=$SCRIPT_PATH/..