<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/48c60ea0bbf7f48151f076d97fe0db5353246c0a">https://github.com/macports/macports-ports/commit/48c60ea0bbf7f48151f076d97fe0db5353246c0a</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 48c60ea mesa: Update to 17.1.6
</span>48c60ea is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 48c60ea0bbf7f48151f076d97fe0db5353246c0a
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Thu Aug 17 16:36:41 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> mesa: Update to 17.1.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 +++---
...cmds-Fix-a-typo-in-the-__APPLE__-codepath.patch | 29 ++++++++
...ith-size-differences-between-GLuint-and-G.patch | 64 -----------------
...missing-include-of-stddef.h-for-ptrdiff_.patch} | 12 ++--
...Provide-requirements-of-_SET_DrawBuffers.patch} | 16 +++--
...ith-size-differences-between-GLuint-and-G.patch | 82 ++++++++++++++++++++++
6 files changed, 138 insertions(+), 86 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 c0695fe..f640613 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 12.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 17.1.6
</span> categories x11 graphics
maintainers {jeremyhu @jeremyhu} openmaintainer
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,12 +16,11 @@ long_description Mesa is an open-source implementation of the OpenGL specific
</span> homepage http://mesa3d.sourceforge.net/
platforms macosx darwin
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ftp://ftp.freedesktop.org/pub/mesa/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.use_epsv no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://mesa.freedesktop.org/archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 c1f84352bb02af837c9853981c985b000ba4f799 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 505d13d922a77dfe739bc3aca699f141ad248f6b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha1 2acc201e24ea67c5231074d6746a42a747228ed6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 43a9b758462316ad344ccdccf72d6d0ce295620e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50
</span>
depends_build port:pkgconfig \
port:flex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,9 +40,10 @@ depends_lib port:xorg-glproto \
</span>
patch.pre_args -p1
patchfiles \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-mesa-Deal-with-size-differences-between-GLuint-and-G.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-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-mesa-Deal-with-size-differences-between-GLuint-and-G.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;'>@@ -57,7 +56,9 @@ autoreconf.args -fvi
</span>
configure.args \
--disable-silent-rules \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-platforms=x11 \
</span> --disable-egl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gbm \
</span> --disable-osmesa \
--with-gallium-drivers=
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..67b8532
</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/0001-glxcmds-Fix-a-typo-in-the-__APPLE__-codepath.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c1c4c18a80bb36946b1596f14c0397d4fb029f6e 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: Thu, 17 Aug 2017 15:08:36 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/4] glxcmds: Fix a typo in the __APPLE__ codepath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+s/DummyContext/dummyContext/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Regressed-in: 5d9b50e596c9d81c37ce0844ae0f8c9da3f6bea6
</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/glxcmds.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 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/glxcmds.c b/src/glx/glxcmds.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 290c86c6cd..44992f18cf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/glx/glxcmds.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/glx/glxcmds.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -820,7 +820,7 @@ glXSwapBuffers(Display * dpy, GLXDrawable drawable)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef GLX_USE_APPLEGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct glx_context * gc = __glXGetCurrentContext();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(gc != &DummyContext && apple_glx_is_current_drawable(dpy, gc->driContext, drawable)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(gc != &dummyContext && apple_glx_is_current_drawable(dpy, gc->driContext, drawable)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apple_glx_swap_buffers(gc->driContext);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __glXSendError(dpy, GLXBadCurrentWindow, 0, X_GLXSwapBuffers, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.3
</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/0001-mesa-Deal-with-size-differences-between-GLuint-and-G.patch b/x11/mesa/files/0001-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 748466e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/0001-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,64 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1bef9a9d46b5e61fb546ec562e0d3cc974336f2d 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 1/3] 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 at 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;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/mesa/main/shaderapi.c | 26 +++++++++++++++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 25 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/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8c1fba8..0b630eb 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;'>-@@ -476,6 +476,30 @@ get_attached_shaders(struct gl_context *ctx, GLuint program, GLsizei maxCount,
</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;'>-+static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+get_attached_shadersARB(struct gl_context *ctx, 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;'>-+ 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;'>-+ if (maxCount < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _mesa_error(ctx, GL_INVALID_VALUE, "glGetAttachedShadersARB(maxCount < 0)");
</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;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ shProg =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _mesa_lookup_shader_program_err(ctx, (GLuint)container, "glGetAttachedShaders");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</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] = (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;'>-+ 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;'>-@@ -1371,7 +1395,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_shadersARB(ctx, container, maxCount, count, 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;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.8.2
</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-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch b/x11/mesa/files/0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
</span>similarity index 66%
rename from x11/mesa/files/0003-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
rename to x11/mesa/files/0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
<span style='display:block; white-space:pre;color:#808080;'>index bf8fc45..6c40352 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/files/0003-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/0002-glext.h-Add-missing-include-of-stddef.h-for-ptrdiff_.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9b1e24faf2bf6df2434757102f11b0cc7eb64788 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3c10f5eda8ce7586f86e5254c5994de5cf720e81 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 3/3] glext.h: Add missing include of stddef.h for ptrdiff_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://www.khronos.org/bugzilla/show_bug.cgi?id=1345
</span>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,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 907a582..babe4eb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b7f6119072..d8ae2016e4 100644
</span> --- a/include/GL/glext.h
+++ b/include/GL/glext.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4662,6 +4662,7 @@ GLAPI void APIENTRY glVertexBlendARB (GLint count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4670,6 +4670,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;'>@@ -21,5 +23,5 @@ index 907a582..babe4eb 100644
</span> typedef ptrdiff_t GLintptrARB;
#define GL_BUFFER_SIZE_ARB 0x8764
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.8.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.3
</span>
<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/0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
</span>similarity index 82%
rename from x11/mesa/files/0002-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
rename to x11/mesa/files/0003-applegl-Provide-requirements-of-_SET_DrawBuffers.patch
<span style='display:block; white-space:pre;color:#808080;'>index a101330..524b67e 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/0003-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 255d11874ab10a007239fa42b8a42fda106175db Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 73dd69f869cf60f2b1c9208f3e713cd30440f88c 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 3/4] 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;'>@@ -9,6 +9,8 @@ libmesa for remap.c. libmesa requires the C++ linker.
</span> Also need to arrange to call _mesa_init_remap_table() to initialize the
remap table.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+XXX: There has to be a better way fixing this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0e0e0;'>@@ -17,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 d65fb81..a4364ac 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 34600475d9..4b2b746816 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;'>+@@ -142,7 +142,10 @@ libglx_la_SOURCES += \
</span> applegl_glx.c
SUBDIRS += apple
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +33,9 @@ index d65fb81..a4364ac 100644
</span> +nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- GL_LIBS = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if HAVE_WINDOWSDRI
</span> 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 4d19f7f..849044b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4d19f7f6a3..849044bb8e 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;'>@@ -54,5 +56,5 @@ index 4d19f7f..849044b 100644
</span> assert(__ogl_framework_api);
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.8.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.3
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2f67186
</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/0004-mesa-Deal-with-size-differences-between-GLuint-and-G.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,82 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a7f5cb4bdda7cae3a592093f4783399d1e5b6fa4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 8 May 2016 00:47:10 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 4/4] mesa: Deal with size differences between GLuint and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLhandleARB in GetAttachedObjectsARB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</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;'>+CC: Nicolai Hähnle <nhaehnle@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CC: Matt Turner <mattst88@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CC: Ian Romanick <idr@freedesktop.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CC: Brian Paul <brianp@vmware.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/mesa/main/shaderapi.c | 22 +++++++++++++++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 15 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6dd617be7e..7282435583 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/mesa/main/shaderapi.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/mesa/main/shaderapi.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Return list of shaders attached to shader program.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * \param objOut returns GLuint ids
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * \param handleOut returns GLhandleARB handles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_attached_shaders(struct gl_context *ctx, GLuint program, GLsizei maxCount,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GLsizei *count, GLuint *obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GLsizei *countOut, GLuint *objOut, GLhandleARB *handleOut)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct gl_shader_program *shProg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -531,14 +533,20 @@ get_attached_shaders(struct gl_context *ctx, GLuint program, GLsizei maxCount,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (shProg) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLuint i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < (GLuint) maxCount && i < shProg->NumShaders; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- obj[i] = shProg->Shaders[i]->Name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (objOut) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ objOut[i] = shProg->Shaders[i]->Name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (handleOut) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ handleOut[i] = (GLhandleARB) shProg->Shaders[i]->Name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (countOut) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *countOut = i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (count)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *count = i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * glGetHandleARB() - return ID/name of currently bound shader program.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1575,7 +1583,7 @@ _mesa_GetAttachedObjectsARB(GLhandleARB container, GLsizei maxCount,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLsizei * count, GLhandleARB * obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GET_CURRENT_CONTEXT(ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get_attached_shaders(ctx, container, maxCount, count, obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_attached_shaders(ctx, (GLuint)container, maxCount, count, NULL, obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1584,7 +1592,7 @@ _mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLsizei *count, GLuint *obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GET_CURRENT_CONTEXT(ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get_attached_shaders(ctx, program, maxCount, count, obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_attached_shaders(ctx, program, maxCount, count, obj, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.13.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>