From 439a5d609a86d9ca3a719b9fd0e88f2f32330d41 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Wed, 24 Jul 2024 21:22:22 +0200 Subject: [PATCH] [build,android] update dependencies * Update default OpenSSL version used for android build to 3.3.1 * Update default FFmpeg version to n7.0.1 * Update default cJSON to v1.7.18 * Update default openh264 to v2.4.1 --- scripts/android-build-32.conf | 16 ++++++++-------- scripts/android-build-64.conf | 16 ++++++++-------- scripts/android-build-cjson.sh | 2 +- scripts/android-build-ffmpeg.sh | 5 ++--- scripts/android-build-freerdp.sh | 4 ++-- scripts/android-build-openh264.sh | 4 ++-- scripts/android-build-openssl.sh | 8 ++++---- scripts/android-build-release.conf | 16 ++++++++-------- scripts/android-build.conf | 16 ++++++++-------- 9 files changed, 43 insertions(+), 44 deletions(-) diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf index 76726c40d..8c911f039 100644 --- a/scripts/android-build-32.conf +++ b/scripts/android-build-32.conf @@ -18,14 +18,14 @@ DEPS_ONLY=0 NDK_TARGET=21 WITH_MEDIACODEC=0 -OPENH264_TAG=v2.3.1 -OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 -OPENSSL_TAG=openssl-1.1.1v -OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 -FFMPEG_TAG=n6.0 -FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e -CJSON_TAG=v1.7.16 -CJSON_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c +OPENH264_TAG=v2.4.1 +OPENH264_HASH=8ffbe944e74043d0d3fb53d4a2a14c94de71f58dbea6a06d0dc92369542958ea +OPENSSL_TAG=openssl-3.3.1 +OPENSSL_HASH=777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e +FFMPEG_TAG=n7.0.1 +FFMPEG_HASH=8dab1da0c7ebccb2dce99265901f22ac40f8e0fbbe4a89a368d7645f2e79caa0 +CJSON_TAG=v1.7.18 +CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5 SRC_DIR=$SCRIPT_PATH/.. BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs diff --git a/scripts/android-build-64.conf b/scripts/android-build-64.conf index e6a60ddc8..8043495ca 100644 --- a/scripts/android-build-64.conf +++ b/scripts/android-build-64.conf @@ -18,14 +18,14 @@ DEPS_ONLY=0 NDK_TARGET=21 WITH_MEDIACODEC=0 -OPENH264_TAG=v2.3.1 -OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 -OPENSSL_TAG=openssl-1.1.1v -OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 -FFMPEG_TAG=n6.0 -FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e -CJSON_TAG=v1.7.16 -CJSON_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c +OPENH264_TAG=v2.4.1 +OPENH264_HASH=8ffbe944e74043d0d3fb53d4a2a14c94de71f58dbea6a06d0dc92369542958ea +OPENSSL_TAG=openssl-3.3.1 +OPENSSL_HASH=777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e +FFMPEG_TAG=n7.0.1 +FFMPEG_HASH=8dab1da0c7ebccb2dce99265901f22ac40f8e0fbbe4a89a368d7645f2e79caa0 +CJSON_TAG=v1.7.18 +CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5 SRC_DIR=$SCRIPT_PATH/.. BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs diff --git a/scripts/android-build-cjson.sh b/scripts/android-build-cjson.sh index 5b5e9dcd5..d79fa9a6f 100755 --- a/scripts/android-build-cjson.sh +++ b/scripts/android-build-cjson.sh @@ -1,7 +1,7 @@ #!/bin/bash SCM_URL=https://github.com/DaveGamble/cJSON/archive -SCM_TAG=v1.7.15 +SCM_TAG=v1.7.18 SCM_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh diff --git a/scripts/android-build-ffmpeg.sh b/scripts/android-build-ffmpeg.sh index 96094c746..83201dfac 100755 --- a/scripts/android-build-ffmpeg.sh +++ b/scripts/android-build-ffmpeg.sh @@ -1,9 +1,8 @@ #!/bin/bash SCM_URL=https://github.com/FFmpeg/FFmpeg/archive -SCM_TAG=n6.0 -SCM_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e - +SCM_TAG=n7.0.1 +SCM_HASH=8dab1da0c7ebccb2dce99265901f22ac40f8e0fbbe4a89a368d7645f2e79caa0 OLD_PATH=$PATH source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh diff --git a/scripts/android-build-freerdp.sh b/scripts/android-build-freerdp.sh index 37716bf3b..6725b2567 100755 --- a/scripts/android-build-freerdp.sh +++ b/scripts/android-build-freerdp.sh @@ -2,8 +2,8 @@ OPENH264_TAG=v2.3.1 OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 -OPENSSL_TAG=openssl-1.1.1v -OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 +OPENSSL_TAG=openssl-3.3.1 +OPENSSL_HASH=777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e FFMPEG_TAG=n6.0 FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e CJSON_TAG=v1.7.15 diff --git a/scripts/android-build-openh264.sh b/scripts/android-build-openh264.sh index ec0210801..8e405b246 100755 --- a/scripts/android-build-openh264.sh +++ b/scripts/android-build-openh264.sh @@ -1,7 +1,7 @@ #!/bin/bash SCM_URL=https://github.com/cisco/openh264/archive -SCM_TAG=v2.3.1 -SCM_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 +SCM_TAG=v2.4.1 +SCM_HASH=8ffbe944e74043d0d3fb53d4a2a14c94de71f58dbea6a06d0dc92369542958ea source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh diff --git a/scripts/android-build-openssl.sh b/scripts/android-build-openssl.sh index 8139e8ab5..4a0cdc95c 100755 --- a/scripts/android-build-openssl.sh +++ b/scripts/android-build-openssl.sh @@ -1,8 +1,8 @@ #!/bin/bash -SCM_URL=https://www.openssl.org/source -SCM_TAG=openssl-1.1.1v -SCM_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 +SCM_URL=https://github.com/openssl/openssl/releases/download/ +SCM_TAG=openssl-3.3.1 +SCM_HASH=777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e COMPILER=4.9 @@ -43,7 +43,7 @@ function build { # Run the main program. common_parse_arguments $@ -common_update $SCM_URL $SCM_TAG $BUILD_SRC $SCM_HASH +common_update "$SCM_URL/$SCM_TAG" $SCM_TAG $BUILD_SRC $SCM_HASH ORG_PATH=$PATH for ARCH in $BUILD_ARCH diff --git a/scripts/android-build-release.conf b/scripts/android-build-release.conf index c83abb9c1..f178c3648 100644 --- a/scripts/android-build-release.conf +++ b/scripts/android-build-release.conf @@ -18,14 +18,14 @@ DEPS_ONLY=0 NDK_TARGET=23 WITH_MEDIACODEC=0 -OPENH264_TAG=v2.3.1 -OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 -OPENSSL_TAG=openssl-1.1.1v -OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 -FFMPEG_TAG=n6.0 -FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e -CJSON_TAG=v1.7.16 -CJSON_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c +OPENH264_TAG=v2.4.1 +OPENH264_HASH=8ffbe944e74043d0d3fb53d4a2a14c94de71f58dbea6a06d0dc92369542958ea +OPENSSL_TAG=openssl-3.3.1 +OPENSSL_HASH=777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e +FFMPEG_TAG=n7.0.1 +FFMPEG_HASH=8dab1da0c7ebccb2dce99265901f22ac40f8e0fbbe4a89a368d7645f2e79caa0 +CJSON_TAG=v1.7.18 +CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5 SRC_DIR=$SCRIPT_PATH/.. BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs diff --git a/scripts/android-build.conf b/scripts/android-build.conf index eea9603c5..abc9a3a47 100644 --- a/scripts/android-build.conf +++ b/scripts/android-build.conf @@ -18,14 +18,14 @@ DEPS_ONLY=0 NDK_TARGET=21 WITH_MEDIACODEC=0 -OPENH264_TAG=v2.3.1 -OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 -OPENSSL_TAG=openssl-1.1.1v -OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 -FFMPEG_TAG=n6.0 -FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e -CJSON_TAG=v1.7.16 -CJSON_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c +OPENH264_TAG=v2.4.1 +OPENH264_HASH=8ffbe944e74043d0d3fb53d4a2a14c94de71f58dbea6a06d0dc92369542958ea +OPENSSL_TAG=openssl-3.3.1 +OPENSSL_HASH=777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e +FFMPEG_TAG=n7.0.1 +FFMPEG_HASH=8dab1da0c7ebccb2dce99265901f22ac40f8e0fbbe4a89a368d7645f2e79caa0 +CJSON_TAG=v1.7.18 +CJSON_HASH=3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5 SRC_DIR=$SCRIPT_PATH/.. BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs