From c20b946b4abe2aeccfdb85e54f38e65041948741 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 20 Feb 2017 12:54:14 +0100 Subject: Mesa subtree: Adapt build process for building against Mesa that gets pulled in via git subtree. --- .../4002_no-special-glx-memfunctions.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch (limited to 'nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch') diff --git a/nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch b/nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch new file mode 100644 index 000000000..4f6803730 --- /dev/null +++ b/nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch @@ -0,0 +1,28 @@ +Description: Turn glx_ansic.h into a no-op include. (by using memset, malloc, free directly) +Author: Mike Gabriel + +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 + # 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) */ + -- cgit v1.2.3