mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made WITH_MEDIACODEC configurable, use newer openssl

This commit is contained in:
akallabeth 2022-05-13 09:43:14 +02:00 committed by akallabeth
parent 00d9c64507
commit 8cc92220b5
5 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ WITH_FFMPEG=1
BUILD_DEPS=1 BUILD_DEPS=1
DEPS_ONLY=0 DEPS_ONLY=0
NDK_TARGET=21 NDK_TARGET=21
WITH_MEDIACODEC=1
JPEG_TAG=master JPEG_TAG=master
OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0 OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0

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

@ -16,6 +16,7 @@ WITH_FFMPEG=1
BUILD_DEPS=1 BUILD_DEPS=1
DEPS_ONLY=0 DEPS_ONLY=0
NDK_TARGET=21 NDK_TARGET=21
WITH_MEDIACODEC=1
JPEG_TAG=master JPEG_TAG=master
OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0 OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0

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

@ -77,6 +77,12 @@ do
done done
common_parse_arguments $REMAINING common_parse_arguments $REMAINING
if [ -z ${WITH_MEDIACODEC+x} ];
then
common_run echo "WITH_MEDIACODEC unset, defining WITH_MEDIACODEC=1"
WITH_MEDIACODEC=1
fi
# clean up top # clean up top
if [ -d $BUILD_SRC ]; if [ -d $BUILD_SRC ];
then then
@ -140,6 +146,14 @@ do
else else
CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_OPENH264=OFF" CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_OPENH264=OFF"
fi fi
if [ $WITH_MEDIACODEC -ne 0 ];
then
CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_MEDIACODEC=ON"
else
CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_MEDIACODEC=OFF"
fi
if [ $WITH_FFMPEG -ne 0 ]; if [ $WITH_FFMPEG -ne 0 ];
then then
if [ $BUILD_DEPS -ne 0 ]; if [ $BUILD_DEPS -ne 0 ];

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

@ -16,6 +16,7 @@ WITH_FFMPEG=1
BUILD_DEPS=1 BUILD_DEPS=1
DEPS_ONLY=0 DEPS_ONLY=0
NDK_TARGET=23 NDK_TARGET=23
WITH_MEDIACODEC=1
JPEG_TAG=master JPEG_TAG=master
OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0 OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0

3
scripts/android-build.conf
View File

@ -16,10 +16,11 @@ WITH_FFMPEG=0
BUILD_DEPS=1 BUILD_DEPS=1
DEPS_ONLY=0 DEPS_ONLY=0
NDK_TARGET=21 NDK_TARGET=21
WITH_MEDIACODEC=1
JPEG_TAG=master JPEG_TAG=master
OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0 OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
OPENSSL_TAG=openssl-1.1.1n OPENSSL_TAG=openssl-1.1.1o
FFMPEG_TAG=n4.4.1 FFMPEG_TAG=n4.4.1
SRC_DIR=$SCRIPT_PATH/.. SRC_DIR=$SCRIPT_PATH/..