Merge branch 'afreerdp_2_3_2' into 'master'

Updated afreerdp to 2.3.2

See merge request fdroid/fdroiddata!8592
This commit is contained in:
relan 2021-03-23 07:03:01 +00:00
commit 8aa87052fd

View file

@ -148,6 +148,28 @@ Builds:
- popd
ndk: r21d
- versionName: 2.3.2
versionCode: 22
commit: 2.3.2
subdir: client/Android/Studio/aFreeRDP
gradle:
- yes
prebuild:
- $$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_1j/'
-e 's/WITH_OPENH264=0/WITH_OPENH264=1/' -e 's/NDK_TARGET=14/NDK_TARGET=21/'
android-build-*.conf
build:
- 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: 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.
@ -158,5 +180,5 @@ MaintainerNotes: |-
AutoUpdateMode: None
UpdateCheckMode: None
CurrentVersion: 2.3.1
CurrentVersionCode: 21
CurrentVersion: 2.3.2
CurrentVersionCode: 22