upgrade Mesa sources to 7.7

Author: uli42

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

@@ -0,0 +1,54 @@
+From 44518d07398d663448d79e4f546736b40752630c Mon Sep 17 00:00:00 2001
+From: Ulrich Sibiller <[email protected]>
+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_7.7/4002_no-special-glx-memfunctions.patch

@@ -0,0 +1,58 @@
+Index: Mesa/src/glx/x11/glcontextmodes.c
+===================================================================
+--- Mesa.orig/src/glx/x11/glcontextmodes.c
++++ Mesa/src/glx/x11/glcontextmodes.c
+@@ -53,14 +53,14 @@
+ # ifdef XFree86Server
+ # include <os.h>
+ # include <string.h>
+-#  define _mesa_malloc(b) xalloc(b)
+-#  define _mesa_free(m)   xfree(m)
++#  define _mesa_malloc(b) malloc(b)
++#  define _mesa_free(m)   free(m)
+ #  define _mesa_memset   memset
+ # else
+ #  include <X11/Xlibint.h>
+ #  define _mesa_memset 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) */
+ 
+Index: Mesa/src/mesa/drivers/x11/xm_image.c
+===================================================================
+--- Mesa.orig/src/mesa/drivers/x11/xm_image.c
++++ Mesa/src/mesa/drivers/x11/xm_image.c
+@@ -49,7 +49,7 @@ XMesaImage *XMesaCreateImage(int bitsPer
+ {
+     XMesaImage *image;
+ 
+-    image = (XMesaImage *)xalloc(sizeof(XMesaImage));
++    image = (XMesaImage *)malloc(sizeof(XMesaImage));
+ 
+     if (image) {
+ 	image->width = width;
+@@ -67,7 +67,7 @@ void XMesaDestroyImage(XMesaImage *image
+ {
+     if (image->data)
+ 	free(image->data);
+-    xfree(image);
++    free(image);
+ }
+ 
+ unsigned long XMesaGetPixel(XMesaImage *image, int x, int y)
+Index: Mesa/src/mesa/drivers/x11/xmesa_xf86.h
+===================================================================
+--- Mesa.orig/src/mesa/drivers/x11/xmesa_xf86.h
++++ Mesa/src/mesa/drivers/x11/xmesa_xf86.h
+@@ -133,7 +133,7 @@ static _X_INLINE XMesaImage *XMesaGetIma
+ 					unsigned int height,
+ 					unsigned long plane_mask, int format)
+ {
+-    XMesaImage *img = Xcalloc(sizeof(*img));
++    XMesaImage *img = calloc(1, sizeof(*img));
+ 
+     img->width = p->drawable.width;
+     img->height = p->drawable.height;

nx-X11/extras/Mesa.patches_7.7/4004_define-USE_IEEE-macro-for-more-platforms.patch

@@ -0,0 +1,16 @@
+Author: Mike Gabriel <[email protected]>
+Description: define USE_IEEE for __aarch64__ and __mc68000__, as well
+
+Index: Mesa/src/mesa/main/imports.h
+===================================================================
+--- Mesa.orig/src/mesa/main/imports.h
++++ Mesa/src/mesa/main/imports.h
+@@ -205,6 +205,8 @@ typedef union { GLfloat f; GLint i; } fi
+     defined(__hppa__) || defined(hpux) || \
+     defined(__mips) || defined(_MIPS_ARCH) || \
+     defined(__arm__) || \
++    defined(__aarch64__) || \
++    defined(__mc68000__) || \
+     defined(__sh__) || \
+     (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
+ #define USE_IEEE

nx-X11/extras/Mesa.patches_7.7/4005_adapt-all-libX11-include-paths-to-libNX_X11.patch

@@ -0,0 +1,52 @@
+Index: Mesa/src/glx/x11/glcontextmodes.c
+===================================================================
+--- Mesa.orig/src/glx/x11/glcontextmodes.c
++++ Mesa/src/glx/x11/glcontextmodes.c
+@@ -37,7 +37,7 @@
+ #if defined(HAVE_DIX_CONFIG_H)
+ # include <dix-config.h>
+ #endif
+-#include <X11/X.h>
++#include <nx-X11/X.h>
+ #include <GL/glx.h>
+ #include "GL/glxint.h"
+ #endif
+@@ -57,7 +57,7 @@
+ #  define _mesa_free(m)   free(m)
+ #  define _mesa_memset   memset
+ # else
+-#  include <X11/Xlibint.h>
++#  include <nx-X11/Xlibint.h>
+ #  define _mesa_memset memset
+ #  define _mesa_malloc(b) malloc(b)
+ #  define _mesa_free(m) free(m)
+Index: Mesa/src/mesa/drivers/x11/glxheader.h
+===================================================================
+--- Mesa.orig/src/mesa/drivers/x11/glxheader.h
++++ Mesa/src/mesa/drivers/x11/glxheader.h
+@@ -40,9 +40,9 @@
+ 
+ #else
+ 
+-# include <X11/Xlib.h>
+-# include <X11/Xlibint.h>
+-# include <X11/Xutil.h>
++# include <nx-X11/Xlib.h>
++# include <nx-X11/Xlibint.h>
++# include <nx-X11/Xutil.h>
+ # ifdef USE_XSHM  /* was SHM */
+ #  include <sys/ipc.h>
+ #  include <sys/shm.h>
+Index: Mesa/src/mesa/drivers/x11/xm_image.c
+===================================================================
+--- Mesa.orig/src/mesa/drivers/x11/xm_image.c
++++ Mesa/src/mesa/drivers/x11/xm_image.c
+@@ -32,7 +32,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  */
+ 
+ #include <stdlib.h>
+-#include <X11/Xmd.h>
++#include <nx-X11/Xmd.h>
+ 
+ #include "glxheader.h"
+ #include "xmesaP.h"

nx-X11/extras/Mesa.patches_7.7/5001_nasty-typo-fixes.patch

@@ -0,0 +1,117 @@
+Description: Some nasty typos fixed to silence lintian et al.
+Author: Mike Gabriel <[email protected]>
+
+Index: Mesa/src/mesa/main/debug.c
+===================================================================
+--- Mesa.orig/src/mesa/main/debug.c
++++ Mesa/src/mesa/main/debug.c
+@@ -43,7 +43,7 @@ const char *_mesa_prim_name[GL_POLYGON+4
+    "GL_QUAD_STRIP",
+    "GL_POLYGON",
+    "outside begin/end",
+-   "inside unkown primitive",
++   "inside unknown primitive",
+    "unknown state"
+ };
+ 
+Index: Mesa/src/mesa/shader/arbprogparse.c
+===================================================================
+--- Mesa.orig/src/mesa/shader/arbprogparse.c
++++ Mesa/src/mesa/shader/arbprogparse.c
+@@ -97,8 +97,8 @@
+  *
+  *    Cosmetic Stuff
+  *    -----------------------------------------------------
+- * 	- remove any leftover unused grammer.c stuff (dict_ ?)
+- * 	- fix grammer.c error handling so its not static
++ * 	- remove any leftover unused grammar.c stuff (dict_ ?)
++ * 	- fix grammar.c error handling so its not static
+  * 	- #ifdef around stuff pertaining to extentions
+  *
+  *    Outstanding Questions:
+@@ -1703,7 +1703,7 @@ parse_attrib (GLcontext * ctx, GLubyte *
+    if (found) {
+       error_msg = (char *)
+          _mesa_malloc (_mesa_strlen ((char *) attrib_var->name) + 40);
+-      _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
++      _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s",
+                      attrib_var->name);
+ 
+       _mesa_set_program_error (ctx, Program->Position, error_msg);
+@@ -1904,7 +1904,7 @@ parse_param (GLcontext * ctx, GLubyte **
+ 
+    if (found) {
+       error_msg = (char *) _mesa_malloc (_mesa_strlen ((char *) param_var->name) + 40);
+-      _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
++      _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s",
+                      param_var->name);
+ 
+       _mesa_set_program_error (ctx, Program->Position, error_msg);
+@@ -2013,7 +2013,7 @@ parse_temp (GLcontext * ctx, GLubyte **
+       if (found) {
+          error_msg = (char *)
+             _mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40);
+-         _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
++         _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s",
+                         temp_var->name);
+ 
+          _mesa_set_program_error (ctx, Program->Position, error_msg);
+@@ -2064,7 +2064,7 @@ parse_output (GLcontext * ctx, GLubyte *
+       char *error_msg;
+       error_msg = (char *)
+          _mesa_malloc (_mesa_strlen ((char *) output_var->name) + 40);
+-      _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
++      _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s",
+                      output_var->name);
+ 
+       _mesa_set_program_error (ctx, Program->Position, error_msg);
+@@ -2099,7 +2099,7 @@ parse_alias (GLcontext * ctx, GLubyte **
+    if (found) {
+       error_msg = (char *)
+          _mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40);
+-      _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
++      _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s",
+                      temp_var->name);
+ 
+       _mesa_set_program_error (ctx, Program->Position, error_msg);
+@@ -2149,7 +2149,7 @@ parse_address (GLcontext * ctx, GLubyte
+       if (found) {
+          error_msg = (char *)
+             _mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40);
+-         _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s",
++         _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s",
+                         temp_var->name);
+ 
+          _mesa_set_program_error (ctx, Program->Position, error_msg);
+@@ -3980,7 +3980,7 @@ _mesa_parse_arb_program (GLcontext * ctx
+       grammar_get_last_error ((GLubyte *) error_msg, 300, &error_pos);
+       _mesa_set_program_error (ctx, error_pos, error_msg);
+       _mesa_error (ctx, GL_INVALID_OPERATION,
+-                   "Error loading grammer rule set");
++                   "Error loading grammar rule set");
+       return GL_FALSE;
+    }
+ 
+@@ -4070,7 +4070,7 @@ _mesa_parse_arb_program (GLcontext * ctx
+    }
+ 
+ #if DEBUG_PARSING
+-   printf ("Destroying grammer dict [parse retval: %d]\n", err);
++   printf ("Destroying grammar dict [parse retval: %d]\n", err);
+ #endif
+    grammar_destroy (arbprogram_syn_id);
+ 
+@@ -4103,11 +4103,11 @@ _mesa_parse_arb_program (GLcontext * ctx
+    /* Start examining the tokens in the array */
+    inst = parsed;
+ 
+-   /* Check the grammer rev */
++   /* Check the grammar rev */
+    if (*inst++ != REVISION) {
+       _mesa_set_program_error (ctx, 0, "Grammar version mismatch");
+       _mesa_error(ctx, GL_INVALID_OPERATION,
+-                  "glProgramStringARB(Grammar verison mismatch)");
++                  "glProgramStringARB(Grammar version mismatch)");
+       err = GL_TRUE;
+    }
+    else {

nx-X11/extras/Mesa.patches_7.7/series

@@ -0,0 +1,2 @@
+4002_no-special-glx-memfunctions.patch
+4005_adapt-all-libX11-include-paths-to-libNX_X11.patch