<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6b6e84bdc184029c52404c190ffa163951723a88">https://github.com/macports/macports-ports/commit/6b6e84bdc184029c52404c190ffa163951723a88</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6b6e84bdc184029c52404c190ffa163951723a88
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Thu Mar 11 21:01:12 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> mesa: Fix a possible build failure with timespec_get
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
x11/mesa/Portfile | 3 +-
...-Provide-requirements-of-_SET_DrawBuffers.patch | 8 +++---
...n-clock_gettime-when-timespec_get-is-unav.patch | 32 ---------------------
...ress-build-failure-when-using-newer-macOS.patch | 33 ++++++++++++++++++++++
4 files changed, 39 insertions(+), 37 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/Portfile b/x11/mesa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index caa7df4f867..0f2a90fb6c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,6 +10,7 @@ legacysupport.newest_darwin_requires_legacy 15
</span> name mesa
epoch 1
version 19.0.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories x11 graphics
maintainers {jeremyhu @jeremyhu} openmaintainer
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +47,7 @@ depends_lib port:expat \
</span> patch.pre_args -p1
patchfiles \
0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-Fall-back-on-clock_gettime-when-timespec_get-is-unav.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-Hack-to-address-build-failure-when-using-newer-macOS.patch
</span>
use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch b/x11/mesa/files/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 936017b9807..89d707cce2a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/files/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2dc2d8a616adf717a653b874e67d719dde9b8886 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1e9f137abde8dc64abe10346fa99c8eac703bbf0 Mon Sep 17 00:00:00 2001
</span> From: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon, 12 May 2014 16:30:26 +0100
Subject: [PATCH 1/2] applegl: Provide requirements of _SET_DrawBuffers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,10 +19,10 @@ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@freedesktop.org>
</span> 2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d06ae2972e9..3184d332c8d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a66957d609b..3dc098ab9fa 100644
</span> --- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,7 +91,6 @@ libglx_la_SOURCES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +90,6 @@ libglx_la_SOURCES = \
</span>
libglx_la_LIBADD = \
$(top_builddir)/src/loader/libloader.la \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ index d06ae2972e9..3184d332c8d 100644
</span> $(top_builddir)/src/util/libxmlconfig.la
if HAVE_DRISW
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,7 +134,22 @@ libglx_la_SOURCES += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -134,7 +133,22 @@ libglx_la_SOURCES += \
</span> applegl_glx.c
SUBDIRS += apple
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/0002-Fall-back-on-clock_gettime-when-timespec_get-is-unav.patch b/x11/mesa/files/0002-Fall-back-on-clock_gettime-when-timespec_get-is-unav.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 05808e2834c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/0002-Fall-back-on-clock_gettime-when-timespec_get-is-unav.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c0ade20d136dec0c019348f4d164382bad6f3793 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 12 Jan 2021 16:44:34 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/2] Fall back on clock_gettime when timespec_get() is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unavailable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.freedesktop.org/mesa/mesa/-/issues/4088
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/util/u_queue.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/util/u_queue.c b/src/util/u_queue.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3812c824b6d..a107493e7e3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/util/u_queue.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/util/u_queue.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,7 +171,11 @@ _util_queue_fence_wait_timeout(struct util_queue_fence *fence,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (rel > 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct timespec ts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_TIMESPEC_GET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timespec_get(&ts, TIME_UTC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ clock_gettime(CLOCK_REALTIME, &ts);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ts.tv_sec += abs_timeout / (1000*1000*1000);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ts.tv_nsec += abs_timeout % (1000*1000*1000);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.24.3 (Apple Git-128)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/0002-Hack-to-address-build-failure-when-using-newer-macOS.patch b/x11/mesa/files/0002-Hack-to-address-build-failure-when-using-newer-macOS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..eed9878b16a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/files/0002-Hack-to-address-build-failure-when-using-newer-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4fcae881fd487cb7b5e38a187a8163bfdc2eda93 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 24 Jan 2021 21:10:29 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/2] Hack to address build failure when using newer macOS SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with older deployment targets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/c11/threads_posix.h | 8 +++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 7 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 45cb6075e6e..355d725f7da 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/c11/threads_posix.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/c11/threads_posix.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -382,7 +382,13 @@ tss_set(tss_t key, void *val)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*-------------------- 7.25.7 Time functions --------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // 7.25.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef HAVE_TIMESPEC_GET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(HAVE_TIMESPEC_GET) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define timespec_get(ts, b) mesa_timespec_get(ts, b)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timespec_get(struct timespec *ts, int base)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.24.3 (Apple Git-128)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>