From 84d1312fd8e2d4d13dc818661ee1bff26d1aff07 Mon Sep 17 00:00:00 2001
From: Christian Plattner <Christian.Plattner@interventional-systems.com>
Date: Thu, 12 Nov 2020 13:53:19 +0100
Subject: [PATCH] FreeRDP: build with OpenH264 component on compatible NDK

---
 metadata/com.freerdp.afreerdp.yml             | 94 +++----------------
 .../com.freerdp.afreerdp/openh264-ndk.patch   | 13 +++
 2 files changed, 27 insertions(+), 80 deletions(-)
 create mode 100644 metadata/com.freerdp.afreerdp/openh264-ndk.patch

diff --git a/metadata/com.freerdp.afreerdp.yml b/metadata/com.freerdp.afreerdp.yml
index 9498c9a276..8b3e261d2f 100644
--- a/metadata/com.freerdp.afreerdp.yml
+++ b/metadata/com.freerdp.afreerdp.yml
@@ -102,95 +102,29 @@ Builds:
       - ./android-build-freerdp.sh --ndk $$NDK$$ --sdk $$SDK$$ --conf android-build-64.conf
     ndk: r12b
 
-  - versionName: 2.0.0
-    versionCode: 15
-    commit: 2.0.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_1g/'
-        -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.0
-    versionCode: 16
-    commit: 2.1.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_1g/'
-        -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.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
+    patch:
+      - openh264-ndk.patch
     gradle:
       - yes
     prebuild:
-      - cd ../../../../scripts
+      - $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
+      - pushd ../../../../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
+        -e 's/WITH_OPENH264=0/WITH_OPENH264=1/' -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
+      - pushd ../../../../scripts
+      - export ANDROID_NDK=$$NDK$$
+      - export ANDROID_SDK=$$SDK$$
+      - export ANDROID_NDK_OPENH264=$$NDK$$/../r15c
+      - ./android-build-freerdp.sh --conf android-build-32.conf
+      - ./android-build-freerdp.sh --conf android-build-64.conf
+      - popd
+    ndk: r21d
 
 MaintainerNotes: |-
     * Keep OpenH264 at 1.8.0 as the newer versions have issues with reference frames and
diff --git a/metadata/com.freerdp.afreerdp/openh264-ndk.patch b/metadata/com.freerdp.afreerdp/openh264-ndk.patch
new file mode 100644
index 0000000000..8f886f7998
--- /dev/null
+++ b/metadata/com.freerdp.afreerdp/openh264-ndk.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/android-build-freerdp.sh b/scripts/android-build-freerdp.sh
+index b27fa6c9b..7c504b11e 100755
+--- a/scripts/android-build-freerdp.sh
++++ b/scripts/android-build-freerdp.sh
+@@ -111,7 +111,7 @@ do
+         then
+             common_run bash $SCRIPT_PATH/android-build-openh264.sh \
+                 --src $BUILD_SRC/openh264 --dst $BUILD_DST \
+-                --ndk $ANDROID_NDK \
++                --ndk $ANDROID_NDK_OPENH264 \
+                 --arch $ARCH \
+                 --target $NDK_TARGET \
+                 --tag $OPENH264_TAG