morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Switch to official OpenSSL Download location and away from github.

Browse Source 
One of the benefits is that this adds support for building with OpenSSL 3.0 versions without breaking support for building with 1.1.1.

As part of the work, the assumption that there is an /archive/ in the download path is removed.

Furthermore, cmake modules for finding OpenSSL are updated in order to support 3.0.
This commit is contained in:
Iordan Iordanov
2021-11-25 23:52:18 -05:00
committed by akallabeth
parent edcb8284e7
commit 511444a65e
11 changed files with 11 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/android-build-32.conf
View File

@@ -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/..

2
scripts/android-build-64.conf
View File

@@ -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/..

2
scripts/android-build-common.sh
View File

@@ -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 ]];

2
scripts/android-build-ffmpeg.sh
View File

@@ -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

2
scripts/android-build-freerdp.sh
View File

@@ -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

3
scripts/android-build-jpeg.sh
View File

@@ -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}"

2
scripts/android-build-openh264.sh
View File

@@ -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

2
scripts/android-build-openssl.sh
View File

@@ -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

2
scripts/android-build-release.conf
View File

@@ -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/..

2
scripts/android-build.conf
View File

@@ -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/..