From 5bf77af50b44bd082527a1f8a5342fe5235bcb15 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Mon, 17 Mar 2025 18:04:43 +0000 Subject: [PATCH 1/5] Update pixman for llvm assembly fixes --- .../pixman/{config.h => pixman-config.h} | 41 ------------------- .../lib/custom/pixman/pixman/pixman-version.h | 6 +-- project/lib/pixman | 2 +- project/lib/pixman-files.xml | 1 + 4 files changed, 5 insertions(+), 45 deletions(-) rename project/lib/custom/pixman/{config.h => pixman-config.h} (86%) diff --git a/project/lib/custom/pixman/config.h b/project/lib/custom/pixman/pixman-config.h similarity index 86% rename from project/lib/custom/pixman/config.h rename to project/lib/custom/pixman/pixman-config.h index c2829330bd..7d51030c71 100644 --- a/project/lib/custom/pixman/config.h +++ b/project/lib/custom/pixman/pixman-config.h @@ -15,9 +15,6 @@ 3. Update the version number(s) if they've changed. **/ -/* Define if building universal (internal helper macro) */ -/* #undef AC_APPLE_UNIVERSAL_BUILD */ - /* Whether we have alarm() */ #ifdef HX_LINUX #define HAVE_ALARM 1 @@ -32,13 +29,6 @@ /* #undef HAVE_BUILTIN_CLZ */ #endif -/* Define to 1 if you have the header file. */ -#ifndef HX_WINDOWS -#define HAVE_DLFCN_H 1 -#else -/* #undef HAVE_DLFCN_H */ -#endif - /* Whether we have FE_DIVBYZERO */ #ifdef HX_LINUX #define HAVE_FEDIVBYZERO 1 @@ -108,13 +98,6 @@ /* #undef HAVE_LIBPNG */ #endif -/* Define to 1 if you have the header file. */ -#ifdef HX_LINUX -#define HAVE_MEMORY_H 1 -#else -/* #undef HAVE_MEMORY_H */ -#endif - /* Whether we have mmap() */ #ifdef HX_LINUX #define HAVE_MMAP 1 @@ -200,24 +183,6 @@ /* Name of package */ #define PACKAGE "pixman" -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "pixman@lists.freedesktop.org" - -/* 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 */ @@ -316,9 +281,6 @@ /* #undef USE_X86_MMX */ #endif -/* 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 @@ -336,6 +298,3 @@ #ifndef __cplusplus /* #undef inline */ #endif - -/* Define to sqrt if you do not have the `sqrtf' function. */ -/* #undef sqrtf */ diff --git a/project/lib/custom/pixman/pixman/pixman-version.h b/project/lib/custom/pixman/pixman/pixman-version.h index 23d30b5500..5767975fcd 100644 --- a/project/lib/custom/pixman/pixman/pixman-version.h +++ b/project/lib/custom/pixman/pixman/pixman-version.h @@ -32,10 +32,10 @@ #endif #define PIXMAN_VERSION_MAJOR 0 -#define PIXMAN_VERSION_MINOR 40 -#define PIXMAN_VERSION_MICRO 1 +#define PIXMAN_VERSION_MINOR 44 +#define PIXMAN_VERSION_MICRO 2 -#define PIXMAN_VERSION_STRING "0.40.1" +#define PIXMAN_VERSION_STRING "0.44.2" #define PIXMAN_VERSION_ENCODE(major, minor, micro) ( \ ((major) * 10000) \ diff --git a/project/lib/pixman b/project/lib/pixman index 37216a3283..46655e1567 160000 --- a/project/lib/pixman +++ b/project/lib/pixman @@ -1 +1 @@ -Subproject commit 37216a32839f59e8dcaa4c3951b3fcfc3f07852c +Subproject commit 46655e15671e1ca62d699821d75a85d341d7229c diff --git a/project/lib/pixman-files.xml b/project/lib/pixman-files.xml index 01fb83b21b..60948bad98 100644 --- a/project/lib/pixman-files.xml +++ b/project/lib/pixman-files.xml @@ -70,6 +70,7 @@ + From 246d14768019b322fa616499f47770f190c59db8 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Mon, 17 Mar 2025 18:09:46 +0000 Subject: [PATCH 2/5] Reenable pixman neon support for 32 bit arm Latest version of pixman has fixed support for compiling the neon assembly files with clang --- project/lib/pixman-files.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/project/lib/pixman-files.xml b/project/lib/pixman-files.xml index 60948bad98..399299d094 100644 --- a/project/lib/pixman-files.xml +++ b/project/lib/pixman-files.xml @@ -3,12 +3,10 @@ - + - - From 5109ef6ac640401612b34a785690ef2df5c89159 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Mon, 17 Mar 2025 19:00:21 +0000 Subject: [PATCH 3/5] Fix pixman config for gcc android ndks GCC does not have syntax unified set explicitly, so pixman has to be able to set it. --- project/lib/custom/pixman/pixman-config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/project/lib/custom/pixman/pixman-config.h b/project/lib/custom/pixman/pixman-config.h index 7d51030c71..2cf46bb14b 100644 --- a/project/lib/custom/pixman/pixman-config.h +++ b/project/lib/custom/pixman/pixman-config.h @@ -217,6 +217,8 @@ /* #undef TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR */ #endif +#define ASM_HAVE_SYNTAX_UNIFIED + /* use ARM A64_NEON assembly optimizations */ /* #undef USE_ARM_A64_NEON */ From 62e1b34e1a9a326ab010e20b2c2b8bbef77260f6 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Mon, 17 Mar 2025 19:25:40 +0000 Subject: [PATCH 4/5] Enable pixman neon support for arm64 --- project/lib/pixman-files.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/project/lib/pixman-files.xml b/project/lib/pixman-files.xml index 399299d094..5bf565e6e2 100644 --- a/project/lib/pixman-files.xml +++ b/project/lib/pixman-files.xml @@ -1,10 +1,11 @@ - - + + + @@ -17,6 +18,7 @@ + @@ -34,7 +36,9 @@ - + + + From 65f45491e4c9e94ed2bc2ed7eae2bf78ad84a4cd Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Thu, 27 Mar 2025 17:01:20 +0000 Subject: [PATCH 5/5] Avoid disable pixman neon support for older ndks Some older clang ndk's integrated assemblers have issues still with the arm64 assembly files. We can just continue disabling the integrated assembler there. The assembly is fine with the integrated assembler on versions r20 and above. --- project/lib/pixman-files.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/project/lib/pixman-files.xml b/project/lib/pixman-files.xml index 5bf565e6e2..cd2e6c3373 100644 --- a/project/lib/pixman-files.xml +++ b/project/lib/pixman-files.xml @@ -3,11 +3,12 @@ - - + + +