Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Aug 2024 16:28:01 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: bfb6302d16b9 - main - graphics/mesa-devel: unbreak build on amd64 after ee821cbdc6f2
Message-ID:  <202408201628.47KGS1R3029944@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bfb6302d16b91ba5892d730a1de9045d5f66f138

commit bfb6302d16b91ba5892d730a1de9045d5f66f138
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-08-20 16:07:01 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-08-20 16:26:23 +0000

    graphics/mesa-devel: unbreak build on amd64 after ee821cbdc6f2
    
    error[E0080]: evaluation of constant value failed
        --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:7018:31
         |
    7018 |     ["Alignment of cl_char8"][::std::mem::align_of::<cl_char8>() - 8usize];
         |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
        --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:7165:10
         |
    7165 |         [::std::mem::align_of::<cl_char16__bindgen_ty_3>() - 8usize];
         |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
        --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:7443:32
         |
    7443 |     ["Alignment of cl_uchar8"][::std::mem::align_of::<cl_uchar8>() - 8usize];
         |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
        --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:7593:10
         |
    7593 |         [::std::mem::align_of::<cl_uchar16__bindgen_ty_3>() - 8usize];
         |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
        --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:7769:32
         |
    7769 |     ["Alignment of cl_short4"][::std::mem::align_of::<cl_short4>() - 8usize];
         |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
        --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:7857:10
         |
    7857 |         [::std::mem::align_of::<cl_short8__bindgen_ty_3>() - 8usize];
         |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
        --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:8208:33
         |
    8208 |     ["Alignment of cl_ushort4"][::std::mem::align_of::<cl_ushort4>() - 8usize];
         |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
        --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:8299:10
         |
    8299 |         [::std::mem::align_of::<cl_ushort8__bindgen_ty_3>() - 8usize];
         |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
        --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:8976:30
         |
    8976 |     ["Alignment of cl_int2"][::std::mem::align_of::<cl_int2>() - 8usize];
         |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
        --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:9051:10
         |
    9051 |         [::std::mem::align_of::<cl_int4__bindgen_ty_3>() - 8usize];
         |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
        --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:9411:31
         |
    9411 |     ["Alignment of cl_uint2"][::std::mem::align_of::<cl_uint2>() - 8usize];
         |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
        --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:9486:10
         |
    9486 |         [::std::mem::align_of::<cl_uint4__bindgen_ty_3>() - 8usize];
         |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
         --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:10714:32
          |
    10714 |     ["Alignment of cl_float2"][::std::mem::align_of::<cl_float2>() - 8usize];
          |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error[E0080]: evaluation of constant value failed
         --> src/gallium/frontends/rusticl/rusticl_opencl_bindings.rs:10789:10
          |
    10789 |         [::std::mem::align_of::<cl_float4__bindgen_ty_3>() - 8usize];
          |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `4_usize - 8_usize`, which would overflow
    
    error: aborting due to 14 previous errors
    
    Reported by:    pkg-fallout
---
 graphics/mesa-devel/Makefile | 2 ++
 graphics/mesa-devel/distinfo | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 3fa4e0cd5b15..b2dad1f93dc9 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mesa
 DISTVERSION=	24.1-branchpoint-3782
 DISTVERSIONSUFFIX=	-gc8d64860ec7
+PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
@@ -9,6 +10,7 @@ PATCHFILES+=	700efacda59c.patch:-p1:github
 PATCH_SITES+=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
 PATCHFILES+=	2930dcbb3329.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22246
 PATCHFILES+=	11aaf934112c.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22941
+PATCHFILES+=	93e96da9458c.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30710
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Bleeding edge Mesa drivers (OpenCL, OpenGL, Vulkan)
diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo
index a691922f7ef4..2db3c348a05e 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -7,3 +7,5 @@ SHA256 (2930dcbb3329.patch) = f90ab77950ba1a56d165f0bc8a3cbd9c5f624bb5c67d1c7f33
 SIZE (2930dcbb3329.patch) = 1638
 SHA256 (11aaf934112c.patch) = 4408d8c0c4bf559ddf32ddbd06766f4fd28cc30b199a1991b20c89cf99bb9121
 SIZE (11aaf934112c.patch) = 780
+SHA256 (93e96da9458c.patch) = 7c5cfd5c767668cfc7e91542e0f837b0b4749d67a7eafe849a6565b8fc54e512
+SIZE (93e96da9458c.patch) = 2076



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408201628.47KGS1R3029944>