external/cairo/Library_cairo.mk | 8 external/cairo/StaticLibrary_pixman.mk | 2 external/cairo/UnpackedTarball_pixman.mk | 3 external/cairo/configs/wnt_cairo_config.h | 417 ++------------------- external/cairo/configs/wnt_pixman_config.h | 199 ---------- external/cairo/configs/wnt_pixman_pixman-config.h | 57 ++ external/cairo/configs/wnt_pixman_pixman-version.h | 56 ++ solenv/clang-format/excludelist | 2 8 files changed, 178 insertions(+), 566 deletions(-)
New commits: commit 4150c537e050ec69c9beef33bd8e05cbc0f4988c Author: Tor Lillqvist <[email protected]> AuthorDate: Sun Jan 11 01:17:48 2026 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Fri Feb 27 17:21:19 2026 +0100 Make cairo and pixman build on Windows again Change-Id: Icbed00952f6fcc04bd29c5946d7ea626ef5113f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196990 Reviewed-by: Tor Lillqvist <[email protected]> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200636 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/external/cairo/Library_cairo.mk b/external/cairo/Library_cairo.mk index b8e986af8e9b..c127b5ad37ec 100644 --- a/external/cairo/Library_cairo.mk +++ b/external/cairo/Library_cairo.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_add_defs,cairo,\ -wd5294 \ -wd5286 \ -wd5287 \ + -DCAIRO_COMPILATION \ )) $(eval $(call gb_Library_use_static_libraries,cairo, \ @@ -179,4 +180,11 @@ $(eval $(call gb_Library_add_generated_cobjects,cairo,\ ) \ )) +$(eval $(call gb_Library_add_generated_cobjects,cairo,\ + $(addprefix UnpackedTarball/cairo/util/, \ + cairo-missing/strndup \ + ) \ +)) + + # vim: set noet sw=4 ts=4: diff --git a/external/cairo/StaticLibrary_pixman.mk b/external/cairo/StaticLibrary_pixman.mk index 94e998775736..0503cd704fbb 100644 --- a/external/cairo/StaticLibrary_pixman.mk +++ b/external/cairo/StaticLibrary_pixman.mk @@ -65,6 +65,8 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,pixman,\ pixman-radial-gradient \ pixman-region16 \ pixman-region32 \ + pixman-region64f \ + pixman-riscv \ pixman-solid-fill \ $(if $(filter-out AARCH64,$(CPUNAME)), \ pixman-sse2 \ diff --git a/external/cairo/configs/wnt_cairo_config.h b/external/cairo/configs/wnt_cairo_config.h index 3e4c51d1cd58..56cd4d83174e 100644 --- a/external/cairo/configs/wnt_cairo_config.h +++ b/external/cairo/configs/wnt_cairo_config.h @@ -1,453 +1,140 @@ -/* config.h for Windows build of cairo, manually created from one for Linux: */ +/* config.h for Windows build of cairo, manually created from one for Linux. */ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ +/* + * *Not* autogenerated by the Meson build system. + */ -/* Define if building universal (internal helper macro) */ -/* #undef AC_APPLE_UNIVERSAL_BUILD */ +#pragma once -/* whether memory barriers are needed around atomic operations */ -/* #undef ATOMIC_OP_NEEDS_MEMORY_BARRIER */ +#undef ATOMIC_OP_NEEDS_MEMORY_BARRIER -/* Define to 1 if the PDF backend can be tested (need poppler and other - dependencies for pdf2png) */ -/* #undef CAIRO_CAN_TEST_PDF_SURFACE */ +#undef CAIRO_HAS_DLSYM -/* Define to 1 if the PS backend can be tested (needs ghostscript) */ -/* #undef CAIRO_CAN_TEST_PS_SURFACE */ +#undef CAIRO_HAS_INTERPRETER -/* Define to 1 if the SVG backend can be tested */ -/* #undef CAIRO_CAN_TEST_SVG_SURFACE */ +#undef CAIRO_HAS_PTHREAD -/* Define to 1 if the Win32 Printing backend can be tested (needs ghostscript) - */ -/* #undef CAIRO_CAN_TEST_WIN32_PRINTING_SURFACE */ +#undef CAIRO_HAS_REAL_PTHREAD -/* Define to 1 if dlsym is available */ -/* #undef CAIRO_HAS_DLSYM */ +#undef CAIRO_HAS_TRACE -/* Define to 1 to enable cairo's cairo-script-interpreter feature */ -/* #undef CAIRO_HAS_INTERPRETER */ - -/* Define to 1 to enable cairo's pthread feature */ -/* #undef CAIRO_HAS_PTHREAD */ - -/* Define to 1 if we have full pthread support */ -/* #undef CAIRO_HAS_REAL_PTHREAD */ - -/* Define to 1 if libspectre is available */ -/* #undef CAIRO_HAS_SPECTRE */ - -/* Define to 1 to enable cairo's symbol-lookup feature */ -/* #undef CAIRO_HAS_SYMBOL_LOOKUP */ - -/* Define to 1 to enable cairo's test surfaces feature */ -/* #undef CAIRO_HAS_TEST_SURFACES */ - -/* Define to 1 to enable cairo's cairo-trace feature */ -/* #undef CAIRO_HAS_TRACE */ - -/* Define to 1 to disable certain code paths that rely heavily on double - precision floating-point calculation */ -/* #undef DISABLE_SOME_FLOATING_POINT */ - -/* Define to 1 if your system stores words within floats with the most - significant word first */ -/* #undef FLOAT_WORDS_BIGENDIAN */ - -/* Define to (0) if freetype2 does not support color fonts */ -/* #undef FT_HAS_COLOR */ - -/* Enable pixman glyph cache */ #define HAS_PIXMAN_GLYPHS 1 -/* Define to 1 if you have the `alarm' function. */ -/* #undef HAVE_ALARM */ +#undef HAS_PIXMAN_r8g8b8_sRGB -/* Define to 1 if you have the binutils development files installed */ -/* #undef HAVE_BFD */ +#undef HAVE_ALARM -/* Define to 1 if your compiler supports the __builtin_return_address() - intrinsic. */ -/* #undef HAVE_BUILTIN_RETURN_ADDRESS */ +#undef HAVE_ALLOCA_H -/* Define to 1 if you have the <byteswap.h> header file. */ -/* #undef HAVE_BYTESWAP_H */ +#undef HAVE_BYTESWAP_H -/* Define to 1 if you have the `clock_gettime' function. */ -/* #undef HAVE_CLOCK_GETTIME */ +#undef HAVE_C11_ATOMIC_PRIMITIVES -/* Define to 1 if you have the `ctime_r' function. */ -/* #undef HAVE_CTIME_R */ +#undef HAVE_CLOCK_GETTIME -/* Enable if your compiler supports the GCC __atomic_* atomic primitives */ -/* #undef HAVE_CXX11_ATOMIC_PRIMITIVES */ +#undef HAVE_CTIME_R -/* Define to 1 if you have the <dlfcn.h> header file. */ -/* #undef HAVE_DLFCN_H */ +#undef HAVE_DRAND48 -/* Define to 1 if you have the `drand48' function. */ -/* #undef HAVE_DRAND48 */ - -/* Define to 1 if you have the `FcFini' function. */ #define HAVE_FCFINI 1 -/* Define to 1 if you have the `FcInit' function. */ #define HAVE_FCINIT 1 -/* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 -/* Define to 1 if you have the `feclearexcept' function. */ #define HAVE_FECLEAREXCEPT 1 -/* Define to 1 if you have the `fedisableexcept' function. */ #define HAVE_FEDISABLEEXCEPT 1 -/* Define to 1 if you have the `feenableexcept' function. */ #define HAVE_FEENABLEEXCEPT 1 -/* Define to 1 if you have the <fenv.h> header file. */ #define HAVE_FENV_H 1 -/* Define to 1 if you have the `flockfile' function. */ -/* #undef HAVE_FLOCKFILE */ - -/* Define to 1 if you have the `fork' function. */ -/* #undef HAVE_FORK */ - -/* Define to 1 if you have the `FT_Done_MM_Var' function. */ -#define HAVE_FT_DONE_MM_VAR 1 +#undef HAVE_FLOCKFILE -/* Define to 1 if you have the `FT_Get_Var_Design_Coordinates' function. */ -#define HAVE_FT_GET_VAR_DESIGN_COORDINATES 1 +#undef HAVE_FORK -/* Define to 1 if you have the `FT_Get_X11_Font_Format' function. */ -#define HAVE_FT_GET_X11_FONT_FORMAT 1 +#undef HAVE_FT_COLR_V1 -/* Define to 1 if you have the `FT_GlyphSlot_Embolden' function. */ -#define HAVE_FT_GLYPHSLOT_EMBOLDEN 1 +#undef HAVE_FT_LOAD_NO_SVG -/* Define to 1 if you have the `FT_GlyphSlot_Oblique' function. */ -#define HAVE_FT_GLYPHSLOT_OBLIQUE 1 +#undef HAVE_FT_SVG_DOCUMENT -/* Define to 1 if you have the `FT_Library_SetLcdFilter' function. */ -#define HAVE_FT_LIBRARY_SETLCDFILTER 1 +#undef HAVE_FUNLOCKFILE -/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */ -#define HAVE_FT_LOAD_SFNT_TABLE 1 +#undef HAVE_GETLINE -/* Define to 1 if you have the `FT_Palette_Set_Foreground_Color' function. */ -#define HAVE_FT_PALETTE_SET_FOREGROUND_COLOR 1 +#undef HAVE_GMTIME_R -/* Define to 1 if you have the `funlockfile' function. */ -/* #undef HAVE_FUNLOCKFILE */ +#define HAVE_INTTYPES_H 1 -/* Enable if your compiler supports the legacy GCC __sync_* atomic primitives - */ -/* #undef HAVE_GCC_LEGACY_ATOMICS */ +#undef HAVE_LIBGEN_H -/* Whether you have gcov */ -/* #undef HAVE_GCOV */ +#undef HAVE_LINK -/* Define to 1 if you have the `getline' function. */ -#define HAVE_GETLINE 1 +#undef HAVE_LOCALTIME_R -/* Define to 1 if you have the `gmtime_r' function. */ -/* #undef HAVE_GMTIME_R */ - -/* Define to 1 if you have the <inttypes.h> header file. */ -/* #undef HAVE_INTTYPES_H */ - -/* Define to 1 if you have the <io.h> header file. */ -/* #undef HAVE_IO_H */ - -/* Define to 1 if you have the <libgen.h> header file. */ -/* #undef HAVE_LIBGEN_H */ - -/* Define to 1 if you have the `rt' library (-lrt). */ -/* #undef HAVE_LIBRT */ - -/* Enable if you have libatomic-ops-dev installed */ -/* #undef HAVE_LIB_ATOMIC_OPS */ - -/* Define to 1 if you have the `link' function. */ -/* #undef HAVE_LINK */ - -/* Define to 1 if you have the `localtime_r' function. */ -/* #undef HAVE_LOCALTIME_R */ - -/* Define to 1 if you have the Valgrind lockdep tool */ -/* #undef HAVE_LOCKDEP */ - -/* Define to 1 if you have lzo available */ -/* #undef HAVE_LZO */ - -/* Define to 1 if you have the Valgrind memfault tool */ -/* #undef HAVE_MEMFAULT */ - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to non-zero if your system has mkdir, and to 2 if your version of - mkdir requires a mode parameter */ #define HAVE_MKDIR 2 -/* Define to 1 if you have the `mmap' function. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `newlocale' function. */ - /* #undef HAVE_NEWLOCALE */ +#undef HAVE_MMAP -/* Enable if you have MacOS X atomic operations */ -/* #undef HAVE_OS_ATOMIC_OPS */ +#undef HAVE_NEWLOCALE -/* Define to 1 if you have the <poll.h> header file. */ -/* #undef HAVE_POLL_H */ +#undef HAVE_POLL_H -/* Define to 1 if you have the `poppler_page_render' function. */ -/* #undef HAVE_POPPLER_PAGE_RENDER */ - -/* Define to 1 if you have the `raise' function. */ #define HAVE_RAISE 1 -/* Define to 1 if you have the `rsvg_pixbuf_from_file' function. */ -/* #undef HAVE_RSVG_PIXBUF_FROM_FILE */ - -/* Define to 1 if you have the `sched_getaffinity' function. */ -/* #undef HAVE_SCHED_GETAFFINITY */ - -/* Define to 1 if you have the <sched.h> header file. */ -/* #undef HAVE_SCHED_H */ - -/* Define to 1 if you have the <setjmp.h> header file. */ -#define HAVE_SETJMP_H 1 +#undef HAVE_SCHED_GETAFFINITY -/* Define to 1 if you have the <signal.h> header file. */ -#define HAVE_SIGNAL_H 1 +#undef HAVE_SCHED_H -/* Define to 1 if you have the <stdint.h> header file. */ -/* MSC does have <stdint.h> but cairo seems to compile better without it */ -/* #undef HAVE_STDINT_H */ +#undef HAVE_SETJMP_H -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 +#undef HAVE_SIGNAL_H -/* Define to 1 if you have the <strings.h> header file. */ -/* #undef HAVE_STRINGS_H */ +#define HAVE_STDINT_H 1 -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 +#undef HAVE_STRND -/* Define to 1 if you have the `strndup' function. */ -#define HAVE_STRNDUP 1 +#undef HAVE_STRTOD_L -/* Define to 1 if you have the `strtod_l' function. */ -/* #undef HAVE_STRTOD_L */ +#undef HAVE_SYS_IOCTL_H -/* Define to 1 if you have the <sys/int_types.h> header file. */ -/* #undef HAVE_SYS_INT_TYPES_H */ +#undef HAVE_SYS_MMAN_H -/* Define to 1 if you have the <sys/ioctl.h> header file. */ -/* #undef HAVE_SYS_IOCTL_H */ +#undef HAVE_SYS_POLL_H -/* Define to 1 if you have the <sys/mman.h> header file. */ -/* #undef HAVE_SYS_MMAN_H */ +#undef HAVE_SYS_SOCKET_H -/* Define to 1 if you have the <sys/poll.h> header file. */ -/* #undef HAVE_SYS_POLL_H */ - -/* Define to 1 if you have the <sys/socket.h> header file. */ -/* #undef HAVE_SYS_SOCKET_H */ - -/* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 -/* Define to 1 if you have the <sys/types.h> header file. */ -/* #undef HAVE_SYS_TYPES_H */ +#undef HAVE_SYS_UN_H -/* Define to 1 if you have the <sys/un.h> header file. */ -/* #undef HAVE_SYS_UN_H */ +#undef HAVE_SYS_WAIT_H -/* Define to 1 if you have the <sys/wait.h> header file. */ -/* #undef HAVE_SYS_WAIT_H */ +#undef HAVE_TERMIOS_H -/* Define to 1 if you have the <time.h> header file. */ #define HAVE_TIME_H 1 -/* Define to 1 if typeof works with your compiler. */ -#define HAVE_TYPEOF 1 - -/* Define to 1 if the system has the type `uint128_t'. */ -/* #undef HAVE_UINT128_T */ - -/* Define to 1 if the system has the type `uint64_t'. */ -/* #undef HAVE_UINT64_T */ - -/* Define to 1 if you have the <unistd.h> header file. */ -/* #undef HAVE_UNISTD_H */ - -/* Define to 1 if you have Valgrind */ -/* #undef HAVE_VALGRIND */ - -/* Define to 1 if you have the `waitpid' function. */ -/* #undef HAVE_WAITPID */ - -/* Define to 1 if you have the <X11/extensions/shmproto.h> header file. */ -/* #undef HAVE_X11_EXTENSIONS_SHMPROTO_H */ - -/* Define to 1 if you have the <X11/extensions/shmstr.h> header file. */ -/* #undef HAVE_X11_EXTENSIONS_SHMSTR_H */ +#define HAVE_UINT64_T 1 -/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */ -/* #undef HAVE_X11_EXTENSIONS_XSHM_H */ +#undef HAVE_UNISTD_H -/* Define to 1 if you have the <xlocale.h> header file. */ -/* #undef HAVE_XLOCALE_H */ +#undef HAVE_WAITPID -/* Define to 1 if you have the `XRenderCreateConicalGradient' function. */ -/* #undef HAVE_XRENDERCREATECONICALGRADIENT */ - -/* Define to 1 if you have the `XRenderCreateLinearGradient' function. */ -/* #undef HAVE_XRENDERCREATELINEARGRADIENT */ - -/* Define to 1 if you have the `XRenderCreateRadialGradient' function. */ -/* #undef HAVE_XRENDERCREATERADIALGRADIENT */ - -/* Define to 1 if you have the `XRenderCreateSolidFill' function. */ -/* #undef HAVE_XRENDERCREATESOLIDFILL Ä/ - -/* Define to 1 if you have zlib available */ #define HAVE_ZLIB 1 -/* Define to 1 if the system has the type `__uint128_t'. */ -/* #undef HAVE___UINT128_T */ - -/* Define to 1 if shared memory segments are released deferred. */ -/* #undef IPC_RMID_DEFERRED_RELEASE */ - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "https://gitlab.freedesktop.org/cairo/cairo/-/issues"; - -/* Define to the full name of this package. */ -#define PACKAGE_NAME USE_cairo_INSTEAD - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING USE_cairo_version_OR_cairo_version_string_INSTEAD - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME USE_cairo_INSTEAD - -/* Define to the home page for this package. */ -#define PACKAGE_URL "https://cairographics.org/"; - -/* Define to the version of this package. */ -#define PACKAGE_VERSION USE_cairo_version_OR_cairo_version_string_INSTEAD - -/* Shared library file extension */ -#define SHARED_LIB_EXT "dll" +#undef HAVE___UINT128_T -/* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 -/* The size of `long', as computed by sizeof. */ #define SIZEOF_LONG 4 -/* The size of `long long', as computed by sizeof. */ #define SIZEOF_LONG_LONG 8 -/* The size of `size_t', as computed by sizeof. */ #define SIZEOF_SIZE_T 8 -/* The size of `void *', as computed by sizeof. */ #define SIZEOF_VOID_P 8 -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# define _ALL_SOURCE 1 -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# define _POSIX_PTHREAD_SEMANTICS 1 -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# define _TANDEM_SOURCE 1 -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif - - -/* Define to the value your compiler uses to support the warn-unused-result - attribute */ #define WARN_UNUSED_RESULT __attribute__((__warn_unused_result__)) -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif -#endif - - -/* Deal with multiple architecture compiles on Mac OS X */ -#ifdef __APPLE_CC__ -#ifdef __BIG_ENDIAN__ -#define WORDS_BIGENDIAN 1 -#define FLOAT_WORDS_BIGENDIAN 1 -#else -/* #undef WORDS_BIGENDIAN */ -/* #undef FLOAT_WORDS_BIGENDIAN */ -#endif -#endif - - -/* Define to 1 if the X Window System is missing or not being used. */ -/* #undef X_DISPLAY_MISSING */ - -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to 1 if on MINIX. */ -/* #undef _MINIX */ - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -/* #undef _POSIX_SOURCE */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Define to __typeof__ if your compiler spells it that way. */ -/* #undef typeof */ commit 052c9b7e5dcb727753dbe5dc17cc5e1a8acb6134 Author: Tor Lillqvist <[email protected]> AuthorDate: Sun Jan 11 00:40:12 2026 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Fri Feb 27 17:21:05 2026 +0100 Update the Windows build of cairo for pixman 0.46.4 (for CODA-W) Change-Id: I03f1010c0f15e9cc226c02daa529cec30888d5de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196988 Reviewed-by: Tor Lillqvist <[email protected]> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200635 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/external/cairo/UnpackedTarball_pixman.mk b/external/cairo/UnpackedTarball_pixman.mk index f08f793f8a97..e31c5cecbc30 100644 --- a/external/cairo/UnpackedTarball_pixman.mk +++ b/external/cairo/UnpackedTarball_pixman.mk @@ -12,7 +12,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,pixman)) $(eval $(call gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL),,cairo)) ifeq ($(OS)-$(ENABLE_HEADLESS),WNT-TRUE) -$(eval $(call gb_UnpackedTarball_add_file,pixman,config.h,external/cairo/configs/wnt_pixman_config.h)) +$(eval $(call gb_UnpackedTarball_add_file,pixman,pixman/pixman-config.h,external/cairo/configs/wnt_pixman_pixman-config.h)) +$(eval $(call gb_UnpackedTarball_add_file,pixman,pixman/pixman-version.h,external/cairo/configs/wnt_pixman_pixman-version.h)) endif $(eval $(call gb_UnpackedTarball_set_patchlevel,pixman,2)) diff --git a/external/cairo/configs/wnt_pixman_config.h b/external/cairo/configs/wnt_pixman_config.h deleted file mode 100644 index e038a711f4d5..000000000000 --- a/external/cairo/configs/wnt_pixman_config.h +++ /dev/null @@ -1,199 +0,0 @@ -/* config.h for Windows build of pixman, manually created from one for Linux: */ - -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if building universal (internal helper macro) */ -/* #undef AC_APPLE_UNIVERSAL_BUILD */ - -/* Whether we have alarm() */ -/* #undef HAVE_ALARM */ - -/* Whether the compiler supports __builtin_clz */ -/* #undef HAVE_BUILTIN_CLZ */ - -/* Define to 1 if you have the <dlfcn.h> header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Whether we have FE_DIVBYZERO */ -/* #undef HAVE_FEDIVBYZERO */ - -/* Whether we have feenableexcept() */ -/* #undef HAVE_FEENABLEEXCEPT */ - -/* Define to 1 if we have <fenv.h> */ -/* #undef HAVE_FENV_H 1 - -/* Whether the tool chain supports __float128 */ -/* #undef HAVE_FLOAT128 */ - -/* Whether the compiler supports GCC vector extensions */ -/* #undef HAVE_GCC_VECTOR_EXTENSIONS */ - -/* Define to 1 if you have the `getisax' function. */ -/* #undef HAVE_GETISAX */ - -/* Whether we have getpagesize() */ -/* #undef HAVE_GETPAGESIZE */ - -/* Whether we have gettimeofday() */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `pixman-1' library (-lpixman-1). */ -/* #undef HAVE_LIBPIXMAN_1 */ - -/* Whether we have libpng */ -/* #undef HAVE_LIBPNG */ - -/* Whether we have mmap() */ -/* #undef HAVE_MMAP */ - -/* Whether we have mprotect() */ -/* #undef HAVE_MPROTECT */ - -/* Whether we have posix_memalign() */ -/* #undef HAVE_POSIX_MEMALIGN */ - -/* Whether pthreads is supported */ -/* #undef HAVE_PTHREADS */ - -/* Whether we have sigaction() */ -/* #undef HAVE_SIGACTION */ - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdio.h> header file. */ -#define HAVE_STDIO_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the <strings.h> header file. */ -/* #undef HAVE_STRINGS_H */ - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if we have <sys/mman.h> */ -/* #undef HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -/* #undef HAVE_SYS_TYPES_H */ - -/* Define to 1 if you have the <unistd.h> header file. */ -/* #undef HAVE_UNISTD_H */ - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "pixman" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "[email protected]" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "pixman" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pixman 0.42.2" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "pixman" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "0.42.2" - -/* enable output that can be piped to gnuplot */ -/* #undef PIXMAN_GNUPLOT */ - -/* enable TIMER_BEGIN/TIMER_END macros */ -/* #undef PIXMAN_TIMERS */ - -/* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 - -/* Define to 1 if all of the C90 standard headers exist (not just the ones - required in a freestanding environment). This macro is provided for - backward compatibility; new code need not use it. */ -#define STDC_HEADERS 1 - -/* The compiler supported TLS storage class */ -#define TLS __declspec(thread) - -/* Whether the tool chain supports __attribute__((constructor)) */ -/* #undef TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR */ - -/* use ARM A64_NEON assembly optimizations */ -/* #undef USE_ARM_A64_NEON */ - -/* use ARM IWMMXT compiler intrinsics */ -/* #undef USE_ARM_IWMMXT */ - -/* use ARM NEON assembly optimizations */ -/* #undef USE_ARM_NEON */ - -/* use ARM SIMD assembly optimizations */ -/* #undef USE_ARM_SIMD */ - -/* use GNU-style inline assembler */ -/* #undef USE_GCC_INLINE_ASM */ - -/* use Loongson Multimedia Instructions */ -/* #undef USE_LOONGSON_MMI */ - -/* use MIPS DSPr2 assembly optimizations */ -/* #undef USE_MIPS_DSPR2 */ - -/* use OpenMP in the test suite */ -/* #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 */ - -/* use x86 MMX compiler intrinsics */ -/* #undef USE_X86_MMX */ - -/* Version number of package */ -#define VERSION "0.42.2" - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif -#endif - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Define to sqrt if you do not have the `sqrtf' function. */ -/* #undef sqrtf */ diff --git a/external/cairo/configs/wnt_pixman_pixman-config.h b/external/cairo/configs/wnt_pixman_pixman-config.h new file mode 100644 index 000000000000..bbd58e37f8a9 --- /dev/null +++ b/external/cairo/configs/wnt_pixman_pixman-config.h @@ -0,0 +1,57 @@ +/* pixman-config.h for Windows build of pixman, manually created from one for Linux */ + +/* + * *Not* autogenerated by the Meson build system. + */ + +#pragma once + +#undef ASM_HAVE_FUNC_DIRECTIVE + +#undef HAVE_ALARM + +#undef HAVE_BUILTIN_CLZ + +#undef HAVE_FEDIVBYZERO + +#undef HAVE_FEENABLEEXCEPT + +#undef HAVE_FENV_H + +#undef HAVE_GCC_VECTOR_EXTENSIONS + +#undef HAVE_GETPAGESIZE + +#undef HAVE_GETTIMEOFDAY + +#undef HAVE_LIBPNG /* We have it but not sure whether we would want to use it */ + +#undef HAVE_MMAP + +#undef HAVE_MPROTECT + +#undef HAVE_POSIX_MEMALIGN + +#undef HAVE_PTHREADS + +#undef HAVE_SIGACTION + +#undef HAVE_SYS_MMAN_H + +#undef HAVE_UNISTD_H + +#define PACKAGE "pixman" + +#define SIZEOF_LONG 4 + +#define TLS __declspec(thread) + +#undef TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR + +#undef TOOLCHAIN_SUPPORTS_ATTRIBUTE_DESTRUCTOR + +#undef USE_ARM_A64_NEON + +#undef USE_GCC_INLINE_ASM + +#undef USE_OPENMP diff --git a/external/cairo/configs/wnt_pixman_pixman-version.h b/external/cairo/configs/wnt_pixman_pixman-version.h new file mode 100644 index 000000000000..38dc38b18fab --- /dev/null +++ b/external/cairo/configs/wnt_pixman_pixman-version.h @@ -0,0 +1,56 @@ +/* pixman-version.h for Windows build of pixman, manually created from one for Linux */ + +/* + * Copyright © 2008 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Author: Carl D. Worth <[email protected]> + */ + +#ifndef PIXMAN_VERSION_H__ +#define PIXMAN_VERSION_H__ + +#ifndef PIXMAN_H__ +# error pixman-version.h should only be included by pixman.h +#endif + +#define PIXMAN_VERSION_MAJOR 0 +#define PIXMAN_VERSION_MINOR 46 +#define PIXMAN_VERSION_MICRO 4 + +#define PIXMAN_VERSION_STRING "0.46.4" + +#define PIXMAN_VERSION_ENCODE(major, minor, micro) ( \ + ((major) * 10000) \ + + ((minor) * 100) \ + + ((micro) * 1)) + +#define PIXMAN_VERSION PIXMAN_VERSION_ENCODE( \ + PIXMAN_VERSION_MAJOR, \ + PIXMAN_VERSION_MINOR, \ + PIXMAN_VERSION_MICRO) + +#ifndef PIXMAN_API +# define PIXMAN_API +#endif + +#endif /* PIXMAN_VERSION_H__ */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 3f26f1ae234e..5f4b9b48e8c3 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -3651,7 +3651,7 @@ extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h external/bluez_bluetooth/inc/bluetooth/bluetooth.h external/cairo/configs/wnt_cairo_config.h external/cairo/configs/wnt_cairo_features.h -external/cairo/configs/wnt_pixman_config.h +external/cairo/configs/wnt_pixman_pixman-version.h external/clew/source/clew.c external/clew/source/include/clew/clew.h external/clucene/configs/_clucene-config-LINUX.h
