From 7a82b598373301163068980c5b3a242f259ee5ff Mon Sep 17 00:00:00 2001
From: Christian Plattner <Christian.Plattner@interventional-systems.com>
Date: Tue, 10 Nov 2020 09:45:24 +0100
Subject: [PATCH] Update FreeRDP to 2.2.0

---
 metadata/com.freerdp.afreerdp.yml | 62 ++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 2 deletions(-)

diff --git a/metadata/com.freerdp.afreerdp.yml b/metadata/com.freerdp.afreerdp.yml
index 2a3135f7d7..503c9884e7 100644
--- a/metadata/com.freerdp.afreerdp.yml
+++ b/metadata/com.freerdp.afreerdp.yml
@@ -140,13 +140,71 @@ Builds:
         --sdk $$SDK$$ --conf android-build-64.conf
     ndk: r21
 
+  - versionName: 2.1.1
+    versionCode: 17
+    commit: 2.1.1
+    subdir: client/Android/Studio/aFreeRDP
+    gradle:
+      - yes
+    prebuild:
+      - cd ../../../../scripts
+      - sed -i -e 's/OPENSSL_TAG=OpenSSL_1_1_[0-1][a-h]/OPENSSL_TAG=OpenSSL_1_1_1h/'
+        -e 's/NDK_TARGET=14/NDK_TARGET=21/'
+        android-build-*.conf
+    build:
+      - cd ../../../../scripts
+      - ANDROID_NDK=$$NDK$$ ANDROID_SDK=$$SDK$$ ./android-build-freerdp.sh --ndk $$NDK$$
+        --sdk $$SDK$$ --conf android-build-32.conf
+      - ANDROID_NDK=$$NDK$$ ANDROID_SDK=$$SDK$$ ./android-build-freerdp.sh --ndk $$NDK$$
+        --sdk $$SDK$$ --conf android-build-64.conf
+    ndk: r21
+
+  - versionName: 2.1.2
+    versionCode: 18
+    commit: 2.1.2
+    subdir: client/Android/Studio/aFreeRDP
+    gradle:
+      - yes
+    prebuild:
+      - cd ../../../../scripts
+      - sed -i -e 's/OPENSSL_TAG=OpenSSL_1_1_[0-1][a-h]/OPENSSL_TAG=OpenSSL_1_1_1h/'
+        -e 's/NDK_TARGET=14/NDK_TARGET=21/'
+        android-build-*.conf
+    build:
+      - cd ../../../../scripts
+      - ANDROID_NDK=$$NDK$$ ANDROID_SDK=$$SDK$$ ./android-build-freerdp.sh --ndk $$NDK$$
+        --sdk $$SDK$$ --conf android-build-32.conf
+      - ANDROID_NDK=$$NDK$$ ANDROID_SDK=$$SDK$$ ./android-build-freerdp.sh --ndk $$NDK$$
+        --sdk $$SDK$$ --conf android-build-64.conf
+    ndk: r21
+
+  - versionName: 2.2.0
+    versionCode: 19
+    commit: 2.2.0
+    subdir: client/Android/Studio/aFreeRDP
+    gradle:
+      - yes
+    prebuild:
+      - cd ../../../../scripts
+      - sed -i -e 's/OPENSSL_TAG=OpenSSL_1_1_[0-1][a-h]/OPENSSL_TAG=OpenSSL_1_1_1h/'
+        -e 's/NDK_TARGET=14/NDK_TARGET=21/'
+        android-build-*.conf
+    build:
+      - cd ../../../../scripts
+      - ANDROID_NDK=$$NDK$$ ANDROID_SDK=$$SDK$$ ./android-build-freerdp.sh --ndk $$NDK$$
+        --sdk $$SDK$$ --conf android-build-32.conf
+      - ANDROID_NDK=$$NDK$$ ANDROID_SDK=$$SDK$$ ./android-build-freerdp.sh --ndk $$NDK$$
+        --sdk $$SDK$$ --conf android-build-64.conf
+    ndk: r21
+
 MaintainerNotes: |-
     * Keep OpenH264 at 1.8.0 as the newer versions have issues with reference frames and
       the H264 data sent by microsoft RDP servers.
     * Can not build OpenH264 since OpenSSL already needs r21 to build.
+    * Need to update NDK target to 21 for tmerfd_create
     * The build script argument passing is buggy, provide NDK and SDK via environment too
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.1.0
-CurrentVersionCode: 16
+CurrentVersion: 2.2.0
+CurrentVersionCode: 19