[Buildroot] [PATCH 0/2] package/pixman: Uprev pixman

[Buildroot] [PATCH 0/2] package/pixman: Uprev pixman

[Charlie Jenkins]

In the process of upreving pixman I realized that if the toolchain has
kernel headers that don't support vector, then pixman will fail to
compile if -Drvv=enabled is set. As a result, this series contains a
patch to uprev pixman and to fix this issue.

Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
---
Charlie Jenkins (2):
      package/pixman: Don't require vector when BR2_RISCV_ISA_RVV
      package/pixman: Uprev to 0.46.0

 ...-enable-RVV-on-linux-if-hwcap-headers-are.patch | 44 ----------------------
 package/pixman/pixman.hash                         |  4 +-
 package/pixman/pixman.mk                           |  6 +--
 3 files changed, 4 insertions(+), 50 deletions(-)
---
base-commit: 8e1ad23f2a43d860a27208c69d2e8f424324dd84
change-id: 20250430-uprev_pixman_46-2db63324f34b
-- 
- Charlie

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/2] package/pixman: Don't require vector when BR2_RISCV_ISA_RVV

[Charlie Jenkins]

If -Drvv=enabled is set but the toolchain doesn't have kernel headers
with vector support, pixman will fail with the error:

"RISC-V Vector Support unavailable, but required"

When BR2_RISCV_ISA_RVV is set, let pixman decide if it wants to use
vector instead.

Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
Fixes: 386e6bb47994 ("package/pixman: only compile with riscv vector support when selected")
---
 package/pixman/pixman.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 76e72d6d96161f9458cad71a8437e46b3fdf4d95..78ab20da5915f2b7b9d5710b46b5ca8011e32240 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -74,9 +74,7 @@ else
 PIXMAN_CONF_OPTS += -Da64-neon=disabled
 endif
 
-ifeq ($(BR2_RISCV_ISA_RVV),y)
-PIXMAN_CONF_OPTS += -Drvv=enabled
-else
+ifneq ($(BR2_RISCV_ISA_RVV),y)
 PIXMAN_CONF_OPTS += -Drvv=disabled
 endif
 

-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/pixman: Don't require vector when BR2_RISCV_ISA_RVV

[Arnout Vandecappelle via buildroot]

On 30/04/2025 21:10, Charlie Jenkins wrote:
> If -Drvv=enabled is set but the toolchain doesn't have kernel headers
> with vector support, pixman will fail with the error:
> 
> "RISC-V Vector Support unavailable, but required"
> 
> When BR2_RISCV_ISA_RVV is set, let pixman decide if it wants to use
> vector instead.
> 
> Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
> Fixes: 386e6bb47994 ("package/pixman: only compile with riscv vector support when selected")

  Applied to 2025.02.x, thanks.

  Regards,
  Arnout

> ---
>   package/pixman/pixman.mk | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
> index 76e72d6d96161f9458cad71a8437e46b3fdf4d95..78ab20da5915f2b7b9d5710b46b5ca8011e32240 100644
> --- a/package/pixman/pixman.mk
> +++ b/package/pixman/pixman.mk
> @@ -74,9 +74,7 @@ else
>   PIXMAN_CONF_OPTS += -Da64-neon=disabled
>   endif
>   
> -ifeq ($(BR2_RISCV_ISA_RVV),y)
> -PIXMAN_CONF_OPTS += -Drvv=enabled
> -else
> +ifneq ($(BR2_RISCV_ISA_RVV),y)
>   PIXMAN_CONF_OPTS += -Drvv=disabled
>   endif
>   
> 

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/pixman: Uprev to 0.46.0

[Charlie Jenkins]

Version 0.46.0 includes the patch to fix building on riscv without
vector support so drop the patch from the tree.

Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
---
 ...-enable-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(-)

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 ad1a0902e2aad712a2a6fc73650401ee8ad31f1a..0000000000000000000000000000000000000000
--- 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 <charlie@rivosinc.com>
-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 <charlie@rivosinc.com>
-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 <asm/hwcap.h>
-+      #include <sys/auxv.h>
-+      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 c49b9c9e76aa6ea2b38c94717f934a1c3fe051b7..b74f8cc64891a92c98ddd60b05478fd8be117988 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.cairographics.org/archives/cairo/2025-April/029612.html
+sha512  c7ef987b7db89c58278c537f862bc9eb17c19f8288a3b7e88f8501a0486662f1e2cb6a2c0b81d4bf0464310475192428d6e29d05a6ae3cfc1d2c0941fbb0b9a3  pixman-0.46.0.tar.xz
 
 # Locally computed
 sha256  fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793  COPYING
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 78ab20da5915f2b7b9d5710b46b5ca8011e32240..0611a0b732fabe00ea5fb454875e28d27a58eaa2 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PIXMAN_VERSION = 0.44.2
+PIXMAN_VERSION = 0.46.0
 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.xz
 PIXMAN_SITE = https://xorg.freedesktop.org/releases/individual/lib
 PIXMAN_LICENSE = MIT

-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/pixman: Uprev to 0.46.0

[Charlie Jenkins]

On Thu, May 01, 2025 at 03:09:06PM +0200, Thomas Petazzoni wrote:
> Hello Charlie,
> 
> On Wed, 30 Apr 2025 12:10:36 -0700
> Charlie Jenkins <charlie@rivosinc.com> wrote:
> 
> > Version 0.46.0 includes the patch to fix building on riscv without
> > vector support so drop the patch from the tree.
> > 
> > Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
> 
> Thanks for the patch. Just a very small nit: we normally use the word
> "bump" instead of "uprev" in Buildroot:
> 
> 605f8f54320cf098a17c4931dee47952bb57e465 package/fluidsynth: bump to version 2.4.3
> 5dab98d721e978e65afce44ee2ea92fcae2d2b67 package/libjxl: security bump to version 0.11.1
> 77674c6cfbd40e174048897255658d31e3ead15a package/go: security bump to version 1.23.7
> d577c1c339649d54b0dab41949a192006c86a3ae package/python-sqlalchemy: bump to version 2.0.38
> 84eed2762945f0287cff2cf604947b65c0408c8f package/libglib2: bump version to 2.82.5
> 5a1515b5976aed8f1b15eacf513d40ab70b908a8 package/armadillo: bump to version 14.4.0
> 6faa08a9e3f3ad170b70439a14bf8da6256f887e package/python-dbus-fast: bump to 2.33.0
> c8eb4c63a77131e83ab9fed8c9e5ba2dc76a83d9 package/postgis: bump to version 3.5.2
> 1e8955e12c10e68d9eb119ebae99692dd2432fa0 package/jbig2dec: bump to version 0.20
> bee34e7bd0954634ba3a9534104482c6dd5e6229 package/timescaledb: bump version to 2.18.2
> 0748e761e2962e085ecc266bd79bb7991ff71462 package/libmodsecurity: bump to version 3.0.13
> f683440eddca647170b310a1ed549d768a6560ae package/mongoose: bump to version 7.17
> 
> etc.
> 
> No need to resend just for that, it's really a minor nitpick.

Thank you for letting me know! I'll keep that in mind.

- Charlie

> 
> Thomas
> -- 
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot