external/cairo/Library_cairo.mk | 10 ++++++++++ external/cairo/StaticLibrary_pixman.mk | 19 ++++++++++++++++--- external/cairo/configs/wnt_pixman_config.h | 4 ++++ 3 files changed, 30 insertions(+), 3 deletions(-)
New commits: commit 4bb9541f18d28639298419efe34ea62782ad4266 Author: Tor Lillqvist <[email protected]> AuthorDate: Sat Nov 1 23:15:36 2025 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Tue Dec 2 10:16:52 2025 +0100 Make pixman build for Windows on ARM64 Also silence more warnings in pixman and cairo. Change-Id: Ic00c0ece203a0bdac5407f958c446ac8147093b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194597 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/external/cairo/Library_cairo.mk b/external/cairo/Library_cairo.mk index 732162c44b95..e850760ce51d 100644 --- a/external/cairo/Library_cairo.mk +++ b/external/cairo/Library_cairo.mk @@ -21,9 +21,19 @@ $(eval $(call gb_Library_set_include,cairo,\ $(eval $(call gb_Library_add_defs,cairo,\ -wd4057 \ -wd4100 \ + -wd4132 \ -wd4146 \ + -wd4200 \ + -wd4245 \ -wd4267 \ + -wd4295 \ + -wd4456 \ + -wd4701 \ -wd4702 \ + -wd4703 \ + -wd5294 \ + -wd5286 \ + -wd5287 \ )) $(eval $(call gb_Library_use_static_libraries,cairo, \ diff --git a/external/cairo/StaticLibrary_pixman.mk b/external/cairo/StaticLibrary_pixman.mk index 0272892a408a..94e998775736 100644 --- a/external/cairo/StaticLibrary_pixman.mk +++ b/external/cairo/StaticLibrary_pixman.mk @@ -21,7 +21,16 @@ $(eval $(call gb_StaticLibrary_add_defs,pixman,\ -DHAVE_CONFIG_H \ -wd4100 \ -wd4127 \ + -wd4132 \ + -wd4146 \ -wd4189 \ + -wd4245 \ + -wd4267 \ + -wd4389 \ + -wd4456 \ + -wd4457 \ + -wd4701 \ + -wd5286 \ )) $(eval $(call gb_StaticLibrary_add_generated_cobjects,pixman,\ @@ -48,15 +57,19 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,pixman,\ pixman-matrix \ pixman-mips-dspr2 \ pixman-mips \ - pixman-mmx \ + $(if $(filter-out AARCH64,$(CPUNAME)), \ + pixman-mmx \ + ) \ pixman-noop \ pixman-ppc \ pixman-radial-gradient \ pixman-region16 \ pixman-region32 \ pixman-solid-fill \ - pixman-sse2 \ - pixman-ssse3 \ + $(if $(filter-out AARCH64,$(CPUNAME)), \ + pixman-sse2 \ + pixman-ssse3 \ + ) \ pixman-timer \ pixman-trap \ pixman-utils \ diff --git a/external/cairo/configs/wnt_pixman_config.h b/external/cairo/configs/wnt_pixman_config.h index 180a8f93df15..e038a711f4d5 100644 --- a/external/cairo/configs/wnt_pixman_config.h +++ b/external/cairo/configs/wnt_pixman_config.h @@ -159,10 +159,14 @@ /* #undef USE_OPENMP */ /* use SSE2 compiler intrinsics */ +#ifndef _M_ARM64 #define USE_SSE2 1 +#endif /* use SSSE3 compiler intrinsics */ +#ifndef _M_ARM64 #define USE_SSSE3 1 +#endif /* use VMX compiler intrinsics */ /* #undef USE_VMX */
