From 611e91667a78c9521c11c3c1decd27530a1fe8af Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sat, 8 Jul 2023 20:36:17 +0800
Subject: [PATCH] aFreeRdp: 2.10.0

---
 metadata/com.freerdp.afreerdp.yml | 38 +++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/metadata/com.freerdp.afreerdp.yml b/metadata/com.freerdp.afreerdp.yml
index f0a974a6f5..c0c0576611 100644
--- a/metadata/com.freerdp.afreerdp.yml
+++ b/metadata/com.freerdp.afreerdp.yml
@@ -184,16 +184,34 @@ Builds:
       - sed -i '/VERSION_CODE/s/22/23/' ../build.gradle
     ndk: r21e
 
-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.
-    * OpenH264 need maximum NDK r15c, so we assume that is available on the buildserver
-      next to the one we are using in the rest of the build
-    * Android dropped support for r15c, so since 2.4.0 we need disable OpenH264 support
-      until the prolem mentioned above is solved.
-    * Need to update NDK target to 21 for tmerfd_create
+  - versionName: 2.10.0
+    versionCode: 2010000
+    commit: 7471ae383e7b7a613f275e19f7b54958a193c891
+    subdir: client/Android/Studio/aFreeRDP
+    sudo:
+      - apt-get update
+      - apt-get install -y make pkg-config wget
+    gradle:
+      - yes
+    rm:
+      - client/Mac
+      - client/Sample
+      - client/Wayland
+      - client/Windows
+      - client/X11
+      - client/iOS
+    prebuild:
+      - sed -i -e 's|FFmpeg/FFmpeg|FFmpeg/FFmpeg/archive|' ../../../../scripts/android-build-ffmpeg.sh
+      - sed -i -e '/androidGitVersion {/a format "%tag%"' build.gradle
+      - sed -i -e '/<activity-alias/a android:exported="true"' {.,../freeRDPCore}/src/main/AndroidManifest.xml
+    build:
+      - cd ../../../..
+      - sdkmanager 'cmake;3.18.1' 'ndk;15.2.4203891'
+      - scripts/android-build-freerdp.sh --ndk $$NDK$$ --sdk $$SDK$$ --openh264-ndk
+        $$SDK$$/ndk/15.2.4203891 --conf scripts/android-build-release.conf
+    ndk: r25c
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.4.0
-CurrentVersionCode: 23
+CurrentVersion: 2.10.0
+CurrentVersionCode: 2010000