.gitlab-ci.yml | 43 +++++++++++++++++++++++++++++++++++++++++++
src/fcformat.c | 4 ++--
2 files changed, 45 insertions(+), 2 deletions(-)
New commits:
commit 643c3f1e2775d9987485a9f574c9b5c2db6ed6d7
Author: Tim-Philipp Müller <tim@xxxxxxxxxxxxxxx>
Date: Thu Dec 31 15:49:19 2020 +0000
ci: add meson android aarch64 build
Passing -Wno-pointer-bool-conversion in cross file
to suppress compiler warning:
src/fcfreetype.c:1373:11: address of array 'os2->achVendID' will always evaluate to 'true'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef49b10..651869c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -225,3 +225,46 @@ meson msys2:
- C:\msys64\usr\bin\bash -c "meson build $env:MESON_ARGS &&
ninja -C build &&
ninja -C build test"
+
+meson android arm64 fedora:
+ # See https://gitlab.freedesktop.org/gstreamer/gst-ci/container_registry/164 for current images
+ image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/android-fedora:2020-10-22.0-master'
+ stage: 'build'
+ artifacts:
+ name: "${CI_JOB_NAME}_${CI_COMMIT_SHA}"
+ expire_in: '5 days'
+ when: 'always'
+ paths:
+ - "build/meson-logs/*.txt"
+ before_script:
+ - dnf install -y python3-pip gcc ninja-build gperf
+ - pip3 install --user meson
+ script:
+ - export PATH="$HOME/.local/bin:$PATH"
+ - |
+ cat > android-cross-file.txt <<EOF
+ [constants]
+ ndk_path = '/android/ndk'
+ toolchain = ndk_path + '/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android'
+ api = '28'
+
+ [host_machine]
+ system = 'android'
+ cpu_family = 'aarch64'
+ cpu = 'aarch64'
+ endian = 'little'
+
+ [properties]
+ sys_root = ndk_path + '/sysroot'
+ c_args = ['-Wno-pointer-bool-conversion']
+ c_link_args = ['-fuse-ld=gold']
+ cpp_link_args = ['-fuse-ld=gold']
+
+ [binaries]
+ c = toolchain + api + '-clang'
+ cpp = toolchain + api + '-clang++'
+ ar = toolchain + '-ar'
+ strip = toolchain + '-strip'
+ EOF
+ - meson setup --werror --cross-file android-cross-file.txt build
+ - meson compile --verbose -C build
commit 8657c081e93245955aa637a241d94315bd39b491
Author: Tim-Philipp Müller <tim@xxxxxxxxxxxxxxx>
Date: Thu Dec 31 13:15:24 2020 +0000
fcformat: fix compiler warnings with clang on Android
fcformat.c:762:44: warning: expression which evaluates to zero treated as a null pointer constant of type 'FcChar8 *' (aka 'unsigned char *') [-Wnon-literal-null-conversion]
if (!FcNameUnparseValue (buf, &l->value, '\0'))
^~~~
fcformat.c:769:38: warning: expression which evaluates to zero treated as a null pointer constant of type 'FcChar8 *' (aka 'unsigned char *') [-Wnon-literal-null-conversion]
FcNameUnparseValueList (buf, l, '\0');
^~~~
diff --git a/src/fcformat.c b/src/fcformat.c
index c76dc5e..ae8c59c 100644
--- a/src/fcformat.c
+++ b/src/fcformat.c
@@ -759,14 +759,14 @@ interpret_simple (FcFormatContext *c,
}
if (l && idx == 0)
{
- if (!FcNameUnparseValue (buf, &l->value, '\0'))
+ if (!FcNameUnparseValue (buf, &l->value, NULL))
return FcFalse;
}
else goto notfound;
}
else if (l)
{
- FcNameUnparseValueList (buf, l, '\0');
+ FcNameUnparseValueList (buf, l, NULL);
}
else
{
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/fontconfig
