From c120f0dfad06364a0183a78cc522d26317b2b001 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Sat, 2 May 2020 08:48:54 +0200 Subject: [PATCH 1/7] Updated aFreeRDP to 2.0.0 --- metadata/com.freerdp.afreerdp.yml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/metadata/com.freerdp.afreerdp.yml b/metadata/com.freerdp.afreerdp.yml index 4d1a2dd923..aedf1fe542 100644 --- a/metadata/com.freerdp.afreerdp.yml +++ b/metadata/com.freerdp.afreerdp.yml @@ -102,7 +102,28 @@ 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: + - echo -e "RELEASE_STORE_FILE=\nRELEASE_KEY_ALIAS=" >>../gradle.properties + - cd ../../../../scripts + - sed -i -e 's/OPENSSL_TAG=OpenSSL_1_1_[0-1][a-h]/OPENSSL_TAG=OpenSSL_1_1_1g/' + -e 's/WITH_OPENH264=0/WITH_OPENH264=1/' -e 's/CMAKE_BUILD_TYPE=Debug/CMAKE_BUILD_TYPE=Release/g' + android-build-*.conf + - sed -i -e 's/make/make USE_ASM=no/' android-build-openh264.sh + 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 + AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 2.0.0-rc4 -CurrentVersionCode: 14 +CurrentVersion: 2.0.0 +CurrentVersionCode: 15 From 933fe6d6c6c2a20df38cd91d8c73672cb588946e Mon Sep 17 00:00:00 2001 From: akallabeth Date: Sat, 2 May 2020 08:55:27 +0200 Subject: [PATCH 2/7] Added maintainer notes. --- metadata/com.freerdp.afreerdp.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/metadata/com.freerdp.afreerdp.yml b/metadata/com.freerdp.afreerdp.yml index aedf1fe542..ab338aa695 100644 --- a/metadata/com.freerdp.afreerdp.yml +++ b/metadata/com.freerdp.afreerdp.yml @@ -123,6 +123,11 @@ Builds: --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. + * The build script argument passing is buggy, provide NDK and SDK via environment too + AutoUpdateMode: None UpdateCheckMode: None CurrentVersion: 2.0.0 From 3d0e5e7625f61875c806b7e69a2738f0fb26fc6c Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 8 May 2020 10:43:05 +0200 Subject: [PATCH 3/7] Updated aFreeRDP to 2.1.0 --- metadata/com.freerdp.afreerdp.yml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/metadata/com.freerdp.afreerdp.yml b/metadata/com.freerdp.afreerdp.yml index ab338aa695..b0626d3722 100644 --- a/metadata/com.freerdp.afreerdp.yml +++ b/metadata/com.freerdp.afreerdp.yml @@ -123,6 +123,27 @@ Builds: --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: + - echo -e "RELEASE_STORE_FILE=\nRELEASE_KEY_ALIAS=" >>../gradle.properties + - cd ../../../../scripts + - sed -i -e 's/OPENSSL_TAG=OpenSSL_1_1_[0-1][a-h]/OPENSSL_TAG=OpenSSL_1_1_1g/' + -e 's/WITH_OPENH264=0/WITH_OPENH264=1/' -e 's/CMAKE_BUILD_TYPE=Debug/CMAKE_BUILD_TYPE=Release/g' + android-build-*.conf + - sed -i -e 's/make/make USE_ASM=no/' android-build-openh264.sh + 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. @@ -130,5 +151,5 @@ MaintainerNotes: |- AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 2.0.0 -CurrentVersionCode: 15 +CurrentVersion: 2.1.0 +CurrentVersionCode: 16 From 8168e8f274c0e32619b59dd60f1d34a2e7479f07 Mon Sep 17 00:00:00 2001 From: Christian Plattner Date: Wed, 4 Nov 2020 15:57:30 +0100 Subject: [PATCH 4/7] Fix building FreeRDP 2.0.0 and 2.1.0 (remove incompatible OpenH264; use NDK target 21) --- metadata/com.freerdp.afreerdp.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/metadata/com.freerdp.afreerdp.yml b/metadata/com.freerdp.afreerdp.yml index b0626d3722..2a3135f7d7 100644 --- a/metadata/com.freerdp.afreerdp.yml +++ b/metadata/com.freerdp.afreerdp.yml @@ -109,12 +109,10 @@ Builds: gradle: - yes prebuild: - - echo -e "RELEASE_STORE_FILE=\nRELEASE_KEY_ALIAS=" >>../gradle.properties - cd ../../../../scripts - sed -i -e 's/OPENSSL_TAG=OpenSSL_1_1_[0-1][a-h]/OPENSSL_TAG=OpenSSL_1_1_1g/' - -e 's/WITH_OPENH264=0/WITH_OPENH264=1/' -e 's/CMAKE_BUILD_TYPE=Debug/CMAKE_BUILD_TYPE=Release/g' + -e 's/NDK_TARGET=14/NDK_TARGET=21/' android-build-*.conf - - sed -i -e 's/make/make USE_ASM=no/' android-build-openh264.sh build: - cd ../../../../scripts - ANDROID_NDK=$$NDK$$ ANDROID_SDK=$$SDK$$ ./android-build-freerdp.sh --ndk $$NDK$$ @@ -130,12 +128,10 @@ Builds: gradle: - yes prebuild: - - echo -e "RELEASE_STORE_FILE=\nRELEASE_KEY_ALIAS=" >>../gradle.properties - cd ../../../../scripts - sed -i -e 's/OPENSSL_TAG=OpenSSL_1_1_[0-1][a-h]/OPENSSL_TAG=OpenSSL_1_1_1g/' - -e 's/WITH_OPENH264=0/WITH_OPENH264=1/' -e 's/CMAKE_BUILD_TYPE=Debug/CMAKE_BUILD_TYPE=Release/g' + -e 's/NDK_TARGET=14/NDK_TARGET=21/' android-build-*.conf - - sed -i -e 's/make/make USE_ASM=no/' android-build-openh264.sh build: - cd ../../../../scripts - ANDROID_NDK=$$NDK$$ ANDROID_SDK=$$SDK$$ ./android-build-freerdp.sh --ndk $$NDK$$ @@ -147,6 +143,7 @@ Builds: 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. * The build script argument passing is buggy, provide NDK and SDK via environment too AutoUpdateMode: None From 7a82b598373301163068980c5b3a242f259ee5ff Mon Sep 17 00:00:00 2001 From: Christian Plattner Date: Tue, 10 Nov 2020 09:45:24 +0100 Subject: [PATCH 5/7] 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 From 3951799f2be48238aacc39d169dae23b0dbdac6d Mon Sep 17 00:00:00 2001 From: Christian Plattner Date: Tue, 10 Nov 2020 13:42:49 +0100 Subject: [PATCH 6/7] FreeRDP: Fix formatting issues found by fdroid linter --- metadata/com.freerdp.afreerdp.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/metadata/com.freerdp.afreerdp.yml b/metadata/com.freerdp.afreerdp.yml index 503c9884e7..9498c9a276 100644 --- a/metadata/com.freerdp.afreerdp.yml +++ b/metadata/com.freerdp.afreerdp.yml @@ -111,8 +111,7 @@ Builds: 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 + -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$$ @@ -130,8 +129,7 @@ Builds: 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 + -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$$ @@ -149,8 +147,7 @@ Builds: 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 + -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$$ @@ -168,8 +165,7 @@ Builds: 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 + -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$$ @@ -187,8 +183,7 @@ Builds: 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 + -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$$ From 84d1312fd8e2d4d13dc818661ee1bff26d1aff07 Mon Sep 17 00:00:00 2001 From: Christian Plattner Date: Thu, 12 Nov 2020 13:53:19 +0100 Subject: [PATCH 7/7] 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