From 70a689787d64603afa17d2e06eee3f92a3d9c1d3 Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Thu, 13 Jan 2022 08:23:44 +0100
Subject: [PATCH] Updated android build configuration

Use FFMPEG instead of OpenH264 for newer NDK compatibility
---
 scripts/android-build-32.conf      | 6 ++++--
 scripts/android-build-64.conf      | 2 ++
 scripts/android-build-release.conf | 7 ++++---
 scripts/android-build.conf         | 4 +++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf
index 4bafb2388..d7be812b4 100644
--- a/scripts/android-build-32.conf
+++ b/scripts/android-build-32.conf
@@ -10,15 +10,17 @@
 #       create seperate configurations for each NDK API level
 #       and architecture you want to support.
 WITH_JPEG=0
-WITH_OPENH264=1
+WITH_OPENH264=0
 WITH_OPENSSL=1
+WITH_FFMPEG=1
 BUILD_DEPS=1
 DEPS_ONLY=0
 NDK_TARGET=21
 
 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_1j
+OPENSSL_TAG=OpenSSL_1_1_1m
+FFMPEG_TAG=n4.4.1
 
 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 a3dcf711d..9cfe26111 100644
--- a/scripts/android-build-64.conf
+++ b/scripts/android-build-64.conf
@@ -12,6 +12,7 @@
 WITH_JPEG=0
 WITH_OPENH264=1
 WITH_OPENSSL=1
+WITH_FFMPEG=1
 BUILD_DEPS=1
 DEPS_ONLY=0
 NDK_TARGET=21
@@ -19,6 +20,7 @@ NDK_TARGET=21
 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_1j
+FFMPEG_TAG=n4.4.1
 
 SRC_DIR=$SCRIPT_PATH/..
 BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs
diff --git a/scripts/android-build-release.conf b/scripts/android-build-release.conf
index 0009ed305..1c8f7a14b 100644
--- a/scripts/android-build-release.conf
+++ b/scripts/android-build-release.conf
@@ -10,16 +10,17 @@
 #       create seperate configurations for each NDK API level
 #       and architecture you want to support.
 WITH_JPEG=0
-WITH_FFMPEG=0
-WITH_OPENH264=1
+WITH_OPENH264=0
 WITH_OPENSSL=1
+WITH_FFMPEG=1
 BUILD_DEPS=1
 DEPS_ONLY=0
 NDK_TARGET=21
 
 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_1h
+OPENSSL_TAG=OpenSSL_1_1_1m
+FFMPEG_TAG=n4.4.1
 
 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 2de43a1c2..ba43f8061 100644
--- a/scripts/android-build.conf
+++ b/scripts/android-build.conf
@@ -12,13 +12,15 @@
 WITH_JPEG=0
 WITH_OPENH264=0
 WITH_OPENSSL=1
+WITH_FFMPEG=1
 BUILD_DEPS=1
 DEPS_ONLY=0
 NDK_TARGET=26
 
 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_1k
+OPENSSL_TAG=OpenSSL_1_1_1m
+FFMPEG_TAG=n4.4.1
 
 SRC_DIR=$SCRIPT_PATH/..
 BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs