MesaLib: fix SunOS issues

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

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Jan 9 21:38:50 2022 +0100
Changeset:	b16288c975f3a14c14058204bc1636472037f523

Modified Files:
	MesaLib/distinfo
	MesaLib/patches/patch-src_util_u__thread.h
Added Files:
	MesaLib/patches/patch-src_util_disk__cache__os.c
	MesaLib/patches/patch-src_util_libsync.h

Log Message:
MesaLib: fix SunOS issues

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

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

diffstat:
 MesaLib/distinfo                                 |  4 +++-
 MesaLib/patches/patch-src_util_disk__cache__os.c | 18 ++++++++++++++++++
 MesaLib/patches/patch-src_util_libsync.h         | 16 ++++++++++++++++
 MesaLib/patches/patch-src_util_u__thread.h       |  1 +
 4 files changed, 38 insertions(+), 1 deletion(-)

diffs:
diff --git a/MesaLib/distinfo b/MesaLib/distinfo
index eb9e3ea6a9..d014ae5203 100644
--- a/MesaLib/distinfo
+++ b/MesaLib/distinfo
@@ -34,9 +34,11 @@ SHA1 (patch-src_mesa_main_formats.c) = b0c31116767422efe732bc77136b03b2fddfba31
 SHA1 (patch-src_mesa_main_shader__query.cpp) = 3f9c31645d87855759def11344dee16af23c7be3
 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_strndup.h) = 73f49694ca48ad6b9a9d8346c5b84fddec2463bd
 SHA1 (patch-src_util_u__atomic.h) = 31d4514538ef5ee53012695eb5c66134aaec981e
 SHA1 (patch-src_util_u__printf.h) = 3b19d079d3857612be3cb1b5c1edb5384cd4d6fd
 SHA1 (patch-src_util_u__process.c) = 9b785d660f3d55803315598a66370139fcd9168f
 SHA1 (patch-src_util_u__queue.c) = e8d6b00473a16b6a32dcacd5ae092326fb2adb84
-SHA1 (patch-src_util_u__thread.h) = 6b3955489fc88b848388a329f6a9190bdac6cc86
+SHA1 (patch-src_util_u__thread.h) = 996a51b8570cb019b9ed5ce9f3653488ce26b2df
diff --git a/MesaLib/patches/patch-src_util_disk__cache__os.c b/MesaLib/patches/patch-src_util_disk__cache__os.c
new file mode 100644
index 0000000000..4a03f51a97
--- /dev/null
+++ b/MesaLib/patches/patch-src_util_disk__cache__os.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/util/disk_cache_os.c.orig	2021-12-29 21:05:19.000000000 +0000
++++ src/util/disk_cache_os.c
+@@ -167,9 +167,13 @@ choose_lru_file_matching(const char *dir
+    /* First count the number of files in the directory */
+    unsigned total_file_count = 0;
+    while ((dir_ent = readdir(dir)) != NULL) {
++#if defined(DT_REG)
+       if (dir_ent->d_type == DT_REG) { /* If the entry is a regular file */
+          total_file_count++;
+       }
++#else
++      total_file_count++;
++#endif
+    }
+ 
+    /* Reset to the start of the directory */
diff --git a/MesaLib/patches/patch-src_util_libsync.h b/MesaLib/patches/patch-src_util_libsync.h
new file mode 100644
index 0000000000..e2011b985c
--- /dev/null
+++ b/MesaLib/patches/patch-src_util_libsync.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+sys/ioccom.h for _IOWR
+
+--- src/util/libsync.h.orig	2021-12-29 21:05:19.000000000 +0000
++++ src/util/libsync.h
+@@ -34,6 +34,9 @@
+ #include <stdint.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
++#ifdef __sun__
++#include <sys/ioccom.h>
++#endif
+ #include <sys/poll.h>
+ #include <unistd.h>
+ 
diff --git a/MesaLib/patches/patch-src_util_u__thread.h b/MesaLib/patches/patch-src_util_u__thread.h
index 413a5eb3a9..6ec67209f7 100644
--- a/MesaLib/patches/patch-src_util_u__thread.h
+++ b/MesaLib/patches/patch-src_util_u__thread.h
@@ -1,6 +1,7 @@
 $NetBSD$
 
 Oracle Solaris has pthread_setname_np. illumos does not.
+(actually, newer Illumos does have it, but never mind.)
 
 Don't hard error when there's no pthread_setname_np.