Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Oct 2020 21:11:55 +0200
From:      Piotr Kubaj <pkubaj@anongoth.pl>
To:        Jan Beich <jbeich@freebsd.org>
Cc:        Piotr Kubaj via svn-ports-all <svn-ports-all@freebsd.org>, ports-committers@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r552871 - head/graphics/mesa-devel/files
Message-ID:  <20201021191155.GB28028@KGPE-D16>
In-Reply-To: <y2jz-fo1j-wny@FreeBSD.org>
References:  <202010211701.09LH1luC017713@repo.freebsd.org> <1rhr-ij3o-wny@FreeBSD.org> <20201021173618.GA28028@KGPE-D16> <d01b-h368-wny@FreeBSD.org> <y2jz-fo1j-wny@FreeBSD.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--WYTEVAkct0FjGQmd
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Thanks, that also works. When you commit it, please MFH to 2020Q4:
http://pylon.nyi.freebsd.org/data/121powerpc64-quarterly/552780/logs/errors=
/mesa-devel-20.2.b.2078.log

On 20-10-21 20:10:16, Jan Beich wrote:
> Jan Beich <jbeich@FreeBSD.org> writes:
>=20
> > Piotr Kubaj via svn-ports-all <svn-ports-all@freebsd.org> writes:
> >
> >> On 20-10-21 19:28:43, Jan Beich wrote:
> >>> Piotr Kubaj <pkubaj@FreeBSD.org> writes:
> >>>=20
> >>> > Author: pkubaj
> >>> > Date: Wed Oct 21 17:01:47 2020
> >>> > New Revision: 552871
> >>> > URL: https://svnweb.freebsd.org/changeset/ports/552871
> >>> >
> >>> > Log:
> >>> >   graphics/mesa-devel: fix build on big-endian architectures
> >>> >  =20
> [...]
> >> I'm planning to send PR to upstream today or tomorrow.
> >
> > While reviewing your change I did some modifications, so it benefits
> > NetBSD and OpenBSD as well (DragonFly doesn't support big-endian).
> >
> > https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7257
>=20
> To test the above via FreeBSD Ports try the following:
>=20
> diff --git graphics/mesa-devel/Makefile graphics/mesa-devel/Makefile
> index e5955fd84715..5043e6d68925 100644
> --- graphics/mesa-devel/Makefile
> +++ graphics/mesa-devel/Makefile
> @@ -16,6 +16,7 @@ PATCHFILES+=3D	cb8f7a253934.patch:-p1 # https://gitlab.=
freedesktop.org/mesa/mesa/-
>  PATCHFILES+=3D	700efacda59c.patch:-p1
>  PATCHFILES+=3D	8f3e0778f9a3.patch:-p1 # https://gitlab.freedesktop.org/m=
esa/mesa/-/issues/966#note_394512
>  PATCHFILES+=3D	167fa293d7b7.patch:-p1 # https://gitlab.freedesktop.org/m=
esa/mesa/-/merge_requests/5464
> +PATCHFILES+=3D	77a279f983c2.patch:-p1 # https://gitlab.freedesktop.org/m=
esa/mesa/-/merge_requests/7257
> =20
>  MAINTAINER=3D	jbeich@FreeBSD.org
>  COMMENT=3D	Bleeding edge Mesa drivers (OpenGL, Vulkan)
> diff --git graphics/mesa-devel/distinfo graphics/mesa-devel/distinfo
> index 5382b0923d1a..ec19c262abff 100644
> --- graphics/mesa-devel/distinfo
> +++ graphics/mesa-devel/distinfo
> @@ -17,3 +17,5 @@ SHA256 (8f3e0778f9a3.patch) =3D ba3d2f7d9a9508b38eb53d5=
f1e2120d0114edbef900200838f
>  SIZE (8f3e0778f9a3.patch) =3D 41007
>  SHA256 (167fa293d7b7.patch) =3D cc3ad8e59d5d4d7380917e715f676abba65549b0=
7e377dbf6fcec5c294915360
>  SIZE (167fa293d7b7.patch) =3D 2496
> +SHA256 (77a279f983c2.patch) =3D 4a812ea04c904acffee19af2c871e1c3a66f05f4=
6a11eb1205f780d2316e3362
> +SIZE (77a279f983c2.patch) =3D 1495
> diff --git graphics/mesa-devel/files/patch-src_compiler_spirv_spirv__to__=
nir.c graphics/mesa-devel/files/patch-src_compiler_spirv_spirv__to__nir.c
> deleted file mode 100644
> index 471e1142772c..000000000000
> --- graphics/mesa-devel/files/patch-src_compiler_spirv_spirv__to__nir.c
> +++ /dev/null
> @@ -1,24 +0,0 @@
> ---- src/compiler/spirv/spirv_to_nir.c.orig	2020-10-21 16:03:29.994285000=
 +0200
> -+++ src/compiler/spirv/spirv_to_nir.c	2020-10-21 18:45:12.746719000 +0200
> -@@ -37,8 +37,12 @@
> -=20
> - #include <stdio.h>
> - #if UTIL_ARCH_BIG_ENDIAN
> -+#ifdef __linux__
> - #include <byteswap.h>
> -+#elif defined(__FreeBSD__)
> -+#include <sys/endian.h>
> - #endif
> -+#endif
> -=20
> - void
> - vtn_log(struct vtn_builder *b, enum nir_spirv_debug_level level,
> -@@ -415,7 +419,7 @@
> -    {
> -       uint32_t *copy =3D ralloc_array(b, uint32_t, word_count);
> -       for (unsigned i =3D 0; i < word_count; i++)
> --         copy[i] =3D bswap_32(words[i]);
> -+         copy[i] =3D bswap32(words[i]);
> -       words =3D copy;
> -    }
> - #endif

--WYTEVAkct0FjGQmd
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAl+Qh/sACgkQelmbhSCD
nJ1Edg/9HyerMa9qsIvLYfscM60JQKVR3BeH/X0ffy5Md4OGvijJAR6Za32+xaIY
bEV5wGUqtsDkph0osmdVGcyNKp0PJcd2FwaBktD05iVXP6EGdFxIJr+RYQPu01z2
t5A4wO+tAr04tWAZhVjfaCb++MudkwRYRj0yCE/oWBk9bjUsU+O7IimUx2s5F1lU
nKthCmGwoc39b/4XIvTqyqC0Xu81jolQGlsHuUfCXbnT+t6y+HGXbvPqqC3t814S
k0thmYtK6MgBDSC4XjUCXQAcThGdHFMWyCnohxHxUR3vB2klzWrMUdgfFezOVupf
2F0ZlL4K8yonl9fPI0vcvfY6dNJ6KE+uMo1Pfp395wd+d57n9Lcoc4kzNeXIY1Il
uc+nvb1fuIi0qAmSErnfo5BTAh02K0swMQd/0vTtRlsuHCrNtA7kkYjMgfc57Qnh
zDCQdTQD+9jKRmUyISsCxdJyl0gNERHGn+9KBQIavO0mpwXRxcfSBaiUDg+jFSjd
2PoP0nPgDTyFwwFgJH5/B78m0ryZGGJ5mwNe0GD7jdV84XvKVjkjc6Y9cFYYtehp
PnXzZb+YEl4SuXUW3kOwjmwlzotmZuLuNmJk20uywykgQw9R7ER7XeoBTCxWEBdB
fjRWcMGW7FryN0DnnJU4PXtVcRhcUz03wJ8RQL1J2WtAz5nG4TI=
=Her5
-----END PGP SIGNATURE-----

--WYTEVAkct0FjGQmd--



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