diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-10-21 23:10:00 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-10-21 23:10:00 +0000 |
| commit | 2abd26d1e3124207ff838c0aba3070251c5d6bd9 (patch) | |
| tree | 57b0f4ecf8e5cdcb0d1a6c106f7900f1be6b044f | |
| parent | 1061308ba7160b89e64adf0349a3a297137e9a8b (diff) | |
| download | ports-2abd26d1e3124207ff838c0aba3070251c5d6bd9.tar.gz ports-2abd26d1e3124207ff838c0aba3070251c5d6bd9.zip | |
graphics/mesa-devel: replace r552871 with the version submitted upstream
Tested by: pkubaj
Notes
Notes:
svn path=/head/; revision=552907
| -rw-r--r-- | graphics/mesa-devel/Makefile | 1 | ||||
| -rw-r--r-- | graphics/mesa-devel/distinfo | 2 | ||||
| -rw-r--r-- | graphics/mesa-devel/files/patch-src_compiler_spirv_spirv__to__nir.c | 24 |
3 files changed, 3 insertions, 24 deletions
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 760683e3192b..867354eb2568 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -15,6 +15,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+= e14ca702af24.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7257 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenGL, Vulkan) diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 5382b0923d1a..425f1f33aebe 100644 --- a/graphics/mesa-devel/distinfo +++ b/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 (e14ca702af24.patch) = 431f73e9a3b836fc9deb2a4ac1167b0c1c51753e33bd56713fce5437d6dce486 +SIZE (e14ca702af24.patch) = 1439 diff --git a/graphics/mesa-devel/files/patch-src_compiler_spirv_spirv__to__nir.c b/graphics/mesa-devel/files/patch-src_compiler_spirv_spirv__to__nir.c deleted file mode 100644 index 471e1142772c..000000000000 --- a/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 |