MesaLib: update to 21.2.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: MesaLib: update to 21.2.0
From: Tobias Nygren <tnn%NetBSD.org@localhost>
Date: Sat, 14 Aug 2021 00:09:42 +0000
Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sat Aug 14 02:09:42 2021 +0200
Changeset:	9d47984852385f517f4f81d4bda9f797df4e9441

Modified Files:
	MesaLib/Makefile
	MesaLib/PLIST
	MesaLib/distinfo
	MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__screen.c
	MesaLib/patches/patch-src_glx_glxclient.h
	MesaLib/patches/patch-src_glx_glxcurrent.c
	MesaLib/patches/patch-src_mapi_u__current.c
	MesaLib/patches/patch-src_util_u__thread.h
Added Files:
	MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__util.h

Log Message:
MesaLib: update to 21.2.0

Noteworthy is that 32-bit x86 builds now default disable x87 math and use sse2.
We probably do not want this default change in pkgsrc.

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

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

diffstat:
 MesaLib/Makefile                                   |  2 +-
 MesaLib/PLIST                                      |  1 +
 MesaLib/distinfo                                   | 19 ++++++++-------
 ...c_gallium_drivers_freedreno_freedreno__screen.c |  6 ++---
 ...src_gallium_drivers_freedreno_freedreno__util.h | 28 ++++++++++++++++++++++
 MesaLib/patches/patch-src_glx_glxclient.h          |  8 +++----
 MesaLib/patches/patch-src_glx_glxcurrent.c         | 10 ++++----
 MesaLib/patches/patch-src_mapi_u__current.c        | 16 ++++++-------
 MesaLib/patches/patch-src_util_u__thread.h         | 16 ++++++-------
 9 files changed, 68 insertions(+), 38 deletions(-)

diffs:
diff --git a/MesaLib/Makefile b/MesaLib/Makefile
index 7dc2241d33..a3f63b52a9 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.1.5
+DISTNAME=	mesa-21.2.0
 PKGNAME=	${DISTNAME:S/mesa/MesaLib/}
 CATEGORIES=	graphics
 MASTER_SITES=	https://mesa.freedesktop.org/archive/
diff --git a/MesaLib/PLIST b/MesaLib/PLIST
index b28e23cb16..c82c3b1715 100644
--- a/MesaLib/PLIST
+++ b/MesaLib/PLIST
@@ -42,6 +42,7 @@ ${PLIST.arm}lib/dri/ingenic-drm_dri.so
 ${PLIST.arm}lib/dri/kgsl_dri.so
 ${PLIST.kms}lib/dri/kms_swrast_dri.so
 ${PLIST.arm}lib/dri/lima_dri.so
+${PLIST.arm}lib/dri/mali-dp_dri.so
 ${PLIST.arm}lib/dri/mcde_dri.so
 ${PLIST.arm}lib/dri/mediatek_dri.so
 ${PLIST.arm}lib/dri/meson_dri.so
diff --git a/MesaLib/distinfo b/MesaLib/distinfo
index fe326668be..8e90ca81c5 100644
--- a/MesaLib/distinfo
+++ b/MesaLib/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.157 2021/07/15 14:06:56 schmonz Exp $
 
-SHA1 (mesa-21.1.5.tar.xz) = ceefadf8e0f0b0fee643bec98535684a8db12527
-RMD160 (mesa-21.1.5.tar.xz) = 5b189c9fc2c8843bbe0ada928a54c1a0b24ef28e
-SHA512 (mesa-21.1.5.tar.xz) = d9e0e1b6a1d717febee2aa67b06620c9a21e061ea7e594be5b4c382db1ed6f5acf5d13a75a9f2bba9c32621466ebc816708606e16e8b34700d987158fd8f0b7b
-Size (mesa-21.1.5.tar.xz) = 15286704 bytes
+SHA1 (mesa-21.2.0.tar.xz) = 69201327595bc1ec06836af3ecb07c4fabf723c8
+RMD160 (mesa-21.2.0.tar.xz) = fb6172f83f72304fde8066077fb5ef5f70007172
+SHA512 (mesa-21.2.0.tar.xz) = 14323ac474bbcf178177506b5a68976238d2e7bdbdcdf4d1355dd43f5bd551c6cdebed76558c34f49ed057477ec88775306b7b8484b437325e4cb4a77e16127e
+Size (mesa-21.2.0.tar.xz) = 15678224 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,8 @@ SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = ccf7c3ba7bdac39f9924102868f3
 SHA1 (patch-src_egl_main_eglglobals.c) = 0d52014f52e62fc5fa6650336ddb0011ecf331e6
 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) = 3fc96adf9b4a1c605f7a358fdb225876109ad2d5
+SHA1 (patch-src_gallium_drivers_freedreno_freedreno__screen.c) = 13a99e018d0c282e9541411e428b6bf9cc4ded73
+SHA1 (patch-src_gallium_drivers_freedreno_freedreno__util.h) = bf9d96a13f859ff38e9db684ee880ed84a365965
 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
@@ -21,14 +22,14 @@ SHA1 (patch-src_gallium_frontends_clover_util_range.hpp) = c1bd73721482642e62378
 SHA1 (patch-src_gallium_frontends_osmesa_osmesa.c) = 36631301b02cf89f152925b62f538a3c0b6ab601
 SHA1 (patch-src_glx_dri__common.c) = 7fa80f8da89ba90649db170e45c8e842cf69c1eb
 SHA1 (patch-src_glx_dri__common.h) = 0274877f8c65a4bb729536a897df4704897a4c6e
-SHA1 (patch-src_glx_glxclient.h) = f0358179ae397bc8677597b0ccb9a471f40f15de
-SHA1 (patch-src_glx_glxcurrent.c) = a872950c2cb08f60c1d018d0490c610a764ab468
+SHA1 (patch-src_glx_glxclient.h) = 7b59d5632e35aa945ad77cd5d1d2fc2e7711e82b
+SHA1 (patch-src_glx_glxcurrent.c) = bc844ab6bfe32c0a322ff0fc2c1405b67b90b64a
 SHA1 (patch-src_glx_glxext.c) = 1eacf9062b5926ea6c756e769bf6eebc7671ccba
 SHA1 (patch-src_intel_compiler_brw__fs__bank__conflicts.cpp) = 6276d2c6846bb4dd08699921bec4e20202a17478
 SHA1 (patch-src_intel_tools_aubinator__error__decode.c) = d8f636e3c3e76763a505a1dce23de0b198ad62fa
 SHA1 (patch-src_mapi_entry__x86-64__tls.h) = f3e93565a2247b47495489f2dbecdc354d4a21a0
 SHA1 (patch-src_mapi_entry__x86__tls.h) = 1ca12843b7214831c25c5cdd7860dad94312c118
-SHA1 (patch-src_mapi_u__current.c) = 996a1839a8dcf60468a84302750befa18e166f44
+SHA1 (patch-src_mapi_u__current.c) = f10d7d56d773a30ec4f24ffc41ae68104e173a47
 SHA1 (patch-src_mesa_main_context.c) = ae26f984b30369554a0e24d03006533c75e56a9b
 SHA1 (patch-src_mesa_main_extensions.c) = 8a6094690864289393315bd0ccc4ebd1e0c59ca5
 SHA1 (patch-src_mesa_main_formats.c) = b0c31116767422efe732bc77136b03b2fddfba31
@@ -39,4 +40,4 @@ SHA1 (patch-src_util_strndup.h) = 73f49694ca48ad6b9a9d8346c5b84fddec2463bd
 SHA1 (patch-src_util_u__atomic.h) = 31d4514538ef5ee53012695eb5c66134aaec981e
 SHA1 (patch-src_util_u__process.c) = 9b785d660f3d55803315598a66370139fcd9168f
 SHA1 (patch-src_util_u__queue.c) = e8d6b00473a16b6a32dcacd5ae092326fb2adb84
-SHA1 (patch-src_util_u__thread.h) = b273472a779edcc44c34174b96a43469c366e702
+SHA1 (patch-src_util_u__thread.h) = 6b3955489fc88b848388a329f6a9190bdac6cc86
diff --git a/MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__screen.c b/MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__screen.c
index 8b488c5ec4..e75489c831 100644
--- a/MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__screen.c
+++ b/MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__screen.c
@@ -2,7 +2,7 @@ $NetBSD$
 
 sysinfo(2) is for Linux only
 
---- src/gallium/drivers/freedreno/freedreno_screen.c.orig	2021-07-14 20:04:47.137926600 +0000
+--- src/gallium/drivers/freedreno/freedreno_screen.c.orig	2021-08-04 18:49:28.972473900 +0000
 +++ src/gallium/drivers/freedreno/freedreno_screen.c
 @@ -42,7 +42,9 @@
  #include <stdio.h>
@@ -13,8 +13,8 @@ sysinfo(2) is for Linux only
 +#endif
  
  #include "freedreno_fence.h"
- #include "freedreno_query.h"
-@@ -1010,9 +1012,13 @@ fd_screen_create(struct fd_device *dev, 
+ #include "freedreno_perfetto.h"
+@@ -1013,9 +1015,13 @@ fd_screen_create(struct fd_device *dev, 
  
     screen->has_syncobj = fd_has_syncobj(screen->dev);
  
diff --git a/MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__util.h b/MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__util.h
new file mode 100644
index 0000000000..d3f267cca4
--- /dev/null
+++ b/MesaLib/patches/patch-src_gallium_drivers_freedreno_freedreno__util.h
@@ -0,0 +1,28 @@
+$NetBSD$
+
+gettid() is linux-specific
+
+--- src/gallium/drivers/freedreno/freedreno_util.h.orig	2021-08-04 18:49:28.973474000 +0000
++++ src/gallium/drivers/freedreno/freedreno_util.h
+@@ -107,12 +107,21 @@ extern bool fd_binning_enabled;
+ #include <unistd.h>
+ #include <sys/types.h>
+ 
++#if defined(__linux__)
+ #define DBG(fmt, ...)                                                          \
+    do {                                                                        \
+       if (FD_DBG(MSGS))                                                        \
+          mesa_logi("%5d: %s:%d: " fmt, gettid(), __FUNCTION__, __LINE__,       \
+                    ##__VA_ARGS__);                                             \
+    } while (0)
++#else
++#define DBG(fmt, ...)                                                          \
++   do {                                                                        \
++      if (FD_DBG(MSGS))                                                        \
++         mesa_logi("%s:%d: " fmt, __FUNCTION__, __LINE__,       \
++                   ##__VA_ARGS__);                                             \
++   } while (0)
++#endif
+ 
+ #define perf_debug_ctx(ctx, ...)                                               \
+    do {                                                                        \
diff --git a/MesaLib/patches/patch-src_glx_glxclient.h b/MesaLib/patches/patch-src_glx_glxclient.h
index a7b3b90804..5134715841 100644
--- a/MesaLib/patches/patch-src_glx_glxclient.h
+++ b/MesaLib/patches/patch-src_glx_glxclient.h
@@ -3,11 +3,11 @@ $NetBSD: patch-src_glx_glxclient.h,v 1.2 2019/08/21 13:35:28 nia Exp $
 NetBSD only supports zero-initialized initial-exec tls variables in conjuction
 with dlopen(3) at the moment.
 
---- src/glx/glxclient.h.orig	2017-02-13 11:55:49.000000000 +0000
+--- src/glx/glxclient.h.orig	2021-08-04 18:49:29.150474000 +0000
 +++ src/glx/glxclient.h
-@@ -661,7 +661,11 @@ extern void __glXSetCurrentContext(struc
- extern __thread void *__glX_tls_Context
-    __attribute__ ((tls_model("initial-exec")));
+@@ -648,7 +648,11 @@ extern void __glXSetCurrentContext(struc
+ 
+ extern __THREAD_INITIAL_EXEC void *__glX_tls_Context;
  
 +#if defined(__NetBSD__)
 +#  define __glXGetCurrentContext() (likely(__glX_tls_Context) ? __glX_tls_Context : (void*)&dummyContext)
diff --git a/MesaLib/patches/patch-src_glx_glxcurrent.c b/MesaLib/patches/patch-src_glx_glxcurrent.c
index 294b35ae2b..db8404a1d6 100644
--- a/MesaLib/patches/patch-src_glx_glxcurrent.c
+++ b/MesaLib/patches/patch-src_glx_glxcurrent.c
@@ -5,7 +5,7 @@ Interim fix for toolchain/50277.
 NetBSD only supports zero-initialized initial-exec tls variables in conjuction
 with dlopen(3) at the moment.
 
---- src/glx/glxcurrent.c.orig	2019-12-04 22:10:12.000000000 +0000
+--- src/glx/glxcurrent.c.orig	2021-08-04 18:49:29.150474000 +0000
 +++ src/glx/glxcurrent.c
 @@ -40,6 +40,20 @@
  #include "glx_error.h"
@@ -28,14 +28,14 @@ with dlopen(3) at the moment.
  ** We setup some dummy structures here so that the API can be used
  ** even if no context is current.
  */
-@@ -77,7 +91,11 @@ _X_HIDDEN pthread_mutex_t __glXmutex = P
+@@ -76,7 +90,11 @@ _X_HIDDEN pthread_mutex_t __glXmutex = P
+  * \b never be \c NULL.  This is important!  Because of this
   * \c __glXGetCurrentContext can be implemented as trivial macro.
   */
- __thread void *__glX_tls_Context __attribute__ ((tls_model("initial-exec")))
 +#if defined(__NetBSD__)
-+   = NULL; /* non-zero initializers not supported with dlopen */
++__THREAD_INITIAL_EXEC void *__glX_tls_Context = NULL; /* non-zero initializers not supported with dlopen */
 +#else
-    = &dummyContext;
+ __THREAD_INITIAL_EXEC void *__glX_tls_Context = &dummyContext;
 +#endif
  
  _X_HIDDEN void
diff --git a/MesaLib/patches/patch-src_mapi_u__current.c b/MesaLib/patches/patch-src_mapi_u__current.c
index 56999822fb..8684e3f916 100644
--- a/MesaLib/patches/patch-src_mapi_u__current.c
+++ b/MesaLib/patches/patch-src_mapi_u__current.c
@@ -3,21 +3,21 @@ $NetBSD$
 NetBSD only supports zero-initialized initial-exec tls variables in conjuction
 with dlopen(3) at the moment.
 
---- src/mapi/u_current.c.orig	2021-07-14 20:04:57.831030400 +0000
+--- src/mapi/u_current.c.orig	2021-08-04 18:49:29.246474300 +0000
 +++ src/mapi/u_current.c
-@@ -107,7 +107,11 @@ __declspec(thread) void *u_current_conte
- #else
- __thread struct _glapi_table *u_current_table
-     __attribute__((tls_model("initial-exec")))
+@@ -101,7 +101,11 @@ extern void (*__glapi_noop_table[])(void
+ #if defined(USE_ELF_TLS)
+ 
+ __THREAD_INITIAL_EXEC struct _glapi_table *u_current_table
 +#if defined(__NetBSD__)
 +    = NULL; /* non-zero initializers not supported with dlopen */
 +#else
      = (struct _glapi_table *) table_noop_array;
 +#endif
  
- __thread void *u_current_context
-     __attribute__((tls_model("initial-exec")));
-@@ -259,7 +263,11 @@ struct _glapi_table *
+ __THREAD_INITIAL_EXEC void *u_current_context;
+ 
+@@ -251,7 +255,11 @@ struct _glapi_table *
  u_current_get_table_internal(void)
  {
  #if defined(USE_ELF_TLS)
diff --git a/MesaLib/patches/patch-src_util_u__thread.h b/MesaLib/patches/patch-src_util_u__thread.h
index 208aa02ba2..413a5eb3a9 100644
--- a/MesaLib/patches/patch-src_util_u__thread.h
+++ b/MesaLib/patches/patch-src_util_u__thread.h
@@ -6,18 +6,18 @@ Don't hard error when there's no pthread_setname_np.
 
 handle NetBSD-style pthread_setaffinity_np(3)
 
---- src/util/u_thread.h.orig	2021-07-14 20:04:59.275044400 +0000
+--- src/util/u_thread.h.orig	2021-08-04 18:49:29.374474500 +0000
 +++ src/util/u_thread.h
-@@ -103,7 +103,7 @@ static inline thrd_t u_thread_create(int
+@@ -129,7 +129,7 @@ static inline thrd_t u_thread_create(int
  static inline void u_thread_setname( const char *name )
  {
  #if defined(HAVE_PTHREAD)
 -#if DETECT_OS_LINUX || DETECT_OS_CYGWIN || DETECT_OS_SOLARIS
 +#if DETECT_OS_LINUX || DETECT_OS_CYGWIN
-    pthread_setname_np(pthread_self(), name);
- #elif DETECT_OS_FREEBSD || DETECT_OS_OPENBSD
-    pthread_set_name_np(pthread_self(), name);
-@@ -136,8 +136,32 @@ util_set_thread_affinity(thrd_t thread,
+    int ret = pthread_setname_np(pthread_self(), name);
+    if (ret == ERANGE) {
+       char buf[16];
+@@ -169,8 +169,32 @@ util_set_thread_affinity(thrd_t thread,
                           unsigned num_mask_bits)
  {
  #if defined(HAVE_PTHREAD_SETAFFINITY)
@@ -51,7 +51,7 @@ handle NetBSD-style pthread_setaffinity_np(3)
     if (old_mask) {
        if (pthread_getaffinity_np(thread, sizeof(cpuset), &cpuset) != 0)
           return false;
-@@ -155,7 +179,7 @@ util_set_thread_affinity(thrd_t thread,
+@@ -188,7 +212,7 @@ util_set_thread_affinity(thrd_t thread,
           CPU_SET(i, &cpuset);
     }
     return pthread_setaffinity_np(thread, sizeof(cpuset), &cpuset) == 0;
@@ -60,7 +60,7 @@ handle NetBSD-style pthread_setaffinity_np(3)
  #elif defined(_WIN32) && !defined(__CYGWIN__)
     DWORD_PTR m = mask[0];
  
-@@ -209,7 +233,7 @@ util_set_current_thread_affinity(const u
+@@ -242,7 +266,7 @@ util_set_current_thread_affinity(const u
  static inline int64_t
  util_thread_get_time_nano(thrd_t thread)
  {
Prev by Date: libxtend: Update to 0.1.2.46
Next by Date: wip/prusaslicer: Update missed patch checksums.
Previous by Thread: libxtend: Update to 0.1.2.46
Next by Thread: wip/prusaslicer: Update missed patch checksums.
Indexes:
Home | Main Index | Thread Index | Old Index