From 7dd04e8fb2743b69a306f7db8da41fddb0a3203d Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Sat, 21 Nov 2020 22:53:53 +0100 Subject: [PATCH] freerdp: better matching for old ndk This is a nonstandard workaround in any case, let's just make it slightly less hardcoded. (required when using https://gitlab.com/fdroid/fdroidserver/-/merge_requests/762) --- metadata/com.freerdp.afreerdp.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/metadata/com.freerdp.afreerdp.yml b/metadata/com.freerdp.afreerdp.yml index 8b3e261d2f..c708d8591c 100644 --- a/metadata/com.freerdp.afreerdp.yml +++ b/metadata/com.freerdp.afreerdp.yml @@ -120,7 +120,7 @@ Builds: - pushd ../../../../scripts - export ANDROID_NDK=$$NDK$$ - export ANDROID_SDK=$$SDK$$ - - export ANDROID_NDK_OPENH264=$$NDK$$/../r15c + - 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 @@ -129,7 +129,8 @@ 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. + * 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 * Need to update NDK target to 21 for tmerfd_create * The build script argument passing is buggy, provide NDK and SDK via environment too