From d06976eeb02c2fa4f28141ef3b6e92f9f499f69d Mon Sep 17 00:00:00 2001 From: Charlie Jenkins Date: Tue, 25 Nov 2025 22:28:55 +0100 Subject: [PATCH] package/pixman: bump version to 0.46.4 Version 0.46.0 includes the patch to fix building on riscv without vector support so drop the patch from the tree. Release notes: 0.46.0: https://lists.freedesktop.org/archives/pixman/2025-April/005025.html 0.46.2: https://lists.freedesktop.org/archives/pixman/2025-June/005026.html 0.46.4: https://lists.freedesktop.org/archives/pixman/2025-July/005028.html Signed-off-by: Charlie Jenkins [Bernd: bumped to version 0.46.4, added release notes] Signed-off-by: Bernd Kuhls [Julien: change mailing list links to use lists.freedesktop.org] Signed-off-by: Julien Olivain --- ...le-RVV-on-linux-if-hwcap-headers-are.patch | 44 ------------------- package/pixman/pixman.hash | 4 +- package/pixman/pixman.mk | 2 +- 3 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 package/pixman/0001-RISC-V-Only-enable-RVV-on-linux-if-hwcap-headers-are.patch diff --git a/package/pixman/0001-RISC-V-Only-enable-RVV-on-linux-if-hwcap-headers-are.patch b/package/pixman/0001-RISC-V-Only-enable-RVV-on-linux-if-hwcap-headers-are.patch deleted file mode 100644 index ad1a0902e2..0000000000 --- a/package/pixman/0001-RISC-V-Only-enable-RVV-on-linux-if-hwcap-headers-are.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d0045f1fc32635d9629ea9e361631b07d9ca4140 Mon Sep 17 00:00:00 2001 -From: Charlie Jenkins -Date: Mon, 21 Apr 2025 13:08:50 -0700 -Subject: [PATCH] RISC-V: Only enable RVV on linux if hwcap headers are - available - -Linux 6.4 introduced COMPAT_HWCAP_ISA_V. When trying to compile pixman -against linux headers older than this, pixman will fail to compile -because it assumes COMPAT_HWCAP_ISA_V exists. - -During meson configuration, do not enable have_rvv if the platform is -Linux and COMPAT_HWCAP_ISA_V doesn't exist. - -Signed-off-by: Charlie Jenkins -Fixes: 0e424031bda2 ("RISC-V floating point operations") -Upstream: https://gitlab.freedesktop.org/pixman/pixman/-/merge_requests/149 ---- - meson.build | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index fdea28f..cb10931 100644 ---- a/meson.build -+++ b/meson.build -@@ -379,7 +379,15 @@ if not use_rvv.disabled() - } - ''', - args : rvv_flags, -- name : 'RISC-V Vector Intrinsic Support') -+ name : 'RISC-V Vector Intrinsic Support') and cc.compiles(''' -+ #if defined(__linux__) -+ #include -+ #include -+ COMPAT_HWCAP_ISA_V -+ #endif -+ ''', -+ args : rvv_flags, -+ name: 'RISC-V Vector Linux HWCAP Support') - have_rvv = true - endif - endif --- -2.43.0 - diff --git a/package/pixman/pixman.hash b/package/pixman/pixman.hash index c49b9c9e76..bd386d3458 100644 --- a/package/pixman/pixman.hash +++ b/package/pixman/pixman.hash @@ -1,5 +1,5 @@ -# From https://lists.cairographics.org/archives/cairo/2024-December/029586.html -sha512 b24907f9a0bf6a9aa3278d31986c562c5f2d68f8c178021497c8648aca9f91e4c6f1ecfacf93eb01ba4f03ce4cfc5970fc40bb0fe6724bac9210fc57da09cba4 pixman-0.44.2.tar.xz +# From https://lists.freedesktop.org/archives/pixman/2025-July/005028.html +sha512 83b133e7969ba34f883f4e08dcc5d388c4397f43ce836c191c05945fe77c16ff501d531600780c12678a0d08105828a6bdeff2156b63f9c1a84087bc7f40ae9f pixman-0.46.4.tar.xz # Locally computed sha256 fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793 COPYING diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 76e72d6d96..1b66b41719 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIXMAN_VERSION = 0.44.2 +PIXMAN_VERSION = 0.46.4 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.xz PIXMAN_SITE = https://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT