Date: Wed, 21 Oct 2020 20:10:16 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Piotr Kubaj via svn-ports-all <svn-ports-all@freebsd.org> Cc: Piotr Kubaj <pkubaj@anongoth.pl>, ports-committers@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r552871 - head/graphics/mesa-devel/files Message-ID: <y2jz-fo1j-wny@FreeBSD.org> In-Reply-To: <d01b-h368-wny@FreeBSD.org> (Jan Beich's message of "Wed, 21 Oct 2020 19:58:07 %2B0200") References: <202010211701.09LH1luC017713@repo.freebsd.org> <1rhr-ij3o-wny@FreeBSD.org> <20201021173618.GA28028@KGPE-D16> <d01b-h368-wny@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Jan Beich <jbeich@FreeBSD.org> writes: > 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: >>> >>> > 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 >>> > [...] >> 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 To test the above via FreeBSD Ports try the following: 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+= cb8f7a253934.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/- PATCHFILES+= 700efacda59c.patch:-p1 PATCHFILES+= 8f3e0778f9a3.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/966#note_394512 PATCHFILES+= 167fa293d7b7.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5464 +PATCHFILES+= 77a279f983c2.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7257 MAINTAINER= jbeich@FreeBSD.org COMMENT= 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) = ba3d2f7d9a9508b38eb53d5f1e2120d0114edbef900200838f SIZE (8f3e0778f9a3.patch) = 41007 SHA256 (167fa293d7b7.patch) = cc3ad8e59d5d4d7380917e715f676abba65549b07e377dbf6fcec5c294915360 SIZE (167fa293d7b7.patch) = 2496 +SHA256 (77a279f983c2.patch) = 4a812ea04c904acffee19af2c871e1c3a66f05f46a11eb1205f780d2316e3362 +SIZE (77a279f983c2.patch) = 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 @@ - - #include <stdio.h> - #if UTIL_ARCH_BIG_ENDIAN -+#ifdef __linux__ - #include <byteswap.h> -+#elif defined(__FreeBSD__) -+#include <sys/endian.h> - #endif -+#endif - - void - vtn_log(struct vtn_builder *b, enum nir_spirv_debug_level level, -@@ -415,7 +419,7 @@ - { - uint32_t *copy = ralloc_array(b, uint32_t, word_count); - for (unsigned i = 0; i < word_count; i++) -- copy[i] = bswap_32(words[i]); -+ copy[i] = bswap32(words[i]); - words = copy; - } - #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?y2jz-fo1j-wny>