MesaLib: update to 21.3.4 (bugfixes)

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Fri Jan 14 15:13:26 2022 +0100
Changeset:	29ba58d5ce5cce761d1ab41aaa5ceaff31359bb6

Modified Files:
	MesaLib/Makefile
	MesaLib/distinfo
	MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__util.h
	MesaLib/patches/patch-src_util_libsync.h

Log Message:
MesaLib: update to 21.3.4 (bugfixes)

I plan to land this in pkgsrc proper with libLLVM 13.0.1.
Testing and feedback welcome.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=29ba58d5ce5cce761d1ab41aaa5ceaff31359bb6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 MesaLib/Makefile                                        |  2 +-
 MesaLib/distinfo                                        | 10 +++++-----
 ...atch-src_gallium_drivers_freedreno_freedreno__util.h | 17 ++++++++++-------
 MesaLib/patches/patch-src_util_libsync.h                |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diffs:
diff --git a/MesaLib/Makefile b/MesaLib/Makefile
index 9b6fb6985f..d08da0a01a 100644
--- a/MesaLib/Makefile
+++ b/MesaLib/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.197 2021/04/25 07:51:26 mrg Exp $
 
-DISTNAME=	mesa-21.3.3
+DISTNAME=	mesa-21.3.4
 PKGNAME=	${DISTNAME:S/mesa/MesaLib/}
 CATEGORIES=	graphics
 MASTER_SITES=	https://mesa.freedesktop.org/archive/
diff --git a/MesaLib/distinfo b/MesaLib/distinfo
index d014ae5203..241649f11d 100644
--- a/MesaLib/distinfo
+++ b/MesaLib/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.157 2021/07/15 14:06:56 schmonz Exp $
 
-BLAKE2s (mesa-21.3.3.tar.xz) = dc7964da9372b5ef0f98198d2e7f0b1f9bab3fad0d4e38ff825f2345fff32820
-SHA512 (mesa-21.3.3.tar.xz) = 0263d75435f8c16d40eba3eae29bf372e8994816718deec153c582a17c4dd6ef1c67b3236ed31e63f98bf4e1089fac5cfafae9fb84d3e1fa919b274f43e7e673
-Size (mesa-21.3.3.tar.xz) = 16476044 bytes
+BLAKE2s (mesa-21.3.4.tar.xz) = 315c1ad2c3f856d78ea66b73c0f3bcc951fec8bb71c7b9f44a9572afb9166621
+SHA512 (mesa-21.3.4.tar.xz) = 7aeea3dba0d39f4ac9f23c54aa0e6853d48000f50c4dd484618c28debe705cdd765ae8fafb5ddea0773976f7189849d9128be3f2282fea74394b59019cb786b9
+Size (mesa-21.3.4.tar.xz) = 16497248 bytes
 SHA1 (patch-src_compiler_builtin__type__macros.h) = e4868011711fb89a293580a12eb603b8e7162336
 SHA1 (patch-src_drm-shim_drm__shim.c) = 6884d31dc3e9d47aac1785589ab289a601e64545
 SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 9230fbae2c04246ebca8437ecad694bbae857fbe
@@ -11,7 +11,7 @@ SHA1 (patch-src_egl_main_eglglobals.c) = 0d52014f52e62fc5fa6650336ddb0011ecf331e
 SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = f913b779404e6bd8ae707a4fd66eb7c1dca9b311
 SHA1 (patch-src_gallium_auxiliary_rbug_rbug__texture.c) = 57d831b1001419191a27c05d9cb7734481372d27
 SHA1 (patch-src_gallium_drivers_freedreno_freedreno__screen.c) = 2d31c6d5b5271ad108f73234de34618f583e3e43
-SHA1 (patch-src_gallium_drivers_freedreno_freedreno__util.h) = 117be543dc334bb2eceaa28e048531c9c3a90205
+SHA1 (patch-src_gallium_drivers_freedreno_freedreno__util.h) = 51f082b91b3015b99ed28a016eda2f0f1eaef675
 SHA1 (patch-src_gallium_drivers_llvmpipe_lp__memory.c) = ca3c1b317c41f6ae56a08272ffabdecb38fea2ec
 SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = 04f95784c3270c9bb7e95377982e217962481525
 SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626
@@ -35,7 +35,7 @@ SHA1 (patch-src_mesa_main_shader__query.cpp) = 3f9c31645d87855759def11344dee16af
 SHA1 (patch-src_mesa_x86_common__x86.c) = f8c4b93443ef66d017f6aa114b877565b30f2598
 SHA1 (patch-src_util_build__id.c) = 7a9547bbda9d2fb9f0018ccf27b70b59e497aa2c
 SHA1 (patch-src_util_disk__cache__os.c) = 2b87c69d99e0ecf1991a6e7f3b96605887e0b2f2
-SHA1 (patch-src_util_libsync.h) = f710fef29197e46fb10427221061a1677e5a423b
+SHA1 (patch-src_util_libsync.h) = 6711d79d9011c3ba6a592ed1639c7be811aee8b4
 SHA1 (patch-src_util_strndup.h) = 73f49694ca48ad6b9a9d8346c5b84fddec2463bd
 SHA1 (patch-src_util_u__atomic.h) = 31d4514538ef5ee53012695eb5c66134aaec981e
 SHA1 (patch-src_util_u__printf.h) = 3b19d079d3857612be3cb1b5c1edb5384cd4d6fd
diff --git a/MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__util.h b/MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__util.h
index cf9c14ba2f..39e820af6a 100644
--- a/MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__util.h
+++ b/MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__util.h
@@ -2,27 +2,30 @@ $NetBSD$
 
 gettid() is linux-specific
 
---- src/gallium/drivers/freedreno/freedreno_util.h.orig	2021-12-01 19:04:14.000000000 +0000
+--- src/gallium/drivers/freedreno/freedreno_util.h.orig	2022-01-12 21:32:28.000000000 +0000
 +++ src/gallium/drivers/freedreno/freedreno_util.h
-@@ -107,12 +107,21 @@ extern bool fd_binning_enabled;
- #include <unistd.h>
+@@ -108,6 +108,7 @@ extern bool fd_binning_enabled;
  #include <sys/types.h>
+ #include <sys/syscall.h>
  
 +#if defined(__linux__)
  #define DBG(fmt, ...)                                                          \
     do {                                                                        \
        if (FD_DBG(MSGS))                                                        \
-          mesa_logi("%5d: %s:%d: " fmt, gettid(), __FUNCTION__, __LINE__,       \
-                    ##__VA_ARGS__);                                             \
+@@ -115,6 +116,16 @@ extern bool fd_binning_enabled;
+                                         __FUNCTION__, __LINE__,                \
+                                         ##__VA_ARGS__);                        \
     } while (0)
 +#else
 +#define DBG(fmt, ...)                                                          \
 +   do {                                                                        \
 +      if (FD_DBG(MSGS))                                                        \
-+         mesa_logi("%s:%d: " fmt, __FUNCTION__, __LINE__,                      \
-+                   ##__VA_ARGS__);                                             \
++         mesa_logi("%s:%d: " fmt,                                              \
++                                        __FUNCTION__, __LINE__,                \
++                                        ##__VA_ARGS__);                        \
 +   } while (0)
 +#endif
++
  
  #define perf_debug_message(debug, type, ...)                                   \
     do {                                                                        \
diff --git a/MesaLib/patches/patch-src_util_libsync.h b/MesaLib/patches/patch-src_util_libsync.h
index e2011b985c..8f22aad382 100644
--- a/MesaLib/patches/patch-src_util_libsync.h
+++ b/MesaLib/patches/patch-src_util_libsync.h
@@ -2,7 +2,7 @@ $NetBSD$
 
 sys/ioccom.h for _IOWR
 
---- src/util/libsync.h.orig	2021-12-29 21:05:19.000000000 +0000
+--- src/util/libsync.h.orig	2022-01-12 21:32:28.000000000 +0000
 +++ src/util/libsync.h
 @@ -34,6 +34,9 @@
  #include <stdint.h>