From 8cc92220b5621cdb130d292645f4198496e2a85b Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Fri, 13 May 2022 09:43:14 +0200
Subject: [PATCH] Made WITH_MEDIACODEC configurable, use newer openssl

---
 scripts/android-build-32.conf      |  1 +
 scripts/android-build-64.conf      |  1 +
 scripts/android-build-freerdp.sh   | 14 ++++++++++++++
 scripts/android-build-release.conf |  1 +
 scripts/android-build.conf         |  3 ++-
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf
index 1c73f59c1..7f6000c9b 100644
--- a/scripts/android-build-32.conf
+++ b/scripts/android-build-32.conf
@@ -16,6 +16,7 @@ WITH_FFMPEG=1
 BUILD_DEPS=1
 DEPS_ONLY=0
 NDK_TARGET=21
+WITH_MEDIACODEC=1
 
 JPEG_TAG=master
 OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
diff --git a/scripts/android-build-64.conf b/scripts/android-build-64.conf
index 6507b9b53..ae7bedbbd 100644
--- a/scripts/android-build-64.conf
+++ b/scripts/android-build-64.conf
@@ -16,6 +16,7 @@ WITH_FFMPEG=1
 BUILD_DEPS=1
 DEPS_ONLY=0
 NDK_TARGET=21
+WITH_MEDIACODEC=1
 
 JPEG_TAG=master
 OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
diff --git a/scripts/android-build-freerdp.sh b/scripts/android-build-freerdp.sh
index 704ae89b2..ed766e91e 100755
--- a/scripts/android-build-freerdp.sh
+++ b/scripts/android-build-freerdp.sh
@@ -77,6 +77,12 @@ do
 done
 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
 if [ -d $BUILD_SRC ];
 then
@@ -140,6 +146,14 @@ do
     else
         CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_OPENH264=OFF"
     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 ];
     then
 		if [ $BUILD_DEPS -ne 0 ];
diff --git a/scripts/android-build-release.conf b/scripts/android-build-release.conf
index 6d05684ba..83fd7eed2 100644
--- a/scripts/android-build-release.conf
+++ b/scripts/android-build-release.conf
@@ -16,6 +16,7 @@ WITH_FFMPEG=1
 BUILD_DEPS=1
 DEPS_ONLY=0
 NDK_TARGET=23
+WITH_MEDIACODEC=1
 
 JPEG_TAG=master
 OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
diff --git a/scripts/android-build.conf b/scripts/android-build.conf
index 7c9e93291..afdb4e04c 100644
--- a/scripts/android-build.conf
+++ b/scripts/android-build.conf
@@ -16,10 +16,11 @@ WITH_FFMPEG=0
 BUILD_DEPS=1
 DEPS_ONLY=0
 NDK_TARGET=21
+WITH_MEDIACODEC=1
 
 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.1n
+OPENSSL_TAG=openssl-1.1.1o
 FFMPEG_TAG=n4.4.1
 
 SRC_DIR=$SCRIPT_PATH/..