Mesa subtree: Adapt build process for building against Mesa that gets pulled in via git subtree.

nx-X11/extras/Mesa.patches

+Mesa.patches_6.4.1
\ No newline at end of file

nx-X11/extras/Mesa.patches/series

-4001_CreatePixmap-AllocationHints.patch
-4002_define-USE_IEEE-macro-for-more-platforms.patch

nx-X11/extras/Mesa.patches_6.4.1/4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch

+From 44518d07398d663448d79e4f546736b40752630c Mon Sep 17 00:00:00 2001
+From: Ulrich Sibiller <uli42@gmx.de>
+Date: Wed, 16 Mar 2016 14:40:08 +0100
+Subject: [PATCH] Fix non-working GLX in 64bit Xorg 7.0
+
+Found the needed patch in debian bugtracker at
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=364233
+---
+ src/glx/x11/indirect_vertex_array.c          | 2 +-
+ src/mesa/drivers/dri/common/glcontextmodes.c | 3 +++
+ src/mesa/main/glheader.h                     | 3 +++
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+
+Index: Mesa/src/glx/x11/indirect_vertex_array.c
+===================================================================
+--- Mesa.orig/src/glx/x11/indirect_vertex_array.c
++++ Mesa/src/glx/x11/indirect_vertex_array.c
+@@ -530,7 +530,7 @@ static GLubyte *
+ emit_DrawArrays_header_old( __GLXcontext * gc,
+ 			    struct array_state_vector * arrays,
+ 			    size_t * elements_per_request,
+-			    size_t * total_requests,
++			    unsigned int * total_requests,
+ 			    GLenum mode, GLsizei count )
+ {
+     size_t command_size;
+Index: Mesa/src/mesa/main/glheader.h
+===================================================================
+--- Mesa.orig/src/mesa/main/glheader.h
++++ Mesa/src/mesa/main/glheader.h
+@@ -46,6 +46,9 @@
+ #ifndef GLHEADER_H
+ #define GLHEADER_H
+ 
++#ifdef HAVE_DIX_CONFIG_H
++#include "dix-config.h"
++#endif
+ 
+ #if defined(XFree86LOADER) && defined(IN_MODULE)
+ #include "xf86_ansic.h"
+Index: Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+===================================================================
+--- Mesa.orig/src/mesa/drivers/dri/common/glcontextmodes.c
++++ Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+@@ -39,6 +39,9 @@
+ # include "imports.h"
+ # define __glXMemset  memset
+ #else
++# if defined (HAVE_DIX_CONFIG_H)
++#  include <dix-config.h>
++# endif
+ # include <X11/X.h>
+ # include <GL/glx.h>
+ # include "GL/glxint.h"

nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch

+Description: Turn glx_ansic.h into a no-op include. (by using memset, malloc, free directly)
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+Index: Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+===================================================================
+--- Mesa.orig/src/mesa/drivers/dri/common/glcontextmodes.c
++++ Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+@@ -48,15 +48,14 @@
+ 
+ # ifdef XFree86Server
+ #  include "GL/glx_ansic.h"
+-extern void * __glXMalloc( size_t size );
+-extern void __glXFree( void * ptr );
+-#  define _mesa_malloc(b) __glXMalloc(b)
+-#  define _mesa_free(m)   __glXFree(m)
++#  define __glXMemset     memset
++#  define _mesa_malloc(b) malloc(b)
++#  define _mesa_free(m)   free(m)
+ # else
+ #  include <X11/Xlibint.h>
+ #  define __glXMemset  memset
+-#  define _mesa_malloc(b) Xmalloc(b)
+-#  define _mesa_free(m) Xfree(m)
++#  define _mesa_malloc(b) malloc(b)
++#  define _mesa_free(m) free(m)
+ # endif /* XFree86Server */
+ #endif /* !defined(IN_MINI_GLX) */
+ 

nx-X11/extras/Mesa.patches_6.4.1/series

+4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch
+4002_no-special-glx-memfunctions.patch
+4003_CreatePixmap-AllocationHints.patch
+4004_define-USE_IEEE-macro-for-more-platforms.patch
\ No newline at end of file

nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h

+/* no-op file to make current Mesa happy */
+
+#ifndef _glx_ansic_h_
+#define _glx_ansic_h_
+#endif

nx-X11/programs/Xserver/GL/include/GL/xf86glx.h

+/* no-op file to make current Mesa happy */

nx-X11/programs/Xserver/GL/mesa/main/WSDrawBuffer.h

+/**************************************************************************/
+/*                                                                        */
+/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
+/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
+/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
+/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
+/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
+/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
+/*                                                                        */
+/* NXAGENT, NX protocol compression and NX extensions to this software    */
+/* are copyright of the aforementioned persons and companies.             */
+/*                                                                        */
+/* Redistribution and use of the present software is allowed according    */
+/* to terms specified in the file LICENSE which comes in the source       */
+/* distribution.                                                          */
+/*                                                                        */
+/* All rights reserved.                                                   */
+/*                                                                        */
+/**************************************************************************/
+
+typedef struct _WSDrawBufferRec {
+  GLframebuffer    *DrawBuffer;
+  struct _WSDrawBufferRec *next;
+} WSDrawBufferRec, *WSDrawBufferPtr;
+
+WSDrawBufferPtr pWSDrawBuffer;
+