<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/32056f8374910b34556a7bad1c0a09fa40a5aff8">https://github.com/macports/macports-ports/commit/32056f8374910b34556a7bad1c0a09fa40a5aff8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 32056f83749 mesa: Bump to 18.3.6
</span>32056f83749 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 32056f8374910b34556a7bad1c0a09fa40a5aff8
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Wed Jan 13 09:56:57 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> mesa: Bump to 18.3.6
</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 | 21 +++++----
...Provide-requirements-of-_SET_DrawBuffers.patch} | 34 ++++++++++++---
...-missing-include-of-stddef.h-for-ptrdiff_.patch | 27 ------------
...n-clock_gettime-when-timespec_get-is-unav.patch | 32 ++++++++++++++
...3-glx-Don-t-link-libmesautil.la-for-apple.patch | 51 ----------------------
5 files changed, 71 insertions(+), 94 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 22870c12e38..46c85c7675f 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;'>@@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name mesa
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 17.3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 18.3.6
</span> categories x11 graphics
maintainers {jeremyhu @jeremyhu} openmaintainer
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,14 +14,14 @@ description Mesa 3D Graphics Library
</span> long_description Mesa is an open-source implementation of the OpenGL specification, a system for rendering interactive 3D graphics.
homepage https://www.mesa3d.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://archive.mesa3d.org/older-versions/17.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://archive.mesa3d.org
</span> platforms macosx darwin
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 b6c6983acec4b5b7ab0802dedc74efa09dc37b5d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9cab0f0f673e794acbb3fa129db596bd601da2b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c5beb5fc05f0e0c294fefe1a393ee118cb67e27a4dca417d77c297f7d4b6e479 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10660456
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha1 cc7cb8cef999bc89142eaf5e162fcb24f6569645 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f4e2812c27f7bffcc1e3a28d721752aad5330f2b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aaf17638dcf5a90b93b6389e152fdc9ef147768b09598f24d2c5cf482fcfc705 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11882744
</span>
depends_build port:pkgconfig \
port:flex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,8 @@ depends_lib port:expat \
</span>
patch.pre_args -p1
patchfiles \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-applegl-Provide-requirements-of-_SET_DrawBuffers.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-glx-Don-t-link-libmesautil.la-for-apple.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-Fall-back-on-clock_gettime-when-timespec_get-is-unav.patch
</span>
if {[string match *gcc* ${configure.compiler}]} {
# Older gcc fail to do -Werror=missing-prototypes correctly
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,6 +62,10 @@ configure.args \
</span> --disable-llvm-shared-libs \
--with-gallium-drivers=
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# mesa builds with -std=c99 but uses timespec_get() which was added in c11, so this works around that bug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export ac_cv_func_timespec_get=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.env-append \
INDENT=${prefix}/bin/gindent
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/0002-applegl-Provide-requirements-of-_SET_DrawBuffers.patch b/x11/mesa/files/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span>similarity index 64%
rename from x11/mesa/files/0002-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
rename to x11/mesa/files/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
<span style='display:block; white-space:pre;color:#808080;'>index ff6e418b153..936017b9807 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/0002-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,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 46f4a144aeebc9e3cc8b9373d7460f960674c6b2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2dc2d8a616adf717a653b874e67d719dde9b8886 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/3] applegl: Provide requirements of _SET_DrawBuffers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] applegl: Provide requirements of _SET_DrawBuffers
</span>
_SET_DrawBuffers requires driDispatchRemapTable, so we need to link with
libmesa for remap.c. libmesa requires the C++ linker.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,23 +14,43 @@ XXX: There has to be a better way fixing this.
</span> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@freedesktop.org>
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/glx/Makefile.am | 5 ++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/glx/apple/apple_glapi.c | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 7 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/glx/Makefile.am | 18 ++++++++++++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/glx/apple/apple_glapi.c | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 19 insertions(+), 2 deletions(-)
</span>
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5448a090764..773a5397da5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d06ae2972e9..3184d332c8d 100644
</span> --- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -143,7 +143,10 @@ libglx_la_SOURCES += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,7 +91,6 @@ libglx_la_SOURCES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libglx_la_LIBADD = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/src/loader/libloader.la \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(top_builddir)/src/util/libmesautil.la \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/src/util/libxmlconfig.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if HAVE_DRISW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,7 +134,22 @@ libglx_la_SOURCES += \
</span> applegl_glx.c
SUBDIRS += apple
-libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
<span style='display:block; white-space:pre;background:#e0ffe0;'>++# libmesa is for _mesa_init_remap_table
</span> +libglx_la_LIBADD += \
+ $(builddir)/apple/libappleglx.la \
+ $(top_builddir)/src/mesa/libmesa.la
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# libmesautil.la is already included by libmesa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++libglx_la_LIBADD -= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(top_builddir)/src/util/libmesautil.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++libglx_la_LIBADD += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(top_builddir)/src/util/libmesautil.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> endif
if HAVE_WINDOWSDRI
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/0001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch b/x11/mesa/files/0001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9d9690bf6f2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/0001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From fb83fc958e2ee1b1e6ecde406a61c45f3822d67c 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: Wed, 11 Feb 2015 12:32:56 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/3] glext.h: Add missing include of stddef.h for ptrdiff_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://www.khronos.org/bugzilla/show_bug.cgi?id=1345
</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;'>- include/GL/glext.h | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/include/GL/glext.h b/include/GL/glext.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0ae78920e1f..72ffd55a2ef 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/GL/glext.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/GL/glext.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4718,6 +4718,7 @@ GLAPI void APIENTRY glVertexBlendARB (GLint count);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef GL_ARB_vertex_buffer_object
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GL_ARB_vertex_buffer_object 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stddef.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef ptrdiff_t GLsizeiptrARB;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef ptrdiff_t GLintptrARB;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GL_BUFFER_SIZE_ARB 0x8764
</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-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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..05808e2834c
</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-Fall-back-on-clock_gettime-when-timespec_get-is-unav.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c0ade20d136dec0c019348f4d164382bad6f3793 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: Tue, 12 Jan 2021 16:44:34 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/2] Fall back on clock_gettime when timespec_get() is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unavailable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.freedesktop.org/mesa/mesa/-/issues/4088
</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;'>+ src/util/u_queue.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/util/u_queue.c b/src/util/u_queue.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3812c824b6d..a107493e7e3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/util/u_queue.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/util/u_queue.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -171,7 +171,11 @@ _util_queue_fence_wait_timeout(struct util_queue_fence *fence,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (rel > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct timespec ts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_TIMESPEC_GET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timespec_get(&ts, TIME_UTC);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ clock_gettime(CLOCK_REALTIME, &ts);
</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;'>+ ts.tv_sec += abs_timeout / (1000*1000*1000);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ts.tv_nsec += abs_timeout % (1000*1000*1000);
</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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/0003-glx-Don-t-link-libmesautil.la-for-apple.patch b/x11/mesa/files/0003-glx-Don-t-link-libmesautil.la-for-apple.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 477cdb6aa2f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/0003-glx-Don-t-link-libmesautil.la-for-apple.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f7e43ebdb45cbe681b88a531575ec45d2c253ae1 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:05:02 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/3] glx: Don't link libmesautil.la for apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libmesautil is already included in libmesa, and the linker complains of duplicate symbols
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Regressed-in: f4a9d205d8a6474defa86dc4f12b7e63e61a49d9
</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/glx/Makefile.am | 13 ++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 12 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 773a5397da5..4aaa73923d7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/glx/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/glx/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,7 +99,6 @@ libglx_la_SOURCES = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libglx_la_LIBADD = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(top_builddir)/src/loader/libloader.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(top_builddir)/src/util/libmesautil.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(top_builddir)/src/util/libxmlconfig.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if HAVE_DRISW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -143,10 +142,22 @@ libglx_la_SOURCES += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- applegl_glx.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SUBDIRS += apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# libmesa is for _mesa_init_remap_table
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libglx_la_LIBADD += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(builddir)/apple/libappleglx.la \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(top_builddir)/src/mesa/libmesa.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# libmesautil.la is already included by libmesa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libglx_la_LIBADD -= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(top_builddir)/src/util/libmesautil.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libglx_la_LIBADD += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(top_builddir)/src/util/libmesautil.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</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;'>- if HAVE_WINDOWSDRI
</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></pre><pre style='margin:0'>
</pre>