Fix building FreeRDP 2.0.0 and 2.1.0 (remove incompatible OpenH264; use NDK target 21)

This commit is contained in:
Christian Plattner 2020-11-04 15:57:30 +01:00
parent 3d0e5e7625
commit 8168e8f274

View file

@ -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