diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf index 2ed965a11..76726c40d 100644 --- a/scripts/android-build-32.conf +++ b/scripts/android-build-32.conf @@ -20,12 +20,12 @@ WITH_MEDIACODEC=0 OPENH264_TAG=v2.3.1 OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 -OPENSSL_TAG=openssl-1.1.1s -OPENSSL_HASH=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa -FFMPEG_TAG=n4.4.1 -FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666 -CJSON_TAG=v1.7.15 -CJSON_HASH=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 +OPENSSL_TAG=openssl-1.1.1v +OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 +FFMPEG_TAG=n6.0 +FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e +CJSON_TAG=v1.7.16 +CJSON_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c 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 9d001c5d0..e6a60ddc8 100644 --- a/scripts/android-build-64.conf +++ b/scripts/android-build-64.conf @@ -20,12 +20,12 @@ WITH_MEDIACODEC=0 OPENH264_TAG=v2.3.1 OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 -OPENSSL_TAG=openssl-1.1.1s -OPENSSL_HASH=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa -FFMPEG_TAG=n4.4.1 -FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666 -CJSON_TAG=v1.7.15 -CJSON_HASH=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 +OPENSSL_TAG=openssl-1.1.1v +OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 +FFMPEG_TAG=n6.0 +FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e +CJSON_TAG=v1.7.16 +CJSON_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c 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 8d53e15e7..5610096f7 100755 --- a/scripts/android-build-cjson.sh +++ b/scripts/android-build-cjson.sh @@ -2,7 +2,7 @@ SCM_URL=https://github.com/DaveGamble/cJSON/archive SCM_TAG=v1.7.15 -SCM_HASH=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 +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 ce44c4b72..2a8f9486a 100755 --- a/scripts/android-build-ffmpeg.sh +++ b/scripts/android-build-ffmpeg.sh @@ -1,8 +1,8 @@ #!/bin/bash SCM_URL=https://github.com/FFmpeg/FFmpeg/archive -SCM_TAG=n4.4.1 -SCM_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666 +SCM_TAG=n6.0 +SCM_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e OLD_PATH=$PATH @@ -125,6 +125,7 @@ function build { --enable-pic \ --enable-jni --enable-mediacodec \ --enable-shared \ + --disable-vulkan \ --disable-stripping \ --disable-programs --disable-doc --disable-avdevice --disable-avfilter --disable-avformat diff --git a/scripts/android-build-freerdp.sh b/scripts/android-build-freerdp.sh index c63ff093f..37716bf3b 100755 --- a/scripts/android-build-freerdp.sh +++ b/scripts/android-build-freerdp.sh @@ -2,10 +2,10 @@ OPENH264_TAG=v2.3.1 OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 -OPENSSL_TAG=openssl-1.1.1s -OPENSSL_HASH=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa -FFMPEG_TAG=n4.4.1 -FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666 +OPENSSL_TAG=openssl-1.1.1v +OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 +FFMPEG_TAG=n6.0 +FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e CJSON_TAG=v1.7.15 CJSON_HASH=d348621ca93571343a56862df7de4ff3bc9b5667 @@ -161,7 +161,7 @@ do fi CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_FFMPEG=ON -DWITH_SWCALE=ON" else - CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_FFMPEG=OFF" + CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_FFMPEG=OFF -DWITH_SWSCALE=OFF" fi if [ $WITH_AAD -ne 0 ]; then diff --git a/scripts/android-build-openssl.sh b/scripts/android-build-openssl.sh index 7f6f36135..48b7dcd36 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.1s -SCM_HASH=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa +SCM_TAG=openssl-1.1.1v +SCM_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 COMPILER=4.9 diff --git a/scripts/android-build-release.conf b/scripts/android-build-release.conf index db9f04592..c83abb9c1 100644 --- a/scripts/android-build-release.conf +++ b/scripts/android-build-release.conf @@ -20,12 +20,12 @@ WITH_MEDIACODEC=0 OPENH264_TAG=v2.3.1 OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 -OPENSSL_TAG=openssl-1.1.1s -OPENSSL_HASH=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa -FFMPEG_TAG=n4.4.1 -FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666 -CJSON_TAG=v1.7.15 -CJSON_HASH=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 +OPENSSL_TAG=openssl-1.1.1v +OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 +FFMPEG_TAG=n6.0 +FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e +CJSON_TAG=v1.7.16 +CJSON_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c 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 c9ee50d6c..eea9603c5 100644 --- a/scripts/android-build.conf +++ b/scripts/android-build.conf @@ -11,7 +11,7 @@ # and architecture you want to support. WITH_OPENH264=0 WITH_OPENSSL=1 -WITH_FFMPEG=0 +WITH_FFMPEG=1 WITH_AAD=1 BUILD_DEPS=1 DEPS_ONLY=0 @@ -20,12 +20,12 @@ WITH_MEDIACODEC=0 OPENH264_TAG=v2.3.1 OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 -OPENSSL_TAG=openssl-1.1.1s -OPENSSL_HASH=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa -FFMPEG_TAG=n4.4.1 -FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666 -CJSON_TAG=v1.7.15 -CJSON_HASH=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 +OPENSSL_TAG=openssl-1.1.1v +OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 +FFMPEG_TAG=n6.0 +FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e +CJSON_TAG=v1.7.16 +CJSON_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c SRC_DIR=$SCRIPT_PATH/.. BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs