<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/1208b3dab038bfb868135e35e61bf2909c0b80b7">https://github.com/macports/macports-ports/commit/1208b3dab038bfb868135e35e61bf2909c0b80b7</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 1208b3dab03 mesa: Bump to 17.3.9
</span>1208b3dab03 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1208b3dab038bfb868135e35e61bf2909c0b80b7
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Tue Jan 12 16:12:45 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> mesa: Bump to 17.3.9
</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 | 20 +++---
...missing-include-of-stddef.h-for-ptrdiff_.patch} | 10 +--
...cmds-Fix-a-typo-in-the-__APPLE__-codepath.patch | 29 --------
...Provide-requirements-of-_SET_DrawBuffers.patch} | 16 ++---
...3-glx-Don-t-link-libmesautil.la-for-apple.patch | 51 ++++++++++++++
...ith-size-differences-between-GLuint-and-G.patch | 82 ----------------------
6 files changed, 73 insertions(+), 135 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 10ffc40051e..22870c12e38 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,8 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name mesa
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 17.1.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 17.3.9
</span> categories x11 graphics
maintainers {jeremyhu @jeremyhu} openmaintainer
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://archive.mesa3d.org/older-versions/17.x
</span> platforms macosx darwin
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 2acc201e24ea67c5231074d6746a42a747228ed6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 43a9b758462316ad344ccdccf72d6d0ce295620e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9868932
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha1 b6c6983acec4b5b7ab0802dedc74efa09dc37b5d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 9cab0f0f673e794acbb3fa129db596bd601da2b8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c5beb5fc05f0e0c294fefe1a393ee118cb67e27a4dca417d77c297f7d4b6e479 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10660456
</span>
depends_build port:pkgconfig \
port:flex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,10 +41,9 @@ depends_lib port:expat \
</span>
patch.pre_args -p1
patchfiles \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-applegl-Provide-requirements-of-_SET_DrawBuffers.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-glx-Don-t-link-libmesautil.la-for-apple.patch
</span>
if {[string match *gcc* ${configure.compiler}]} {
# Older gcc fail to do -Werror=missing-prototypes correctly
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/0002-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>similarity index 71%
rename from x11/mesa/files/0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
rename to x11/mesa/files/0001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
<span style='display:block; white-space:pre;color:#808080;'>index 6c403527e70..9d9690bf6f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/files/0001-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.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 3c10f5eda8ce7586f86e5254c5994de5cf720e81 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From fb83fc958e2ee1b1e6ecde406a61c45f3822d67c Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed, 11 Feb 2015 12:32:56 -0800
<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:#e0ffe0;'>+Subject: [PATCH 1/3] glext.h: Add missing include of stddef.h for ptrdiff_t
</span>
https://www.khronos.org/bugzilla/show_bug.cgi?id=1345
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,10 +11,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 1 insertion(+)
diff --git a/include/GL/glext.h b/include/GL/glext.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b7f6119072..d8ae2016e4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0ae78920e1f..72ffd55a2ef 100644
</span> --- a/include/GL/glext.h
+++ b/include/GL/glext.h
<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:#e0ffe0;'>+@@ -4718,6 +4718,7 @@ GLAPI void APIENTRY glVertexBlendARB (GLint count);
</span>
#ifndef GL_ARB_vertex_buffer_object
#define GL_ARB_vertex_buffer_object 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,5 +23,5 @@ index b7f6119072..d8ae2016e4 100644
</span> typedef ptrdiff_t GLintptrARB;
#define GL_BUFFER_SIZE_ARB 0x8764
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.24.3 (Apple Git-128)
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/files/0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch b/x11/mesa/files/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/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/0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch b/x11/mesa/files/0002-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span>similarity index 81%
rename from x11/mesa/files/0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
rename to x11/mesa/files/0002-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
<span style='display:block; white-space:pre;color:#808080;'>index 524b67e295f..ff6e418b153 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/files/0002-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 73dd69f869cf60f2b1c9208f3e713cd30440f88c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 46f4a144aeebc9e3cc8b9373d7460f960674c6b2 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 3/4] applegl: Provide requirements of _SET_DrawBuffers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] 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;'>@@ -19,10 +19,10 @@ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@freedesktop.org>
</span> 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 34600475d9..4b2b746816 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5448a090764..773a5397da5 100644
</span> --- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
<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:#e0ffe0;'>+@@ -143,7 +143,10 @@ libglx_la_SOURCES += \
</span> applegl_glx.c
SUBDIRS += apple
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ index 34600475d9..4b2b746816 100644
</span>
if HAVE_WINDOWSDRI
diff --git a/src/glx/apple/apple_glapi.c b/src/glx/apple/apple_glapi.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4d19f7f6a3..849044bb8e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f2248ab01a2..4abe69083c9 100644
</span> --- a/src/glx/apple/apple_glapi.c
+++ b/src/glx/apple/apple_glapi.c
@@ -39,6 +39,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,8 +45,8 @@ index 4d19f7f6a3..849044bb8e 100644
</span> +#include "main/remap.h"
#include "glapi.h"
#include "glapitable.h"
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,6 +54,8 @@ static void _apple_glapi_create_table(void) {
</span> if (__applegl_api)
return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,5 +56,5 @@ index 4d19f7f6a3..849044bb8e 100644
</span> assert(__ogl_framework_api);
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.24.3 (Apple Git-128)
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..477cdb6aa2f
</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/0003-glx-Don-t-link-libmesautil.la-for-apple.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,51 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f7e43ebdb45cbe681b88a531575ec45d2c253ae1 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:05:02 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/3] glx: Don't link libmesautil.la for apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libmesautil is already included in libmesa, and the linker complains of duplicate symbols
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Regressed-in: f4a9d205d8a6474defa86dc4f12b7e63e61a49d9
</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/glx/Makefile.am | 13 ++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 12 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/src/glx/Makefile.am b/src/glx/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 773a5397da5..4aaa73923d7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/glx/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/glx/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,7 +99,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;'>+@@ -143,10 +142,22 @@ libglx_la_SOURCES += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ applegl_glx.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUBDIRS += apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# libmesa is for _mesa_init_remap_table
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libglx_la_LIBADD += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(builddir)/apple/libappleglx.la \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/src/mesa/libmesa.la
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
</span><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><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;'>+ if HAVE_WINDOWSDRI
</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/0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch b/x11/mesa/files/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/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></pre><pre style='margin:0'>
</pre>