mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[android] updated openssl, cjson and ffmpeg

Browse Source
This commit is contained in:
akallabeth 2023-08-03 17:42:28 +02:00 committed by akallabeth
parent b12e2ee469
commit 8877614d50
8 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,12 +20,12 @@ WITH_MEDIACODEC=0
OPENH264_TAG=v2.3.1 OPENH264_TAG=v2.3.1
OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32
OPENSSL_TAG=openssl-1.1.1s OPENSSL_TAG=openssl-1.1.1v
OPENSSL_HASH=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0
FFMPEG_TAG=n4.4.1 FFMPEG_TAG=n6.0
FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666 FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e
CJSON_TAG=v1.7.15 CJSON_TAG=v1.7.16
CJSON_HASH=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 CJSON_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c
SRC_DIR=$SCRIPT_PATH/.. SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

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

@ -20,12 +20,12 @@ WITH_MEDIACODEC=0
OPENH264_TAG=v2.3.1 OPENH264_TAG=v2.3.1
OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32
OPENSSL_TAG=openssl-1.1.1s OPENSSL_TAG=openssl-1.1.1v
OPENSSL_HASH=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0
FFMPEG_TAG=n4.4.1 FFMPEG_TAG=n6.0
FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666 FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e
CJSON_TAG=v1.7.15 CJSON_TAG=v1.7.16
CJSON_HASH=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 CJSON_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c
SRC_DIR=$SCRIPT_PATH/.. SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

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

@ -2,7 +2,7 @@
SCM_URL=https://github.com/DaveGamble/cJSON/archive SCM_URL=https://github.com/DaveGamble/cJSON/archive
SCM_TAG=v1.7.15 SCM_TAG=v1.7.15
SCM_HASH=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 SCM_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c
source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh

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

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
SCM_URL=https://github.com/FFmpeg/FFmpeg/archive SCM_URL=https://github.com/FFmpeg/FFmpeg/archive
SCM_TAG=n4.4.1 SCM_TAG=n6.0
SCM_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666 SCM_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e
OLD_PATH=$PATH OLD_PATH=$PATH
@ -125,6 +125,7 @@ function build {
--enable-pic \ --enable-pic \
--enable-jni --enable-mediacodec \ --enable-jni --enable-mediacodec \
--enable-shared \ --enable-shared \
--disable-vulkan \
--disable-stripping \ --disable-stripping \
--disable-programs --disable-doc --disable-avdevice --disable-avfilter --disable-avformat --disable-programs --disable-doc --disable-avdevice --disable-avfilter --disable-avformat

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

@ -2,10 +2,10 @@
OPENH264_TAG=v2.3.1 OPENH264_TAG=v2.3.1
OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32
OPENSSL_TAG=openssl-1.1.1s OPENSSL_TAG=openssl-1.1.1v
OPENSSL_HASH=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0
FFMPEG_TAG=n4.4.1 FFMPEG_TAG=n6.0
FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666 FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e
CJSON_TAG=v1.7.15 CJSON_TAG=v1.7.15
CJSON_HASH=d348621ca93571343a56862df7de4ff3bc9b5667 CJSON_HASH=d348621ca93571343a56862df7de4ff3bc9b5667
@ -161,7 +161,7 @@ do
fi fi
CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_FFMPEG=ON -DWITH_SWCALE=ON" CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_FFMPEG=ON -DWITH_SWCALE=ON"
else else
CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_FFMPEG=OFF" CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_FFMPEG=OFF -DWITH_SWSCALE=OFF"
fi fi
if [ $WITH_AAD -ne 0 ]; if [ $WITH_AAD -ne 0 ];
then then

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

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
SCM_URL=https://www.openssl.org/source SCM_URL=https://www.openssl.org/source
SCM_TAG=openssl-1.1.1s SCM_TAG=openssl-1.1.1v
SCM_HASH=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa SCM_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0
COMPILER=4.9 COMPILER=4.9

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

@ -20,12 +20,12 @@ WITH_MEDIACODEC=0
OPENH264_TAG=v2.3.1 OPENH264_TAG=v2.3.1
OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32
OPENSSL_TAG=openssl-1.1.1s OPENSSL_TAG=openssl-1.1.1v
OPENSSL_HASH=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0
FFMPEG_TAG=n4.4.1 FFMPEG_TAG=n6.0
FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666 FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e
CJSON_TAG=v1.7.15 CJSON_TAG=v1.7.16
CJSON_HASH=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 CJSON_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c
SRC_DIR=$SCRIPT_PATH/.. SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

14
scripts/android-build.conf
View File

@ -11,7 +11,7 @@
# and architecture you want to support. # and architecture you want to support.
WITH_OPENH264=0 WITH_OPENH264=0
WITH_OPENSSL=1 WITH_OPENSSL=1
WITH_FFMPEG=0 WITH_FFMPEG=1
WITH_AAD=1 WITH_AAD=1
BUILD_DEPS=1 BUILD_DEPS=1
DEPS_ONLY=0 DEPS_ONLY=0
@ -20,12 +20,12 @@ WITH_MEDIACODEC=0
OPENH264_TAG=v2.3.1 OPENH264_TAG=v2.3.1
OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 OPENH264_HASH=453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32
OPENSSL_TAG=openssl-1.1.1s OPENSSL_TAG=openssl-1.1.1v
OPENSSL_HASH=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa OPENSSL_HASH=d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0
FFMPEG_TAG=n4.4.1 FFMPEG_TAG=n6.0
FFMPEG_HASH=82b43cc67296bcd01a59ae6b327cdb50121d3a9e35f41a30de1edd71bb4a6666 FFMPEG_HASH=9a1fa94608300e835bf89bdfcd7d77deceba67bff3494f609816f84bd69a459e
CJSON_TAG=v1.7.15 CJSON_TAG=v1.7.16
CJSON_HASH=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2 CJSON_HASH=451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c
SRC_DIR=$SCRIPT_PATH/.. SRC_DIR=$SCRIPT_PATH/..
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs