<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2a94a90ca4dc7f748b15ef43fce84abe49c07083">https://github.com/macports/macports-ports/commit/2a94a90ca4dc7f748b15ef43fce84abe49c07083</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 2a94a90ca4d mesa: delete old patchfiles
</span>2a94a90ca4d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2a94a90ca4dc7f748b15ef43fce84abe49c07083
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Tue Oct 4 12:09:36 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> mesa: delete old patchfiles
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> looks like we have across-the-board success with the mesa update,
</span><span style='display:block; white-space:pre;color:#404040;'> so the old patchfiles can be relegated to the dustbin
</span>---
...-Provide-requirements-of-_SET_DrawBuffers.patch | 80 ---------------------
.../files/old-unused/disable_shader_cache.patch | 22 ------
...cmds-Fix-a-typo-in-the-__APPLE__-codepath.patch | 29 --------
...-missing-include-of-stddef.h-for-ptrdiff_.patch | 27 -------
...-Provide-requirements-of-_SET_DrawBuffers.patch | 60 ----------------
...ith-size-differences-between-GLuint-and-G.patch | 82 ----------------------
.../old-unused/no-missing-prototypes-error.patch | 22 ------
...ress-build-failure-when-using-newer-macOS.patch | 33 ---------
.../patch-include-GL-mesa_glinterop_h.diff | 13 ----
x11/mesa/files/old-unused/static-strndup.patch | 76 --------------------
10 files changed, 444 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/old-unused/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch b/x11/mesa/files/old-unused/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 89d707cce2a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/old-unused/0001-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,80 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1e9f137abde8dc64abe10346fa99c8eac703bbf0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jon TURNEY <jon.turney@dronecode.org.uk>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 12 May 2014 16:30:26 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/2] applegl: Provide requirements of _SET_DrawBuffers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-_SET_DrawBuffers requires driDispatchRemapTable, so we need to link with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libmesa for remap.c. libmesa requires the C++ linker.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Also need to arrange to call _mesa_init_remap_table() to initialize the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-remap table.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-XXX: There has to be a better way fixing this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@freedesktop.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/glx/Makefile.am | 18 ++++++++++++++++--
</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, 19 insertions(+), 2 deletions(-)
</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 a66957d609b..3dc098ab9fa 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;'>-@@ -90,7 +90,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;'>-@@ -134,7 +133,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;'>--libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
</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;'>-diff --git a/src/glx/apple/apple_glapi.c b/src/glx/apple/apple_glapi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f2248ab01a2..4abe69083c9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/glx/apple/apple_glapi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/glx/apple/apple_glapi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +39,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "main/glheader.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "main/remap.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "glapi.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "glapitable.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,6 +54,8 @@ static void _apple_glapi_create_table(void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (__applegl_api)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _mesa_init_remap_table();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __ogl_framework_api = _glapi_create_table_from_handle(apple_cgl_get_dl_handle(), "gl");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(__ogl_framework_api);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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/old-unused/disable_shader_cache.patch b/x11/mesa/files/old-unused/disable_shader_cache.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 39273ba34fb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/old-unused/disable_shader_cache.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac.orig 2017-08-07 05:04:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ a/configure.ac 2017-08-20 07:28:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1963,7 +1963,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DEFINES="$DEFINES -DENABLE_SHADER_CACHE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#DEFINES="$DEFINES -DENABLE_SHADER_CACHE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL(NEED_MEGADRIVER, test -n "$DRI_DIRS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL(NEED_LIBMESA, test "x$enable_glx" = xxlib -o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "x$enable_osmesa" = xyes -o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.orig 2017-08-07 05:04:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ a/configure 2017-08-20 07:26:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25614,7 +25614,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DEFINES="$DEFINES -DENABLE_SHADER_CACHE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#DEFINES="$DEFINES -DENABLE_SHADER_CACHE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -n "$DRI_DIRS"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NEED_MEGADRIVER_TRUE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NEED_MEGADRIVER_FALSE='#'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/old-unused/mesa17-0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch b/x11/mesa/files/old-unused/mesa17-0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 67b8532f9f1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/old-unused/mesa17-0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From c1c4c18a80bb36946b1596f14c0397d4fb029f6e 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: Thu, 17 Aug 2017 15:08:36 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/4] glxcmds: Fix a typo in the __APPLE__ codepath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-s/DummyContext/dummyContext/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Regressed-in: 5d9b50e596c9d81c37ce0844ae0f8c9da3f6bea6
</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/glxcmds.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 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/glxcmds.c b/src/glx/glxcmds.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 290c86c6cd..44992f18cf 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/glx/glxcmds.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/glx/glxcmds.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -820,7 +820,7 @@ glXSwapBuffers(Display * dpy, GLXDrawable drawable)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef GLX_USE_APPLEGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct glx_context * gc = __glXGetCurrentContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(gc != &DummyContext && apple_glx_is_current_drawable(dpy, gc->driContext, drawable)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(gc != &dummyContext && apple_glx_is_current_drawable(dpy, gc->driContext, drawable)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- apple_glx_swap_buffers(gc->driContext);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __glXSendError(dpy, GLXBadCurrentWindow, 0, X_GLXSwapBuffers, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.3
</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/old-unused/mesa17-0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch b/x11/mesa/files/old-unused/mesa17-0002-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 6c403527e70..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/old-unused/mesa17-0002-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 3c10f5eda8ce7586f86e5254c5994de5cf720e81 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 2/4] 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 b7f6119072..d8ae2016e4 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;'>-@@ -4670,6 +4670,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.13.3
</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/old-unused/mesa17-0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch b/x11/mesa/files/old-unused/mesa17-0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 524b67e295f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/old-unused/mesa17-0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,60 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 73dd69f869cf60f2b1c9208f3e713cd30440f88c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jon TURNEY <jon.turney@dronecode.org.uk>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 12 May 2014 16:30:26 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/4] applegl: Provide requirements of _SET_DrawBuffers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-_SET_DrawBuffers requires driDispatchRemapTable, so we need to link with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libmesa for remap.c. libmesa requires the C++ linker.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Also need to arrange to call _mesa_init_remap_table() to initialize the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-remap table.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-XXX: There has to be a better way fixing this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@freedesktop.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><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:#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 34600475d9..4b2b746816 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;'>-@@ -142,7 +142,10 @@ 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;'>--libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
</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;'>-+nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
</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;'>-diff --git a/src/glx/apple/apple_glapi.c b/src/glx/apple/apple_glapi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4d19f7f6a3..849044bb8e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/glx/apple/apple_glapi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/glx/apple/apple_glapi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +39,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <GL/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "main/glheader.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "main/remap.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "glapi.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "glapitable.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "main/dispatch.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,6 +55,8 @@ static void _apple_glapi_create_table(void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (__applegl_api)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _mesa_init_remap_table();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __ogl_framework_api = _glapi_create_table_from_handle(apple_cgl_get_dl_handle(), "gl");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(__ogl_framework_api);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.3
</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/old-unused/mesa17-0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch b/x11/mesa/files/old-unused/mesa17-0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2f67186afe3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/old-unused/mesa17-0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,82 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a7f5cb4bdda7cae3a592093f4783399d1e5b6fa4 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: Sun, 8 May 2016 00:47:10 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 4/4] mesa: Deal with size differences between GLuint and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLhandleARB in GetAttachedObjectsARB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</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;'>-CC: Nicolai Hähnle <nhaehnle@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CC: Matt Turner <mattst88@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CC: Ian Romanick <idr@freedesktop.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CC: Brian Paul <brianp@vmware.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/mesa/main/shaderapi.c | 22 +++++++++++++++-------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 15 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6dd617be7e..7282435583 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/mesa/main/shaderapi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/mesa/main/shaderapi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -513,10 +513,12 @@ detach_shader_no_error(struct gl_context *ctx, GLuint program, GLuint shader)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Return list of shaders attached to shader program.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * \param objOut returns GLuint ids
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * \param handleOut returns GLhandleARB handles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_attached_shaders(struct gl_context *ctx, GLuint program, GLsizei maxCount,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GLsizei *count, GLuint *obj)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GLsizei *countOut, GLuint *objOut, GLhandleARB *handleOut)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct gl_shader_program *shProg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -531,14 +533,20 @@ get_attached_shaders(struct gl_context *ctx, GLuint program, GLsizei maxCount,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (shProg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLuint i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < (GLuint) maxCount && i < shProg->NumShaders; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- obj[i] = shProg->Shaders[i]->Name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (objOut) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ objOut[i] = shProg->Shaders[i]->Name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (handleOut) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleOut[i] = (GLhandleARB) shProg->Shaders[i]->Name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (countOut) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *countOut = i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (count)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *count = i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * glGetHandleARB() - return ID/name of currently bound shader program.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1575,7 +1583,7 @@ _mesa_GetAttachedObjectsARB(GLhandleARB container, GLsizei maxCount,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLsizei * count, GLhandleARB * obj)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GET_CURRENT_CONTEXT(ctx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_attached_shaders(ctx, container, maxCount, count, obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get_attached_shaders(ctx, (GLuint)container, maxCount, count, NULL, obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1584,7 +1592,7 @@ _mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLsizei *count, GLuint *obj)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GET_CURRENT_CONTEXT(ctx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_attached_shaders(ctx, program, maxCount, count, obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get_attached_shaders(ctx, program, maxCount, count, obj, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.3
</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/old-unused/no-missing-prototypes-error.patch b/x11/mesa/files/old-unused/no-missing-prototypes-error.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index adbe7aa2588..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/old-unused/no-missing-prototypes-error.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac 2017-08-07 07:04:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac 2017-08-19 06:18:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -292,19 +292,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="$CFLAGS -std=c99"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Enable -Werror=implicit-function-declaration and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # -Werror=missing-prototypes, if available, or otherwise, just
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # -Wmissing-prototypes. This is particularly useful to avoid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # generating a loadable driver module that has undefined symbols.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- save_CFLAGS="$CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_CHECKING([whether $CC supports -Werror=missing-prototypes])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$CFLAGS -Werror=missing-prototypes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_LINK_IFELSE([AC_LANG_PROGRAM()],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_RESULT([yes]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [CFLAGS="$save_CFLAGS -Wmissing-prototypes";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_RESULT([no])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable -fvisibility=hidden if using a gcc that supports it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- save_CFLAGS="$CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/old-unused/patch-Hack-to-address-build-failure-when-using-newer-macOS.patch b/x11/mesa/files/old-unused/patch-Hack-to-address-build-failure-when-using-newer-macOS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 661c8c734bb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/old-unused/patch-Hack-to-address-build-failure-when-using-newer-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 4fcae881fd487cb7b5e38a187a8163bfdc2eda93 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: Sun, 24 Jan 2021 21:10:29 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/2] Hack to address build failure when using newer macOS SDKs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with older deployment targets
</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/c11/threads_posix.h | 8 +++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 7 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 include/c11/threads_posix.h include/c11/threads_posix.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 45cb6075e6e..355d725f7da 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/c11/threads_posix.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/c11/threads_posix.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -382,7 +382,13 @@ tss_set(tss_t key, void *val)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*-------------------- 7.25.7 Time functions --------------------*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // 7.25.6.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef HAVE_TIMESPEC_GET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(HAVE_TIMESPEC_GET) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define timespec_get(ts, b) mesa_timespec_get(ts, b)
</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;'>- static inline int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timespec_get(struct timespec *ts, int base)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</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/old-unused/patch-include-GL-mesa_glinterop_h.diff b/x11/mesa/files/old-unused/patch-include-GL-mesa_glinterop_h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4b0a59e8102..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/old-unused/patch-include-GL-mesa_glinterop_h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/GL/mesa_glinterop.h 2017-08-07 07:04:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/GL/mesa_glinterop.h 2017-08-19 06:39:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,8 +58,10 @@
</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;'>- /* Forward declarations to avoid inclusion of GL/glx.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef APPLE_GLX_CONTEXT_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct _XDisplay;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct __GLXcontextRec;
</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;'>- /* Forward declarations to avoid inclusion of EGL/egl.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef void *EGLDisplay;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/old-unused/static-strndup.patch b/x11/mesa/files/old-unused/static-strndup.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 644c3554efd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/old-unused/static-strndup.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,76 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/mesa/drivers/dri/common/xmlconfig.c.orig 2015-02-06 16:09:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ a/src/mesa/drivers/dri/common/xmlconfig.c 2015-02-11 11:32:32.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,6 +105,24 @@ static const char *__getProgramName () {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</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;'>-+#undef strndup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define strndup __xmlconfig_strndup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static char *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+strndup(const char *str, size_t n)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *copy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (len = 0; len < n && str[len]; len++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((copy = (char *)malloc(len + 1)) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memcpy(copy, str, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ copy[len] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (copy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** \brief Find an option in an option cache with the name as key */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static uint32_t findOption (const driOptionCache *cache, const char *name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint32_t len = strlen (name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/util/ralloc.c 2015-12-28 00:25:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/util/ralloc.c 2015-12-28 00:26:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -353,17 +353,17 @@ ralloc_strdup(const void *ctx, const cha
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ralloc_strndup(const void *ctx, const char *str, size_t max)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *ptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (unlikely(str == NULL))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- n = strnlen(str, max);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (n = 0; n < max && str[n]; n++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ptr = ralloc_array(ctx, char, n + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy(ptr, str, n);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ptr[n] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* helper routine for strcat/strncat - n is the exact amount to copy */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/compiler/glsl/linker.cpp.orig 2016-05-08 16:23:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ a/src/compiler/glsl/linker.cpp 2016-05-08 16:28:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -518,6 +518,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* anonymous namespace */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef strndup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define strndup __linker_strndup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static char *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+strndup(const char *str, size_t n)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *copy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (len = 0; len < n && str[len]; len++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((copy = (char *)malloc(len + 1)) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memcpy(copy, str, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ copy[len] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (copy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- linker_error(gl_shader_program *prog, const char *fmt, ...)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span></pre><pre style='margin:0'>
</pre>